Improve handling of geometryless tables in browser

nyalldawson · nyalldawson · commit 4a3d3db2d218 · 2016-01-30T08:33:10.000+11:00
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -377,7 +377,9 @@ bool QgsMssqlConnectionItem::handleDrop( const QMimeData* data, const QString& t
         tableName = u.name;
       }
 
-      QString uri = connInfo() + " table=" + tableName + " (geom)";
+      QString uri = connInfo() + " table=" + tableName;
+      if ( srcLayer->geometryType() != QGis::NoGeometry )
+        uri += " (geom)";
 
       QgsVectorLayerImport::ImportError err;
       QString importError;
diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -222,7 +222,7 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData * data, QString toSchema )
 
     if ( srcLayer->isValid() )
     {
-      uri.setDataSource( QString(), u.name, "geom" );
+      uri.setDataSource( QString(), u.name,  srcLayer->geometryType() != QGis::NoGeometry ? "geom" : QString() );
       QgsDebugMsg( "URI " + uri.uri( false ) );
 
       if ( !toSchema.isNull() )

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,9 @@ bool QgsMssqlConnectionItem::handleDrop( const QMimeData* data, const QString& t`
`377`	`377`	`tableName = u.name;`
`378`	`378`	`}`
`379`	`379`
`380`		`- QString uri = connInfo() + " table=" + tableName + " (geom)";`
	`380`	`+ QString uri = connInfo() + " table=" + tableName;`
	`381`	`+ if ( srcLayer->geometryType() != QGis::NoGeometry )`
	`382`	`+ uri += " (geom)";`
`381`	`383`
`382`	`384`	`QgsVectorLayerImport::ImportError err;`
`383`	`385`	`QString importError;`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData * data, QString toSchema )`
`222`	`222`
`223`	`223`	`if ( srcLayer->isValid() )`
`224`	`224`	`{`
`225`		`- uri.setDataSource( QString(), u.name, "geom" );`
	`225`	`+ uri.setDataSource( QString(), u.name, srcLayer->geometryType() != QGis::NoGeometry ? "geom" : QString() );`
`226`	`226`	`QgsDebugMsg( "URI " + uri.uri( false ) );`
`227`	`227`
`228`	`228`	`if ( !toSchema.isNull() )`