summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/postgresql/base.py
diff options
context:
space:
mode:
authorIlya Pekelny <ipekelny@mirantis.com>2014-07-24 19:27:18 +0300
committerIlya Pekelny <ipekelny@mirantis.com>2014-08-08 10:05:30 +0300
commita0e0f4c289b46c0c9a051c08d7f9a1929e0e30ce (patch)
tree92a5293a2bc75cb27082b3b3c6f358325005d890 /lib/sqlalchemy/dialects/postgresql/base.py
parent10bb97e89a5bdf6fab31c95f8f5a7a07b5d534bc (diff)
downloadsqlalchemy-pr/126.tar.gz
Public inspector method to load enum listpr/126
Provide opportunity to get enums list via an inspector instance public interface.
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/base.py')
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 5ff2f7c61..3356e9d4b 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1574,6 +1574,12 @@ class PGInspector(reflection.Inspector):
return self.dialect.get_table_oid(self.bind, table_name, schema,
info_cache=self.info_cache)
+ def load_enums(self, conn, schema=None):
+ """Return a enums list.
+
+ A per-database and per-schema enums list."""
+ schema = schema or self.default_schema_name
+ return self.dialect._load_enums(conn, schema)
class CreateEnumType(schema._CreateDropBase):
@@ -2424,7 +2430,8 @@ class PGDialect(default.DefaultDialect):
for name, uc in uniques.items()
]
- def _load_enums(self, connection):
+ def _load_enums(self, connection, schema=None):
+ schema = schema or self.default_schema_name
if not self.supports_native_enum:
return {}
@@ -2440,8 +2447,9 @@ class PGDialect(default.DefaultDialect):
LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
LEFT JOIN pg_catalog.pg_enum e ON t.oid = e.enumtypid
WHERE t.typtype = 'e'
+ AND n.nspname = '%s'
ORDER BY "name", e.oid -- e.oid gives us label order
- """
+ """ % schema
s = sql.text(SQL_ENUMS, typemap={
'attname': sqltypes.Unicode,