Improve handling of geometryless tables in browser

qgis · Jan 29, 2016 · 4a3d3db · 4a3d3db
1 parent e830c23
commit 4a3d3db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
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() )