oracle provider: don't try to verify requested geometry type in estim…

…ated metadata mode
qgis · Nov 21, 2016 · 39ff97e · 39ff97e
1 parent c3852c0
commit 39ff97e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -2353,9 +2353,14 @@ bool QgsOracleProvider::getGeometryDetails()
                                  .arg( qry.lastQuery() ), tr( "Oracle" ) );
     }
 
-    if ( exec( qry, QString( mUseEstimatedMetadata
-                             ?  "SELECT DISTINCT gtype FROM (SELECT t.%1.sdo_gtype AS gtype FROM %2 t WHERE t.%1 IS NOT NULL AND rownum<100) WHERE rownum<=2"
-                             :  "SELECT DISTINCT t.%1.sdo_gtype FROM %2 t WHERE t.%1 IS NOT NULL AND rownum<=2" ).arg( quotedIdentifier( geomCol ) ).arg( mQuery ) ) )
+    if ( mUseEstimatedMetadata && mRequestedGeomType != QGis::WKBUnknown )
+    {
+      QgsDebugMsg( "Trusting requested geometry type" );
+      detectedType = mRequestedGeomType;
+    }
+    else if ( exec( qry, QString( mUseEstimatedMetadata
+                                  ?  "SELECT DISTINCT gtype FROM (SELECT t.%1.sdo_gtype AS gtype FROM %2 t WHERE t.%1 IS NOT NULL AND rownum<100) WHERE rownum<=2"
+                                  :  "SELECT DISTINCT t.%1.sdo_gtype FROM %2 t WHERE t.%1 IS NOT NULL AND rownum<=2" ).arg( quotedIdentifier( geomCol ) ).arg( mQuery ) ) )
     {
       if ( qry.next() )
       {