fix #7357

jef-n · jef-n · commit a1b5b92d2fa8 · 2013-03-14T21:59:37.000+01:00
diff --git a/src/providers/oracle/qgsoracleconn.cpp b/src/providers/oracle/qgsoracleconn.cpp
@@ -194,7 +194,7 @@ bool QgsOracleConn::tableInfo( bool geometryColumnsOnly, bool userTablesOnly, bo
         .arg( prefix )
         .arg( geometryColumnsOnly ? "sdo_geom_metadata" : "tab_columns" )
         .arg( userTablesOnly ? "" : " AND c.owner=t.owner" )
-        .arg( geometryColumnsOnly ? "" : " WHERE c.data_type='SDO_GEOMETRY' AND c.data_type_owner='MDSYS'" );
+        .arg( geometryColumnsOnly ? "" : " WHERE c.data_type='SDO_GEOMETRY'" );
 
   if ( allowGeometrylessTables )
   {
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -1996,21 +1996,28 @@ QgsRectangle QgsOracleProvider::extent()
     QString sql;
     QSqlQuery qry( *mConnection );
 
+    bool ok = false;
+
     if ( !mSpatialIndex.isNull() && ( mUseEstimatedMetadata || mSqlWhereClause.isEmpty() ) )
     {
       sql = QString( "SELECT SDO_TUNE.EXTENT_OF(%1,%2) FROM dual" )
             .arg( quotedValue( QString( "%1.%2" ).arg( mOwnerName ).arg( mTableName ) ) )
             .arg( quotedValue( mGeometryColumn ) );
+
+      ok = exec( qry, sql );
     }
-    else
+
+    if ( !ok )
     {
       sql = QString( "SELECT SDO_AGGR_MBR(%1) FROM %2" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery );
 
       if ( !mSqlWhereClause.isEmpty() )
         sql += QString( " WHERE %1" ).arg( mSqlWhereClause );
+
+      ok = exec( qry, sql );
     }
 
-    if ( exec( qry, sql ) && qry.next() )
+    if ( ok && qry.next() )
     {
       QByteArray *ba = static_cast<QByteArray*>( qry.value( 0 ).data() );
       unsigned char *copy = new unsigned char[ba->size()];

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ bool QgsOracleConn::tableInfo( bool geometryColumnsOnly, bool userTablesOnly, bo`
`194`	`194`	`.arg( prefix )`
`195`	`195`	`.arg( geometryColumnsOnly ? "sdo_geom_metadata" : "tab_columns" )`
`196`	`196`	`.arg( userTablesOnly ? "" : " AND c.owner=t.owner" )`
`197`		`- .arg( geometryColumnsOnly ? "" : " WHERE c.data_type='SDO_GEOMETRY' AND c.data_type_owner='MDSYS'" );`
	`197`	`+ .arg( geometryColumnsOnly ? "" : " WHERE c.data_type='SDO_GEOMETRY'" );`
`198`	`198`
`199`	`199`	`if ( allowGeometrylessTables )`
`200`	`200`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1996,21 +1996,28 @@ QgsRectangle QgsOracleProvider::extent()`
`1996`	`1996`	`QString sql;`
`1997`	`1997`	`QSqlQuery qry( *mConnection );`
`1998`	`1998`
	`1999`	`+ bool ok = false;`
	`2000`	`+`
`1999`	`2001`	`if ( !mSpatialIndex.isNull() && ( mUseEstimatedMetadata \|\| mSqlWhereClause.isEmpty() ) )`
`2000`	`2002`	`{`
`2001`	`2003`	`sql = QString( "SELECT SDO_TUNE.EXTENT_OF(%1,%2) FROM dual" )`
`2002`	`2004`	`.arg( quotedValue( QString( "%1.%2" ).arg( mOwnerName ).arg( mTableName ) ) )`
`2003`	`2005`	`.arg( quotedValue( mGeometryColumn ) );`
	`2006`	`+`
	`2007`	`+ ok = exec( qry, sql );`
`2004`	`2008`	`}`
`2005`		`- else`
	`2009`	`+`
	`2010`	`+ if ( !ok )`
`2006`	`2011`	`{`
`2007`	`2012`	`sql = QString( "SELECT SDO_AGGR_MBR(%1) FROM %2" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery );`
`2008`	`2013`
`2009`	`2014`	`if ( !mSqlWhereClause.isEmpty() )`
`2010`	`2015`	`sql += QString( " WHERE %1" ).arg( mSqlWhereClause );`
	`2016`	`+`
	`2017`	`+ ok = exec( qry, sql );`
`2011`	`2018`	`}`
`2012`	`2019`
`2013`		`- if ( exec( qry, sql ) && qry.next() )`
	`2020`	`+ if ( ok && qry.next() )`
`2014`	`2021`	`{`
`2015`	`2022`	`QByteArray ba = static_cast<QByteArray>( qry.value( 0 ).data() );`
`2016`	`2023`	`unsigned char *copy = new unsigned char[ba->size()];`