[qgis] 03/14: Add patch from upstream release_2.2 branch: 0001-oracle-provider-replace-rownum-0-with-1-0-to-retriev.patch

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit 5bf2ba669315f212512004b2cec279ded44c21c1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 1 14:40:37 2014 +0100

    Add patch from upstream release_2.2 branch: 0001-oracle-provider-replace-rownum-0-with-1-0-to-retriev.patch
---
 ...ider-replace-rownum-0-with-1-0-to-retriev.patch | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/debian/patches/0001-oracle-provider-replace-rownum-0-with-1-0-to-retriev.patch b/debian/patches/0001-oracle-provider-replace-rownum-0-with-1-0-to-retriev.patch
new file mode 100644
index 0000000..2f63434
--- /dev/null
+++ b/debian/patches/0001-oracle-provider-replace-rownum-0-with-1-0-to-retriev.patch
@@ -0,0 +1,50 @@
+From 122f6cc11888635a5a5e42583c28f0f79c23bde0 Mon Sep 17 00:00:00 2001
+From: "Juergen E. Fischer" <jef at norbit.de>
+Date: Mon, 24 Feb 2014 14:05:11 +0100
+Subject: oracle provider: replace rownum=0 with 1=0 to retrieve columns
+ (fixes #9633)
+Bug: http://hub.qgis.org/issues/9633
+Origin: https://github.com/qgis/QGIS/commit/122f6cc11888635a5a5e42583c28f0f79c23bde0
+
+---
+ src/providers/oracle/qgsoracleprovider.cpp |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/src/providers/oracle/qgsoracleprovider.cpp
++++ b/src/providers/oracle/qgsoracleprovider.cpp
+@@ -706,7 +706,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;
+@@ -835,7 +835,7 @@ bool QgsOracleProvider::hasSufficientPer
+              .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() )
+@@ -1906,7 +1906,7 @@ bool QgsOracleProvider::setSubsetString(
+     sql += "(" + mSqlWhereClause + ") AND ";
+   }
+ 
+-  sql += "rownum=0";
++  sql += "1=0";
+ 
+   QSqlQuery qry( *mConnection );
+   if ( !exec( qry, sql ) )
+@@ -2074,7 +2074,7 @@ bool QgsOracleProvider::getGeometryDetai
+   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() )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git