diff options
author | Ben Trofatter <trofatter@google.com> | 2013-03-18 12:40:40 -0700 |
---|---|---|
committer | Ben Trofatter <trofatter@google.com> | 2013-03-18 12:40:40 -0700 |
commit | 5b00c6555f67d0837ae64a33077dd87571fc1e0e (patch) | |
tree | 997e411039e59f812edbbbfe0a774e1e38f55e1b | |
parent | 33367fd1ee492fecb279e5b7a2219f236f8027ea (diff) | |
download | sqlalchemy-5b00c6555f67d0837ae64a33077dd87571fc1e0e.tar.gz |
Corrected silly circular import introduced by original "fix".
-rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 2 | ||||
-rw-r--r-- | lib/sqlalchemy/dialects/postgresql/hstore.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 0d40c87f4..c59caff8d 100644 --- 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 157e03fd5..e555a1afd 100644 --- 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. |