Fix HANA

qgis · Jan 13, 2021 · dbef0ea · dbef0ea
1 parent 0e3422f
commit dbef0ea
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/providers/hana/qgshanaproviderconnection.cpp b/src/providers/hana/qgshanaproviderconnection.cpp
@@ -33,7 +33,7 @@ QgsHanaProviderResultIterator::QgsHanaProviderResultIterator( QgsHanaResultSetRe
   , mNextRow( mResultSet->next() )
 {}
 
-QVariantList QgsHanaProviderResultIterator::nextRow()
+QVariantList QgsHanaProviderResultIterator::nextRowPrivate()
 {
   QVariantList ret;
   if ( !mNextRow )
@@ -44,6 +44,11 @@ QVariantList QgsHanaProviderResultIterator::nextRow()
   return ret;
 }
 
+bool QgsHanaProviderResultIterator::hasNextRowPrivate() const
+{
+  return mNextRow;
+}
+
 QgsHanaProviderConnection::QgsHanaProviderConnection( const QString &name )
   : QgsAbstractDatabaseProviderConnection( name )
 {
@@ -250,7 +255,6 @@ QgsAbstractDatabaseProviderConnection::QueryResult QgsHanaProviderConnection::ex
       unsigned short numColumns = md.getColumnCount();
       for ( unsigned short i = 1; i <= numColumns; ++i )
         ret.appendColumn( QgsHanaUtils::toQString( md.getColumnName( i ) ) );
-      ret.setRowCount( -1 );
       return ret;
     }
     else
@@ -403,3 +407,13 @@ QList<QgsVectorDataProvider::NativeType> QgsHanaProviderConnection::nativeTypes(
     throw QgsProviderConnectionException( QObject::tr( "Error retrieving native types for connection %1" ).arg( uri() ) );
   return types;
 }
+
+QVariantList QgsHanaEmptyProviderResultIterator::nextRowPrivate()
+{
+  return QVariantList();
+}
+
+bool QgsHanaEmptyProviderResultIterator::hasNextRowPrivate() const
+{
+  return false;
+}
diff --git a/src/providers/hana/qgshanaproviderconnection.h b/src/providers/hana/qgshanaproviderconnection.h
@@ -23,20 +23,25 @@
 
 struct QgsHanaEmptyProviderResultIterator: public QgsAbstractDatabaseProviderConnection::QueryResult::QueryResultIterator
 {
-  QVariantList nextRow() override { return QVariantList(); }
-  bool hasNextRow() const override { return false; }
+    // QueryResultIterator interface
+  private:
+    QVariantList nextRowPrivate();
+    bool hasNextRowPrivate() const;
 };
 
 struct QgsHanaProviderResultIterator: public QgsAbstractDatabaseProviderConnection::QueryResult::QueryResultIterator
 {
     QgsHanaProviderResultIterator( QgsHanaResultSetRef &&resultSet );
-    QVariantList nextRow() override;
-    bool hasNextRow() const override { return mNextRow; }
 
   private:
     QgsHanaResultSetRef mResultSet;
     unsigned short mNumColumns = 0;
     bool mNextRow = false;
+
+    // QueryResultIterator interface
+  private:
+    QVariantList nextRowPrivate();
+    bool hasNextRowPrivate() const;
 };
 
 class QgsHanaProviderConnection : public QgsAbstractDatabaseProviderConnection