fix interface since rebase

qgis · Jan 29, 2021 · 2a94f09 · 2a94f09
1 parent 33db399
commit 2a94f09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/providers/oracle/qgsoracleproviderconnection.cpp b/src/providers/oracle/qgsoracleproviderconnection.cpp
@@ -213,7 +213,6 @@ QgsAbstractDatabaseProviderConnection::QueryResult QgsOracleProviderConnection::
     const int numCols { rec.count() };
     auto iterator = std::make_shared<QgsOracleProviderResultIterator>( numCols, qry );
     QgsAbstractDatabaseProviderConnection::QueryResult results( iterator );
-    results.setRowCount( qry.size() );
     for ( int idx = 0; idx < numCols; ++idx )
     {
       results.appendColumn( rec.field( idx ).name() );
@@ -225,19 +224,19 @@ QgsAbstractDatabaseProviderConnection::QueryResult QgsOracleProviderConnection::
   return QgsAbstractDatabaseProviderConnection::QueryResult();
 }
 
-QVariantList QgsOracleProviderResultIterator::nextRow()
+QVariantList QgsOracleProviderResultIterator::nextRowPrivate()
 {
   const QVariantList currentRow( mNextRow );
-  mNextRow = nextRowPrivate();
+  mNextRow = nextRowInternal();
   return currentRow;
 }
 
-bool QgsOracleProviderResultIterator::hasNextRow() const
+bool QgsOracleProviderResultIterator::hasNextRowPrivate() const
 {
   return ! mNextRow.isEmpty();
 }
 
-QVariantList QgsOracleProviderResultIterator::nextRowPrivate()
+QVariantList QgsOracleProviderResultIterator::nextRowInternal()
 {
   QVariantList row;
   if ( mQuery.next() )
@@ -247,6 +246,10 @@ QVariantList QgsOracleProviderResultIterator::nextRowPrivate()
       row.push_back( mQuery.value( col ) );
     }
   }
+  else
+  {
+    mQuery.finish();
+  }
   return row;
 }
 

diff --git a/src/providers/oracle/qgsoracleproviderconnection.h b/src/providers/oracle/qgsoracleproviderconnection.h
@@ -27,16 +27,16 @@ struct QgsOracleProviderResultIterator: public QgsAbstractDatabaseProviderConnec
       , mQuery( query )
     {}
 
-    QVariantList nextRow() override;
-    bool hasNextRow() const override;
+    QVariantList nextRowPrivate() override;
+    bool hasNextRowPrivate() const override;
 
   private:
 
     int mColumnCount = 0;
     QSqlQuery mQuery;
     QVariantList mNextRow;
 
-    QVariantList nextRowPrivate();
+    QVariantList nextRowInternal();
 
 };