postgres provider fix: layers with incomplete geometry type/srid/pk d…

…ata could not be selected for addition
qgis · Apr 18, 2012 · 0b082fb · 0b082fb
1 parent 7b13a89
commit 0b082fb
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp
@@ -97,7 +97,12 @@ void QgsPgTableModel::addTableEntry( QgsPostgresLayerProperty layerProperty )
   }
   else
   {
-    pkCol = pkText = layerProperty.pkCols[0];
+    if ( layerProperty.pkCols.size() > 1 )
+    {
+      pkText = tr( "Select..." );
+    }
+
+    pkCol = layerProperty.pkCols[0];
   }
 
   QStandardItem *pkItem = new QStandardItem( pkText );
@@ -323,9 +328,9 @@ bool QgsPgTableModel::setData( const QModelIndex &idx, const QVariant &value, in
 
   if ( idx.column() == dbtmType || idx.column() == dbtmSrid || idx.column() == dbtmPkCol )
   {
-    QGis::GeometryType geomType = ( QGis::GeometryType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
+    QGis::WkbType geomType = ( QGis::WkbType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
 
-    bool ok = geomType != QGis::UnknownGeometry;
+    bool ok = geomType != QGis::WKBUnknown;
 
     if ( ok && geomType != QGis::NoGeometry )
       idx.sibling( idx.row(), dbtmSrid ).data().toInt( &ok );