Fix at() and add tests

qgis · Jan 13, 2021 · d3bed16 · d3bed16
1 parent a717bc7
commit d3bed16
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/core/qgsabstractdatabaseproviderconnection.cpp b/src/core/qgsabstractdatabaseproviderconnection.cpp
@@ -477,9 +477,9 @@ QList<QVariant> QgsAbstractDatabaseProviderConnection::QueryResult::at( qlonglon
   if ( index < 0 )
     return QList<QVariant>();
   // Fetch rows until the index
-  if ( index > mRows.count( ) )
+  if ( index >= mRows.count( ) )
   {
-    while ( mResultIterator && ( mRowCount < 0 || mRows.count() < mRowCount ) && index < mRows.count() )
+    while ( mResultIterator && ( mRowCount < 0 || mRows.count() < mRowCount ) && index >= mRows.count() )
     {
       const QVariantList row { mResultIterator->nextRow() };
       if ( row.isEmpty() )

diff --git a/tests/src/python/test_qgsproviderconnection_base.py b/tests/src/python/test_qgsproviderconnection_base.py
@@ -260,6 +260,16 @@ def _test_operations(self, md, conn):
                 # But we still have access to rows:
                 self.assertEqual(rows, res.rows())
 
+                # Test iterator at
+                self.assertEqual(res.at(0), rows[0])
+
+                res = conn.execSql(sql)
+                self.assertEqual(res.at(0), rows[0])
+
+                self.assertEqual(res.at(-1), [])
+                self.assertEqual(res.at(10000), [])
+
+                # Test time_t
                 sql = "SELECT \"time_t\" FROM %s" % table
                 res = conn.executeSql(sql)