postgres provider fixes:

- allow selection of rows with srid 0 (fixes #7889) - fix geometry type assignment of geometry less tables - filter out geometry columns with srids < 0 in browser
qgis · May 25, 2013 · 925d317 · 925d317 · strk · May 25, 2013
1 parent a84f3a4
commit 925d317
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp
@@ -56,7 +56,7 @@ void QgsPgTableModel::addTableEntry( QgsPostgresLayerProperty layerProperty )
       wkbType = QGis::WKBNoGeometry;
     }
 
-    bool selectable = wkbType == QGis::WKBNoGeometry || ( wkbType != QGis::WKBUnknown && srid > 0 );
+    bool selectable = wkbType == QGis::WKBNoGeometry || ( wkbType != QGis::WKBUnknown && srid >= 0 );
 
     QStandardItem *schemaNameItem = new QStandardItem( layerProperty.schemaName );
     QStandardItem *typeItem = new QStandardItem( iconForWkbType( wkbType ), wkbType == QGis::WKBUnknown ? tr( "Select..." ) : QgsPostgresConn::displayStringForWkbType( wkbType ) );

diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -571,7 +571,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
 
       QgsDebugMsg( QString( "%1.%2: %3" ).arg( schema ).arg( table ).arg( relkind ) );
 
-      layerProperty.types = QList<QGis::WkbType>() << QGis::WKBUnknown;
+      layerProperty.types = QList<QGis::WkbType>() << QGis::WKBNoGeometry;
       layerProperty.srids = QList<int>() << -1;
       layerProperty.schemaName = schema;
       layerProperty.tableName = table;

diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -123,7 +123,8 @@ void QgsPGConnectionItem::setLayerType( QgsPostgresLayerProperty layerProperties
   {
     QgsPostgresLayerProperty layerProperty = layerProperties.at( i );
 
-    if ( layerProperty.types[0] == QGis::WKBUnknown && !layerProperty.geometryColName.isEmpty() )
+    if ( layerProperty.types[0] == QGis::WKBUnknown ||
+        (!layerProperty.geometryColName.isEmpty() && layerProperty.srids[0] < 0 ) )
       continue;
 
     if ( !schemaItem )