Corrected silly circular import introduced by original "fix".

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 0d40c87f4031a1789dd7ffc4401d046d9ba0cbe9..c59caff8d25cc5c5707d39225c23ed080b9feba9 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -195,7 +195,6 @@ from ... import sql, schema, exc, util
 from ...engine import default, reflection
 from ...sql import compiler, expression, util as sql_util, operators
 from ... import types as sqltypes
-from .hstore import HSTORE
 
 try:
     from uuid import UUID as _python_UUID
@@ -894,7 +893,6 @@ ischema_names = {
     'interval': INTERVAL,
     'interval year to month': INTERVAL,
     'interval day to second': INTERVAL,
-    'hstore': HSTORE,
 }
 
 

diff --git a/lib/sqlalchemy/dialects/postgresql/hstore.py b/lib/sqlalchemy/dialects/postgresql/hstore.py
index 157e03fd51d71f90dddf1c62e32c711c0d880916..e555a1afd9ae9b74fa98a483cd0f4c3a2ec0691f 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/hstore.py
+++ b/lib/sqlalchemy/dialects/postgresql/hstore.py
@@ -6,7 +6,7 @@
 
 import re
 
-from .base import ARRAY
+from .base import ARRAY, ischema_names
 from ... import types as sqltypes
 from ...sql import functions as sqlfunc
 from ...sql.operators import custom_op
@@ -276,6 +276,9 @@ class HSTORE(sqltypes.Concatenable, sqltypes.TypeEngine):
         return process
 
 
+ischema_names['hstore'] = HSTORE
+
+
 class hstore(sqlfunc.GenericFunction):
     """Construct an hstore value within a SQL expression using the
     Postgresql ``hstore()`` function.