Fix #189 hstore when using ReadDictCursor (#512)

* Fixed #189

* Added test

Author: angaz

aiopg/connection.py

@@ -39,8 +39,12 @@ def _enable_hstore(conn):
         """)
     rv0, rv1 = [], []
     for oids in (yield from cur.fetchall()):
-        rv0.append(oids[0])
-        rv1.append(oids[1])
+        if isinstance(oids, dict):
+            rv0.append(oids['oid'])
+            rv1.append(oids['typarray'])
+        else:
+            rv0.append(oids[0])
+            rv1.append(oids[1])
 
     cur.close()
     return tuple(rv0), tuple(rv1)

tests/test_connection.py

@@ -52,6 +52,27 @@ def test_simple_select(connect):
     assert (1,) == ret
 
 
+@asyncio.coroutine
+def test_simple_select_with_hstore(connect):
+    conn = yield from connect()
+    cur = yield from conn.cursor()
+    yield from cur.execute("""
+        CREATE EXTENSION IF NOT EXISTS hstore;
+        CREATE TABLE hfoo (id serial, hcol hstore);
+        INSERT INTO hfoo (hcol) VALUES ('"col1"=>"456", "col2"=>"zzz"');
+    """)
+
+    # Reconnect because this is where the problem happens.
+    cur.close()
+    conn.close()
+    conn = yield from connect(cursor_factory=psycopg2.extras.RealDictCursor)
+    cur = yield from conn.cursor()
+    yield from cur.execute("SELECT * FROM hfoo;")
+    ret = yield from cur.fetchone()
+    yield from cur.execute("DROP TABLE hfoo;")
+    assert {'hcol': {'col1': '456', 'col2': 'zzz'}, 'id': 1} == ret
+
+
 @asyncio.coroutine
 def test_default_event_loop(connect, loop):
     asyncio.set_event_loop(loop)