oracle provider: consider srid when looking trying spatial index (fol…

…lowup 991f94d; fixes #12230)
qgis · Feb 20, 2015 · 582d009f434260bb0efd9c0914c7f854f856a647 · 582d009
1 parent eb6910e
commit 582d009f434260bb0efd9c0914c7f854f856a647
Unified Split

Showing with 3 additions and 2 deletions.

+3 −2 src/providers/oracle/qgsoracleprovider.cpp
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -694,9 +694,10 @@ bool QgsOracleProvider::loadFields()
 
       if ( !mHasSpatialIndex )
       {
-        mHasSpatialIndex = qry.exec( QString( "SELECT %2 FROM %1 WHERE sdo_filter(%2,mdsys.sdo_geometry(2003,NULL,NULL,mdsys.sdo_elem_info_array(1,1003,3),mdsys.sdo_ordinate_array(1,1,-1,-1)))='TRUE'" )
+        mHasSpatialIndex = qry.exec( QString( "SELECT %2 FROM %1 WHERE sdo_filter(%2,mdsys.sdo_geometry(2003,%3,NULL,mdsys.sdo_elem_info_array(1,1003,3),mdsys.sdo_ordinate_array(1,1,-1,-1)))='TRUE'" )
                                      .arg( mQuery )
-                                     .arg( quotedIdentifier( mGeometryColumn ) ) );
+                                     .arg( quotedIdentifier( mGeometryColumn ) )
+                                     .arg( mSrid < 1 ? "NULL" : QString::number( mSrid ) ) );
         if ( !mHasSpatialIndex )
         {
           QgsMessageLog::logMessage( tr( "No spatial index on column %1.%2.%3 found - expect poor performance." )