oracle provider: fix call of sdo_filter to verify a spatial index is present

jef-n · jef-n · commit 6c3290b756d9 · 2015-11-26T20:32:29.000+01:00
(cherry picked from commit 684346a)
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -694,7 +694,7 @@ bool QgsOracleProvider::loadFields()
 
       if ( !mHasSpatialIndex )
       {
-        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'" )
+        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( mSrid < 1 ? "NULL" : QString::number( mSrid ) ) );

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ bool QgsOracleProvider::loadFields()`
`694`	`694`
`695`	`695`	`if ( !mHasSpatialIndex )`
`696`	`696`	`{`
`697`		`- 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'" )`
	`697`	`+ 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'" )`
`698`	`698`	`.arg( mQuery )`
`699`	`699`	`.arg( quotedIdentifier( mGeometryColumn ) )`
`700`	`700`	`.arg( mSrid < 1 ? "NULL" : QString::number( mSrid ) ) );`