Skip to content

Commit 05d9f92

Browse files
committed
fix oracle provider build
1 parent 63083ab commit 05d9f92

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/providers/oracle/qgsoracleprovider.cpp

+9-6
Original file line numberDiff line numberDiff line change
@@ -1046,12 +1046,12 @@ QVariant QgsOracleProvider::minimumValue( int index ) const
10461046
}
10471047

10481048
// Returns the list of unique values of an attribute
1049-
void QgsOracleProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, int limit ) const
1049+
QSet<QVariant> QgsOracleProvider::uniqueValues( int index, int limit ) const
10501050
{
1051-
if ( !mConnection )
1052-
return;
1051+
QSet<QVariant> uniqueValues;
10531052

1054-
uniqueValues.clear();
1053+
if ( !mConnection )
1054+
return uniqueValues;
10551055

10561056
try
10571057
{
@@ -1081,17 +1081,20 @@ void QgsOracleProvider::uniqueValues( int index, QList<QVariant> &uniqueValues,
10811081
QgsMessageLog::logMessage( tr( "Unable to execute the query.\nThe error message from the database was:\n%1.\nSQL: %2" )
10821082
.arg( qry.lastError().text() )
10831083
.arg( qry.lastQuery() ), tr( "Oracle" ) );
1084-
return;
1084+
return QSet<QVariant>();
10851085
}
10861086

10871087
while ( qry.next() )
10881088
{
1089-
uniqueValues.append( qry.value( 0 ) );
1089+
uniqueValues << qry.value( 0 );
10901090
}
10911091
}
10921092
catch ( OracleFieldNotFound )
10931093
{
1094+
return QSet<QVariant>();
10941095
}
1096+
1097+
return uniqueValues;
10951098
}
10961099

10971100
// Returns the maximum value of an attribute

src/providers/oracle/qgsoracleprovider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class QgsOracleProvider : public QgsVectorDataProvider
128128

129129
QVariant minimumValue( int index ) const override;
130130
QVariant maximumValue( int index ) const override;
131-
virtual void uniqueValues( int index, QList<QVariant> &uniqueValues, int limit = -1 ) const override;
131+
virtual QSet<QVariant> uniqueValues( int index, int limit = -1 ) const override;
132132
bool isValid() const override;
133133
QgsAttributeList pkAttributeIndexes() const override { return mPrimaryKeyAttrs; }
134134
QVariant defaultValue( QString fieldName, QString tableName = QString::null, QString schemaName = QString::null );

0 commit comments

Comments
 (0)