use 'geom' as default name for geometry columns in browser data items (implements #7042)

jef-n · jef-n · commit 2a542487cfca · 2013-01-24T17:39:04.000+01:00
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -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;
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -1672,7 +1672,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
     schemaName = "dbo";
 
   if ( geometryColumn.isEmpty() )
-    geometryColumn = "qgs_geometry";
+    geometryColumn = "geom";
 
   if ( primaryKey.isEmpty() )
     primaryKey = "qgs_fid";
diff --git a/src/providers/oracle/qgsoracledataitems.cpp b/src/providers/oracle/qgsoracledataitems.cpp
@@ -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 ) )
diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -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;
diff --git a/src/providers/spatialite/qgsspatialitedataitems.cpp b/src/providers/spatialite/qgsspatialitedataitems.cpp
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ bool QgsMssqlConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction`
`355`	`355`
`356`	`356`	`if ( srcLayer->isValid() )`
`357`	`357`	`{`
`358`		`- QString uri = connInfo() + " table=" + u.name + " (qgs_geometry)";`
	`358`	`+ QString uri = connInfo() + " table=" + u.name + " (geom)";`
`359`	`359`
`360`	`360`	`QgsVectorLayerImport::ImportError err;`
`361`	`361`	`QString importError;`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ bool QgsOracleConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction`
`228`	`228`
`229`	`229`	`if ( srcLayer->isValid() )`
`230`	`230`	`{`
`231`		`- uri.setDataSource( QString(), u.name.left( 30 ).toUpper(), "QGS_GEOMETRY" );`
	`231`	`+ uri.setDataSource( QString(), u.name.left( 30 ).toUpper(), "GEOM" );`
`232`	`232`	`uri.setWkbType( srcLayer->wkbType() );`
`233`	`233`	`QString authid = srcLayer->crs().authid();`
`234`	`234`	`if ( authid.startsWith( "EPSG:", Qt::CaseInsensitive ) )`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction )`
`244`	`244`
`245`	`245`	`if ( srcLayer->isValid() )`
`246`	`246`	`{`
`247`		`- uri.setDataSource( QString(), u.name, "qgs_geometry" );`
	`247`	`+ uri.setDataSource( QString(), u.name, "geom" );`
`248`	`248`	`QgsDebugMsg( "URI " + uri.uri() );`
`249`	`249`	`QgsVectorLayerImport::ImportError err;`
`250`	`250`	`QString importError;`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ bool QgsSLConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction )`
`201`	`201`
`202`	`202`	`if ( srcLayer->isValid() )`
`203`	`203`	`{`
`204`		`- destUri.setDataSource( QString(), u.name, "geomm" );`
	`204`	`+ destUri.setDataSource( QString(), u.name, "geom" );`
`205`	`205`	`QgsDebugMsg( "URI " + destUri.uri() );`
`206`	`206`	`QgsVectorLayerImport::ImportError err;`
`207`	`207`	`QString importError;`