Try to make convert row work on sqla 1.3 and 1.4.

Browse Source
This commit is contained in:
Friedrich Lindenberg 2021-12-16 10:21:40 +01:00
parent 8c91b6feaa
commit 602d52f416
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dataset/util.py
View File

@ -6,17 +6,29 @@ from sqlalchemy.exc import ResourceClosedError
QUERY_STEP = 1000 QUERY_STEP = 1000
row_type = OrderedDict row_type = OrderedDict
try:
# SQLAlchemy > 1.4.0, new row model.
from sqlalchemy.engine import Row # noqa
def convert_row(row_type, row):
if row is None:
return None
return row_type(row._mapping.items())
except ImportError:
# SQLAlchemy < 1.4.0, no _mapping.
def convert_row(row_type, row):
if row is None:
return None
return row_type(row.items())
class DatasetException(Exception): class DatasetException(Exception):
pass pass
def convert_row(row_type, row):
if row is None:
return None
return row_type(row._mapping.items())
def iter_result_proxy(rp, step=None): def iter_result_proxy(rp, step=None):
"""Iterate over the ResultProxy.""" """Iterate over the ResultProxy."""
while True: while True: