oracle provider: replace rownum=0 with 1=0 to retrieve columns (fixes #9633)

jef-n · jef-n · commit 115f9807f10f · 2014-02-24T14:05:11.000+01:00
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -697,7 +697,7 @@ bool QgsOracleProvider::loadFields()
     mEnabledCapabilities |= QgsVectorDataProvider::CreateSpatialIndex;
   }
 
-  if ( !exec( qry, QString( "SELECT * FROM %1 WHERE rownum=0" ).arg( mQuery ) ) )
+  if ( !exec( qry, QString( "SELECT * FROM %1 WHERE 1=0" ).arg( mQuery ) ) )
   {
     QgsMessageLog::logMessage( tr( "Retrieving fields from '%1' failed [%2]" ).arg( mQuery ).arg( qry.lastError().text() ), tr( "Oracle" ) );
     return false;
@@ -826,7 +826,7 @@ bool QgsOracleProvider::hasSufficientPermsAndCapabilities()
              .arg( mQuery )
              .arg( quotedIdentifier( alias ) );
 
-    if ( !exec( qry, QString( "SELECT * FROM %1 WHERE rownum=0" ).arg( mQuery ) ) )
+    if ( !exec( qry, QString( "SELECT * FROM %1 WHERE 1=0" ).arg( mQuery ) ) )
     {
       QgsMessageLog::logMessage( tr( "Unable to execute the query.\nThe error message from the database was:\n%1.\nSQL: %2" )
                                  .arg( qry.lastError().text() )
@@ -1892,7 +1892,7 @@ bool QgsOracleProvider::setSubsetString( QString theSQL, bool updateFeatureCount
     sql += "(" + mSqlWhereClause + ") AND ";
   }
 
-  sql += "rownum=0";
+  sql += "1=0";
 
   QSqlQuery qry( *mConnection );
   if ( !exec( qry, sql ) )
@@ -2060,7 +2060,7 @@ bool QgsOracleProvider::getGeometryDetails()
   QSqlQuery qry( *mConnection );
   if ( mIsQuery )
   {
-    if ( !exec( qry, QString( "SELECT %1 FROM %2 WHERE rownum=0" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery ) ) )
+    if ( !exec( qry, QString( "SELECT %1 FROM %2 WHERE 1=0" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery ) ) )
     {
       QgsMessageLog::logMessage( tr( "Could not execute query.\nThe error message from the database was:\n%1.\nSQL: %2" )
                                  .arg( qry.lastError().text() )

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ bool QgsOracleProvider::loadFields()`
`697`	`697`	`mEnabledCapabilities \|= QgsVectorDataProvider::CreateSpatialIndex;`
`698`	`698`	`}`
`699`	`699`
`700`		`- if ( !exec( qry, QString( "SELECT * FROM %1 WHERE rownum=0" ).arg( mQuery ) ) )`
	`700`	`+ if ( !exec( qry, QString( "SELECT * FROM %1 WHERE 1=0" ).arg( mQuery ) ) )`
`701`	`701`	`{`
`702`	`702`	`QgsMessageLog::logMessage( tr( "Retrieving fields from '%1' failed [%2]" ).arg( mQuery ).arg( qry.lastError().text() ), tr( "Oracle" ) );`
`703`	`703`	`return false;`
`@@ -826,7 +826,7 @@ bool QgsOracleProvider::hasSufficientPermsAndCapabilities()`
`826`	`826`	`.arg( mQuery )`
`827`	`827`	`.arg( quotedIdentifier( alias ) );`
`828`	`828`
`829`		`- if ( !exec( qry, QString( "SELECT * FROM %1 WHERE rownum=0" ).arg( mQuery ) ) )`
	`829`	`+ if ( !exec( qry, QString( "SELECT * FROM %1 WHERE 1=0" ).arg( mQuery ) ) )`
`830`	`830`	`{`
`831`	`831`	`QgsMessageLog::logMessage( tr( "Unable to execute the query.\nThe error message from the database was:\n%1.\nSQL: %2" )`
`832`	`832`	`.arg( qry.lastError().text() )`
`@@ -1892,7 +1892,7 @@ bool QgsOracleProvider::setSubsetString( QString theSQL, bool updateFeatureCount`
`1892`	`1892`	`sql += "(" + mSqlWhereClause + ") AND ";`
`1893`	`1893`	`}`
`1894`	`1894`
`1895`		`- sql += "rownum=0";`
	`1895`	`+ sql += "1=0";`
`1896`	`1896`
`1897`	`1897`	`QSqlQuery qry( *mConnection );`
`1898`	`1898`	`if ( !exec( qry, sql ) )`
`@@ -2060,7 +2060,7 @@ bool QgsOracleProvider::getGeometryDetails()`
`2060`	`2060`	`QSqlQuery qry( *mConnection );`
`2061`	`2061`	`if ( mIsQuery )`
`2062`	`2062`	`{`
`2063`		`- if ( !exec( qry, QString( "SELECT %1 FROM %2 WHERE rownum=0" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery ) ) )`
	`2063`	`+ if ( !exec( qry, QString( "SELECT %1 FROM %2 WHERE 1=0" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery ) ) )`
`2064`	`2064`	`{`
`2065`	`2065`	`QgsMessageLog::logMessage( tr( "Could not execute query.\nThe error message from the database was:\n%1.\nSQL: %2" )`
`2066`	`2066`	`.arg( qry.lastError().text() )`