Merge pull request #121 from coobas/fix/record-iteration

Fix record iteration

Author: tomchristie

databases/backends/postgres.py

@@ -115,10 +115,10 @@ def __getitem__(self, key: typing.Any) -> typing.Any:
         return raw
 
     def __iter__(self) -> typing.Iterator:
-        return iter(self._column_map)
+        return iter(self._row.keys())
 
     def __len__(self) -> int:
-        return len(self._column_map)
+        return len(self._row)
 
 
 class PostgresConnection(ConnectionBackend):

tests/test_databases.py

@@ -802,3 +802,25 @@ async def test_iterate_outside_transaction_with_temp_table(database_url):
             iterate_results.append(result)
 
         assert len(iterate_results) == 5
+
+
+@pytest.mark.parametrize("database_url", DATABASE_URLS)
+@pytest.mark.parametrize("select_query", [notes.select(), "SELECT * FROM notes"])
+@async_adapter
+async def test_column_names(database_url, select_query):
+    """
+    Test that column names are exposed correctly through `.keys()` on each row.
+    """
+    async with Database(database_url) as database:
+        async with database.transaction(force_rollback=True):
+            # insert values
+            query = notes.insert()
+            values = {"text": "example1", "completed": True}
+            await database.execute(query, values)
+            # fetch results
+            results = await database.fetch_all(query=select_query)
+            assert len(results) == 1
+
+            assert sorted(results[0].keys()) == ["completed", "id", "text"]
+            assert results[0]["text"] == "example1"
+            assert results[0]["completed"] == True

tests/test_importer.py

@@ -7,21 +7,21 @@ def test_invalid_format():
     with pytest.raises(ImportFromStringError) as exc_info:
         import_from_string("example:")
     expected = 'Import string "example:" must be in format "<module>:<attribute>".'
-    assert expected in str(exc_info.value)
+    assert exc_info.match(expected)
 
 
 def test_invalid_module():
     with pytest.raises(ImportFromStringError) as exc_info:
         import_from_string("module_does_not_exist:myattr")
     expected = 'Could not import module "module_does_not_exist".'
-    assert expected in str(exc_info.value)
+    assert exc_info.match(expected)
 
 
 def test_invalid_attr():
     with pytest.raises(ImportFromStringError) as exc_info:
         import_from_string("tempfile:attr_does_not_exist")
     expected = 'Attribute "attr_does_not_exist" not found in module "tempfile".'
-    assert expected in str(exc_info.value)
+    assert exc_info.match(expected)
 
 
 def test_internal_import_error():