Skip to content

Commit 08ae4da

Browse files
Revert "Fix get_rows_fieldnames_from_select() to return dictionary-style mappings"
This reverts commit 445092e.
1 parent 445092e commit 08ae4da

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cardinal_pythonlib/sqlalchemy/core_query.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def get_rows_fieldnames_from_select(
147147
f"{select_query.column_descriptions}"
148148
)
149149

150-
result = session.execute(select_query).mappings()
150+
result = session.execute(select_query)
151151

152152
fieldnames_rmkview = result.keys()
153153
# ... of type RMKeyView, e.g. RMKeyView(['a', 'b'])

cardinal_pythonlib/sqlalchemy/tests/core_query_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ def test_get_rows_fieldnames_from_select(self) -> None:
117117
rows, fieldnames = get_rows_fieldnames_from_select(self.session, query)
118118
self.assertEqual(fieldnames, [self.a, self.b])
119119
self.assertEqual(len(rows), 2)
120-
self.assertEqual(rows[0], {"a": self.a_val1, "b": self.b_val1})
121-
self.assertEqual(rows[1], {"a": self.a_val2, "b": self.b_val2})
120+
self.assertEqual(rows[0], (self.a_val1, self.b_val1))
121+
self.assertEqual(rows[1], (self.a_val2, self.b_val2))
122122

123123
def test_count_star_and_max(self) -> None:
124124
count, maximum = count_star_and_max(

cardinal_pythonlib/sqlalchemy/tests/orm_query_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def test_get_rows_fieldnames_select_works(self) -> None:
119119
query = select(Pet.id, Pet.name).select_from(Pet.__table__)
120120
rows, fieldnames = get_rows_fieldnames_from_select(self.session, query)
121121
self.assertEqual(fieldnames, ["id", "name"])
122-
self.assertEqual(rows, [{"id": 1, "name": self._pet_1_name}])
122+
self.assertEqual(rows, [(1, self._pet_1_name)])
123123

124124
def test_get_rows_fieldnames_whole_object_q_fails(self) -> None:
125125
# We want to disallow querying

0 commit comments

Comments
 (0)