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

jef-n · jef-n · commit a62fdb085d74 · 2016-11-16T11:52:22.000+01:00
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -584,13 +584,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() );
       }
     }
@@ -2113,7 +2114,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
`@@ -584,13 +584,14 @@ bool QgsOracleProvider::loadFields()`
`584`	`584`
`585`	`585`	`qry.finish();`
`586`	`586`
`587`		`- 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" )`
	`587`	`+ if ( exec( qry, QString( "SELECT column_name,comments FROM all_col_comments t WHERE t.owner=%1 AND t.table_name=%2" )`
`588`	`588`	`.arg( quotedValue( mOwnerName ) )`
`589`		`- .arg( quotedValue( mTableName ) )`
`590`		`- .arg( quotedValue( mGeometryColumn ) ) ) )`
	`589`	`+ .arg( quotedValue( mTableName ) ) ) )`
`591`	`590`	`{`
`592`	`591`	`while ( qry.next() )`
`593`	`592`	`{`
	`593`	`+ if( qry.value( 0 ).toString() == mGeometryColumn )`
	`594`	`+ continue;`
`594`	`595`	`comments.insert( qry.value( 0 ).toString(), qry.value( 1 ).toString() );`
`595`	`596`	`}`
`596`	`597`	`}`
`@@ -2113,7 +2114,7 @@ bool QgsOracleProvider::setSubsetString( const QString& theSQL, bool updateFeatu`
`2113`	`2114`	`}`
`2114`	`2115`	`qry.finish();`
`2115`	`2116`
`2116`		`- if ( mPrimaryKeyType == pktInt && !uniqueData( mQuery, mAttributeFields[ mPrimaryKeyAttrs[0] ].name() ) )`
	`2117`	`+ if ( mPrimaryKeyType == pktInt && !mUseEstimatedMetadata && !uniqueData( mQuery, mAttributeFields[ mPrimaryKeyAttrs[0] ].name() ) )`
`2117`	`2118`	`{`
`2118`	`2119`	`mSqlWhereClause = prevWhere;`
`2119`	`2120`	`return false;`