Skip to content

Fix compatibility with SQLAlchemy>=2.0.11 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarsil merged 1 commit into from
Feb 20, 2024
Merged

Fix compatibility with SQLAlchemy>=2.0.11 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions databases/backends/aiopg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[RecordInterface]:
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
for row in rows
Expand All @@ -159,7 +158,6 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[RecordInterfa
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
return Record(row, result_columns, dialect, column_maps)
Expand Down Expand Up @@ -202,7 +200,6 @@ async def iterate(
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
yield Record(record, result_columns, dialect, column_maps)
Expand Down
3 changes: 0 additions & 3 deletions databases/backends/asyncmy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[RecordInterface]:
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
for row in rows
Expand All @@ -148,7 +147,6 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[RecordInterfa
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
return Record(row, result_columns, dialect, column_maps)
Expand Down Expand Up @@ -193,7 +191,6 @@ async def iterate(
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
yield Record(record, result_columns, dialect, column_maps)
Expand Down
13 changes: 4 additions & 9 deletions databases/backends/common/records.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,17 @@ def __getitem__(self, key: typing.Any) -> typing.Any:
the values.
"""
if isinstance(key, int):
field = self._fields[key]
return self._mapping[field]
return self._mapping[key]
return super().__getitem__(key)

idx = self._key_to_index[key][0]
return super().__getitem__(idx)

def keys(self):
return self._mapping.keys()

def values(self):
return self._mapping.values()

def __getattr__(self, name: str) -> typing.Any:
try:
return self.__getitem__(name)
except KeyError as e:
raise AttributeError(e.args[0]) from e


def create_column_maps(
result_columns: typing.Any,
Expand Down
3 changes: 0 additions & 3 deletions databases/backends/mysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[RecordInterface]:
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
for row in rows
Expand All @@ -145,7 +144,6 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[RecordInterfa
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
return Record(row, result_columns, dialect, column_maps)
Expand Down Expand Up @@ -190,7 +188,6 @@ async def iterate(
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
yield Record(record, result_columns, dialect, column_maps)
Expand Down
3 changes: 0 additions & 3 deletions databases/backends/sqlite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[Record]:
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
for row in rows
Expand All @@ -109,7 +108,6 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[Record]:
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
return Record(row, result_columns, dialect, column_maps)
Expand Down Expand Up @@ -143,7 +141,6 @@ async def iterate(
metadata,
metadata._processors,
metadata._keymap,
Row._default_key_style,
row,
)
yield Record(record, result_columns, dialect, column_maps)
Expand Down