oracle provider: also retrieve pk candidates for geometryless views (f…

…ixes #11963)
qgis · Jan 9, 2015 · bdd4388 · bdd4388
1 parent 9c6fe06
commit bdd4388
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/providers/oracle/qgsoracleconn.cpp b/src/providers/oracle/qgsoracleconn.cpp
@@ -361,11 +361,22 @@ QString QgsOracleConn::fieldExpression( const QgsField &fld )
 
 void QgsOracleConn::retrieveLayerTypes( QgsOracleLayerProperty &layerProperty, bool useEstimatedMetadata, bool onlyExistingTypes )
 {
+  QgsDebugMsg( "entering: " + layerProperty.toString() );
+
+  if ( layerProperty.isView )
+  {
+    layerProperty.pkCols = pkCandidates( layerProperty.ownerName, layerProperty.tableName );
+    if ( layerProperty.pkCols.isEmpty() )
+    {
+      QgsMessageLog::logMessage( tr( "View %1.%2 doesn't have integer columns for use as keys." )
+                                 .arg( layerProperty.ownerName ).arg( layerProperty.tableName ),
+                                 tr( "Oracle" ) );
+    }
+  }
+
   if ( layerProperty.geometryColName.isEmpty() )
     return;
 
-  QgsDebugMsg( "entering: " + layerProperty.toString() );
-
   QString table;
   QString where;
 
@@ -466,17 +477,6 @@ void QgsOracleConn::retrieveLayerTypes( QgsOracleLayerProperty &layerProperty, b
     layerProperty.srids << ( srids.size() == 1 ? *srids.constBegin() : 0 );
   }
 
-  if ( layerProperty.isView )
-  {
-    layerProperty.pkCols = pkCandidates( layerProperty.ownerName, layerProperty.tableName );
-    if ( layerProperty.pkCols.isEmpty() )
-    {
-      QgsMessageLog::logMessage( tr( "View %1.%2 doesn't have integer columns for use as keys." )
-                                 .arg( layerProperty.ownerName ).arg( layerProperty.tableName ),
-                                 tr( "Oracle" ) );
-    }
-  }
-
   QgsDebugMsg( "leaving." );
 }