Skip to content

Commit c941c24

Browse files
committed
Fix SQLAlchemy 1.2.0 compatibility (#411)
1 parent 83d9714 commit c941c24

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Diff for: aiopg/sa/result.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ def __init__(self, result_proxy, metadata):
100100
self._keymap = keymap = {}
101101
self.keys = []
102102
dialect = result_proxy.dialect
103-
typemap = dialect.dbapi_type_map
104103
assert dialect.case_sensitive, \
105104
"Doesn't support case insensitive database connection"
106105

@@ -121,9 +120,7 @@ def __init__(self, result_proxy, metadata):
121120
name, obj, type_ = (
122121
colname,
123122
None,
124-
result_map.get(
125-
colname,
126-
typemap.get(coltype, sqltypes.NULLTYPE))
123+
result_map.get(colname, sqltypes.NULLTYPE),
127124
)
128125

129126
processor = type_._cached_result_processor(dialect, coltype)

Diff for: requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ pytest-cov==2.5.1
1111
pytest-sugar==0.9.0
1212
pytest-timeout==1.2.1
1313
sphinxcontrib-asyncio==0.2.0
14-
sqlalchemy==1.1.15
14+
sqlalchemy==1.2.0
1515
psycopg2==2.6.2

0 commit comments

Comments
 (0)