-
Notifications
You must be signed in to change notification settings - Fork 260
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
➕ Code cleaning for mysql, postgres and async
* Moved common functions to a common package * Created common Record for the DB supported
- Loading branch information
Showing
7 changed files
with
265 additions
and
195 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| import json | ||
| import typing | ||
| from datetime import date, datetime | ||
|
|
||
| from sqlalchemy.engine.interfaces import Dialect | ||
| from sqlalchemy.engine.row import Row as SQLRow | ||
| from sqlalchemy.sql.compiler import _CompileLabel | ||
| from sqlalchemy.sql.schema import Column | ||
| from sqlalchemy.types import TypeEngine | ||
|
|
||
| from databases.interfaces import Record as RecordInterface | ||
|
|
||
|
|
||
| class Record(RecordInterface): | ||
| __slots__ = ( | ||
| "_row", | ||
| "_result_columns", | ||
| "_dialect", | ||
| "_column_map", | ||
| "_column_map_int", | ||
| "_column_map_full", | ||
| ) | ||
|
|
||
| def __init__( | ||
| self, | ||
| row: typing.Any, | ||
| result_columns: tuple, | ||
| dialect: Dialect, | ||
| column_maps: typing.Tuple[ | ||
| typing.Mapping[typing.Any, typing.Tuple[int, TypeEngine]], | ||
| typing.Mapping[int, typing.Tuple[int, TypeEngine]], | ||
| typing.Mapping[str, typing.Tuple[int, TypeEngine]], | ||
| ], | ||
| ) -> None: | ||
| self._row = row | ||
| self._result_columns = result_columns | ||
| self._dialect = dialect | ||
| self._column_map, self._column_map_int, self._column_map_full = column_maps | ||
|
|
||
| @property | ||
| def _mapping(self) -> typing.Mapping: | ||
| return self._row | ||
|
|
||
| def keys(self) -> typing.KeysView: | ||
| return self._mapping.keys() | ||
|
|
||
| def values(self) -> typing.ValuesView: | ||
| return self._mapping.values() | ||
|
|
||
| def __getitem__(self, key: typing.Any) -> typing.Any: | ||
| if len(self._column_map) == 0: | ||
| return self._row[key] | ||
| elif isinstance(key, Column): | ||
| idx, datatype = self._column_map_full[str(key)] | ||
| elif isinstance(key, int): | ||
| idx, datatype = self._column_map_int[key] | ||
| else: | ||
| idx, datatype = self._column_map[key] | ||
|
|
||
| raw = self._row[idx] | ||
| processor = datatype._cached_result_processor(self._dialect, None) | ||
|
|
||
| if processor is not None and (not isinstance(raw, (datetime, date))): | ||
| return processor(raw) | ||
| return raw | ||
|
|
||
| def __iter__(self) -> typing.Iterator: | ||
| return iter(self._row.keys()) | ||
|
|
||
| def __len__(self) -> int: | ||
| return len(self._row) | ||
|
|
||
| def __getattr__(self, name: str) -> typing.Any: | ||
| try: | ||
| return self.__getitem__(name) | ||
| except KeyError as e: | ||
| raise AttributeError(e.args[0]) from e | ||
|
|
||
|
|
||
| class Row(SQLRow): | ||
| def __getitem__(self, key: typing.Any) -> typing.Any: | ||
| """ | ||
| An instance of a Row in SQLAlchemy allows the access | ||
| to the Row._fields as tuple and the Row._mapping for | ||
| the values. | ||
| """ | ||
| if isinstance(key, int): | ||
| field = self._fields[key] | ||
| data = self._mapping[field] | ||
| if isinstance(data, dict): | ||
| return json.dumps(data) | ||
| return data | ||
| return self._mapping[key] | ||
|
|
||
| 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, | ||
| ) -> typing.Tuple[ | ||
| typing.Mapping[typing.Any, typing.Tuple[int, TypeEngine]], | ||
| typing.Mapping[int, typing.Tuple[int, TypeEngine]], | ||
| typing.Mapping[str, typing.Tuple[int, TypeEngine]], | ||
| ]: | ||
| """ | ||
| Generate column -> datatype mappings from the column definitions. | ||
| These mappings are used throughout PostgresConnection methods | ||
| to initialize Record-s. The underlying DB driver does not do type | ||
| conversion for us so we have wrap the returned asyncpg.Record-s. | ||
| :return: Three mappings from different ways to address a column to \ | ||
| corresponding column indexes and datatypes: \ | ||
| 1. by column identifier; \ | ||
| 2. by column index; \ | ||
| 3. by column name in Column sqlalchemy objects. | ||
| """ | ||
| column_map, column_map_int, column_map_full = {}, {}, {} | ||
| for idx, (column_name, _, column, datatype) in enumerate(result_columns): | ||
| column_map[column_name] = (idx, datatype) | ||
| column_map_int[idx] = (idx, datatype) | ||
|
|
||
| # Added in SQLA 2.0 and _CompileLabels do not have _annotations | ||
| # When this happens, the mapping is on the second position | ||
| if isinstance(column[0], _CompileLabel): | ||
| column_map_full[str(column[2])] = (idx, datatype) | ||
| else: | ||
| column_map_full[str(column[0])] = (idx, datatype) | ||
| return column_map, column_map_int, column_map_full |
Oops, something went wrong.