Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
use 'geom' as default name for geometry columns in browser data items…
… (implements #7042)
  • Loading branch information
jef-n committed Jan 24, 2013
1 parent 5346d2b commit 2a54248
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/providers/mssql/qgsmssqldataitems.cpp
Expand Up @@ -355,7 +355,7 @@ bool QgsMssqlConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction

if ( srcLayer->isValid() )
{
QString uri = connInfo() + " table=" + u.name + " (qgs_geometry)";
QString uri = connInfo() + " table=" + u.name + " (geom)";

QgsVectorLayerImport::ImportError err;
QString importError;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/mssql/qgsmssqlprovider.cpp
Expand Up @@ -1672,7 +1672,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
schemaName = "dbo";

if ( geometryColumn.isEmpty() )
geometryColumn = "qgs_geometry";
geometryColumn = "geom";

if ( primaryKey.isEmpty() )
primaryKey = "qgs_fid";
Expand Down
2 changes: 1 addition & 1 deletion src/providers/oracle/qgsoracledataitems.cpp
Expand Up @@ -228,7 +228,7 @@ bool QgsOracleConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction

if ( srcLayer->isValid() )
{
uri.setDataSource( QString(), u.name.left( 30 ).toUpper(), "QGS_GEOMETRY" );
uri.setDataSource( QString(), u.name.left( 30 ).toUpper(), "GEOM" );
uri.setWkbType( srcLayer->wkbType() );
QString authid = srcLayer->crs().authid();
if ( authid.startsWith( "EPSG:", Qt::CaseInsensitive ) )
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresdataitems.cpp
Expand Up @@ -244,7 +244,7 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction )

if ( srcLayer->isValid() )
{
uri.setDataSource( QString(), u.name, "qgs_geometry" );
uri.setDataSource( QString(), u.name, "geom" );
QgsDebugMsg( "URI " + uri.uri() );
QgsVectorLayerImport::ImportError err;
QString importError;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/spatialite/qgsspatialitedataitems.cpp
Expand Up @@ -201,7 +201,7 @@ bool QgsSLConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction )

if ( srcLayer->isValid() )
{
destUri.setDataSource( QString(), u.name, "geomm" );
destUri.setDataSource( QString(), u.name, "geom" );
QgsDebugMsg( "URI " + destUri.uri() );
QgsVectorLayerImport::ImportError err;
QString importError;
Expand Down

0 comments on commit 2a54248

Please sign in to comment.