Merge pull request #126 from szekerest/master

MSSQL: Support non spatial tables in browser dock
qgis · Apr 15, 2012 · 2181cb6 · 2181cb6
2 parents e51dd2c + a39d0b7
commit 2181cb6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -136,6 +136,11 @@ QVector<QgsDataItem*> QgsMssqlConnectionItem::createChildren()
     query += "sys.schemas.name, sys.objects.name, sys.columns.name, null, 'GEOMETRY' from sys.columns join sys.types on sys.columns.system_type_id = sys.types.system_type_id and sys.columns.user_type_id = sys.types.user_type_id join sys.objects on sys.objects.object_id = sys.columns.object_id join sys.schemas on sys.objects.schema_id = sys.schemas.schema_id where sys.types.name = 'geometry' or sys.types.name = 'geography' and sys.objects.type = 'U'";
   }
 
+  if ( mAllowGeometrylessTables )
+  {
+    query += " union all select sys.schemas.name, sys.objects.name, null, null, 'NONE' from sys.objects join sys.schemas on sys.objects.schema_id = sys.schemas.schema_id where not exists (select * from sys.columns sc1 join sys.types on sc1.system_type_id = sys.types.system_type_id where (sys.types.name = 'geometry' or sys.types.name = 'geography') and sys.objects.object_id = sc1.object_id) and sys.objects.type = 'U'";
+  }
+
   // issue the sql query
   QSqlQuery q = QSqlQuery( db );
   q.setForwardOnly( true );
@@ -488,7 +493,7 @@ QgsMssqlLayerItem* QgsMssqlSchemaItem::addLayer( QgsMssqlLayerProperty layerProp
       layerType = QgsLayerItem::Polygon;
       break;
     default:
-      if ( layerProperty.type.isEmpty() && layerProperty.geometryColName.isEmpty() )
+      if ( layerProperty.type == "NONE" && layerProperty.geometryColName.isEmpty() )
       {
         layerType = QgsLayerItem::TableLayer;
         tip = tr( "as geometryless table" );