postgres provider: fix layer detection

jef-n · jef-n · commit 571d47a889a3 · 2014-11-12T23:10:45.000+01:00
diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -32,7 +32,6 @@ QGISEXTERN bool deleteLayer( const QString& uri, QString& errCause );
 // ---------------------------------------------------------------------------
 QgsPGConnectionItem::QgsPGConnectionItem( QgsDataItem* parent, QString name, QString path )
     : QgsDataCollectionItem( parent, name, path )
-    , mColumnTypeThread( 0 )
 {
   mIconName = "mIconConnect.png";
 }
@@ -328,16 +327,20 @@ QVector<QgsDataItem*> QgsPGSchemaItem::createChildren()
 
       conn->retrieveLayerTypes( layerProperty, true /* useEstimatedMetadata */ );
     }
-    QgsPGLayerItem *layerItem = createLayer( layerProperty );
-    if ( layerItem )
-      items.append( layerItem );
+
+    for ( int i = 0; i < layerProperty.size(); i++ )
+    {
+      QgsPGLayerItem *layerItem = createLayer( layerProperty.at(i) );
+      if ( layerItem )
+        items.append( layerItem );
+    }
   }
 
   QgsPostgresConnPool::instance()->releaseConnection( conn );
   return items;
 }
 
-QgsPGLayerItem * QgsPGSchemaItem::createLayer( QgsPostgresLayerProperty layerProperty )
+QgsPGLayerItem *QgsPGSchemaItem::createLayer( QgsPostgresLayerProperty layerProperty )
 {
   QgsDebugMsg( "schemaName = " + layerProperty.schemaName + " tableName = " + layerProperty.tableName + " geometryColName = " + layerProperty.geometryColName );
   QGis::WkbType wkbType = layerProperty.types[0];
diff --git a/src/providers/postgres/qgspostgresdataitems.h b/src/providers/postgres/qgspostgresdataitems.h
@@ -74,7 +74,6 @@ class QgsPGConnectionItem : public QgsDataCollectionItem
   private:
     QgsPostgresConn *mConn;
     QMap<QString, QgsPGSchemaItem * > mSchemaMap;
-    QgsGeomColumnTypeThread *mColumnTypeThread;
 };
 
 class QgsPGSchemaItem : public QgsDataCollectionItem

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ QGISEXTERN bool deleteLayer( const QString& uri, QString& errCause );`
`32`	`32`	`// ---------------------------------------------------------------------------`
`33`	`33`	`QgsPGConnectionItem::QgsPGConnectionItem( QgsDataItem* parent, QString name, QString path )`
`34`	`34`	`: QgsDataCollectionItem( parent, name, path )`
`35`		`- , mColumnTypeThread( 0 )`
`36`	`35`	`{`
`37`	`36`	`mIconName = "mIconConnect.png";`
`38`	`37`	`}`
`@@ -328,16 +327,20 @@ QVector<QgsDataItem*> QgsPGSchemaItem::createChildren()`
`328`	`327`
`329`	`328`	`conn->retrieveLayerTypes( layerProperty, true /* useEstimatedMetadata */ );`
`330`	`329`	`}`
`331`		`- QgsPGLayerItem *layerItem = createLayer( layerProperty );`
`332`		`- if ( layerItem )`
`333`		`- items.append( layerItem );`
	`330`	`+`
	`331`	`+ for ( int i = 0; i < layerProperty.size(); i++ )`
	`332`	`+ {`
	`333`	`+ QgsPGLayerItem *layerItem = createLayer( layerProperty.at(i) );`
	`334`	`+ if ( layerItem )`
	`335`	`+ items.append( layerItem );`
	`336`	`+ }`
`334`	`337`	`}`
`335`	`338`
`336`	`339`	`QgsPostgresConnPool::instance()->releaseConnection( conn );`
`337`	`340`	`return items;`
`338`	`341`	`}`
`339`	`342`
`340`		`-QgsPGLayerItem * QgsPGSchemaItem::createLayer( QgsPostgresLayerProperty layerProperty )`
	`343`	`+QgsPGLayerItem *QgsPGSchemaItem::createLayer( QgsPostgresLayerProperty layerProperty )`
`341`	`344`	`{`
`342`	`345`	`QgsDebugMsg( "schemaName = " + layerProperty.schemaName + " tableName = " + layerProperty.tableName + " geometryColName = " + layerProperty.geometryColName );`
`343`	`346`	`QGis::WkbType wkbType = layerProperty.types[0];`