oracle provider: fix retrieval of column comments for geometryless tables (fixes #15853)

jef-n · jef-n · commit 27de86c47fa0 · 2016-11-16T11:55:21.000+01:00
(cherry picked from commit a62fdb0)
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -581,13 +581,14 @@ bool QgsOracleProvider::loadFields()
 
     qry.finish();
 
-    if ( exec( qry, QString( "SELECT column_name,comments FROM all_col_comments t WHERE t.owner=%1 AND t.table_name=%2 AND t.column_name<>%3" )
+    if ( exec( qry, QString( "SELECT column_name,comments FROM all_col_comments t WHERE t.owner=%1 AND t.table_name=%2" )
                .arg( quotedValue( mOwnerName ) )
-               .arg( quotedValue( mTableName ) )
-               .arg( quotedValue( mGeometryColumn ) ) ) )
+               .arg( quotedValue( mTableName ) ) ) )
     {
       while ( qry.next() )
       {
+	if( qry.value( 0 ).toString() == mGeometryColumn )
+	  continue;
         comments.insert( qry.value( 0 ).toString(), qry.value( 1 ).toString() );
       }
     }
@@ -2004,7 +2005,7 @@ bool QgsOracleProvider::setSubsetString( const QString& theSQL, bool updateFeatu
   }
   qry.finish();
 
-  if ( mPrimaryKeyType == pktInt && !uniqueData( mQuery, mAttributeFields[ mPrimaryKeyAttrs[0] ].name() ) )
+  if ( mPrimaryKeyType == pktInt && !mUseEstimatedMetadata && !uniqueData( mQuery, mAttributeFields[ mPrimaryKeyAttrs[0] ].name() ) )
   {
     mSqlWhereClause = prevWhere;
     return false;

Original file line number	Diff line number	Diff line change
`@@ -581,13 +581,14 @@ bool QgsOracleProvider::loadFields()`
`581`	`581`
`582`	`582`	`qry.finish();`
`583`	`583`
`584`		`- if ( exec( qry, QString( "SELECT column_name,comments FROM all_col_comments t WHERE t.owner=%1 AND t.table_name=%2 AND t.column_name<>%3" )`
	`584`	`+ if ( exec( qry, QString( "SELECT column_name,comments FROM all_col_comments t WHERE t.owner=%1 AND t.table_name=%2" )`
`585`	`585`	`.arg( quotedValue( mOwnerName ) )`
`586`		`- .arg( quotedValue( mTableName ) )`
`587`		`- .arg( quotedValue( mGeometryColumn ) ) ) )`
	`586`	`+ .arg( quotedValue( mTableName ) ) ) )`
`588`	`587`	`{`
`589`	`588`	`while ( qry.next() )`
`590`	`589`	`{`
	`590`	`+ if( qry.value( 0 ).toString() == mGeometryColumn )`
	`591`	`+ continue;`
`591`	`592`	`comments.insert( qry.value( 0 ).toString(), qry.value( 1 ).toString() );`
`592`	`593`	`}`
`593`	`594`	`}`
`@@ -2004,7 +2005,7 @@ bool QgsOracleProvider::setSubsetString( const QString& theSQL, bool updateFeatu`
`2004`	`2005`	`}`
`2005`	`2006`	`qry.finish();`
`2006`	`2007`
`2007`		`- if ( mPrimaryKeyType == pktInt && !uniqueData( mQuery, mAttributeFields[ mPrimaryKeyAttrs[0] ].name() ) )`
	`2008`	`+ if ( mPrimaryKeyType == pktInt && !mUseEstimatedMetadata && !uniqueData( mQuery, mAttributeFields[ mPrimaryKeyAttrs[0] ].name() ) )`
`2008`	`2009`	`{`
`2009`	`2010`	`mSqlWhereClause = prevWhere;`
`2010`	`2011`	`return false;`