summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Menezes <rodrigo.menezes@moat.com>2014-08-26 13:02:19 -0400
committerRodrigo Menezes <rodrigo.menezes@moat.com>2014-08-26 13:02:19 -0400
commitd39be884321d0afbae7ef3da556382b53fef8060 (patch)
treec21877f4c6f809151dbcd8720fed8b859431007f
parentb3f7cd8bf497febb80e6cd7dc39effc75ff1a7e7 (diff)
downloadsqlalchemy-d39be884321d0afbae7ef3da556382b53fef8060.tar.gz
Removed changes that are no longer necessary for postgresql_relkind. Also, removed newline changes.
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py4
-rw-r--r--lib/sqlalchemy/engine/reflection.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 206a25d28..40b2f60ae 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1781,7 +1781,7 @@ class PGDialect(default.DefaultDialect):
})
]
- reflection_options = ('postgresql_ignore_search_path',)
+ reflection_options = ('postgresql_ignore_search_path', )
_backslash_escapes = True
@@ -2019,7 +2019,6 @@ class PGDialect(default.DefaultDialect):
schema_where_clause = "n.nspname = :schema"
else:
schema_where_clause = "pg_catalog.pg_table_is_visible(c.oid)"
-
query = """
SELECT c.oid
FROM pg_catalog.pg_class c
@@ -2435,6 +2434,7 @@ class PGDialect(default.DefaultDialect):
# cast indkey as varchar since it's an int2vector,
# returned as a list by some drivers such as pypostgresql
+
IDX_SQL = """
SELECT
i.relname as relname,
diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index afe9a8b3e..012d1d35d 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -378,6 +378,7 @@ class Inspector(object):
use :class:`.quoted_name`.
"""
+
return self.dialect.get_indexes(self.bind, table_name,
schema,
info_cache=self.info_cache, **kw)
@@ -404,6 +405,7 @@ class Inspector(object):
.. versionadded:: 0.8.4
"""
+
return self.dialect.get_unique_constraints(
self.bind, table_name, schema, info_cache=self.info_cache, **kw)
@@ -571,7 +573,7 @@ class Inspector(object):
conname, link_to_name=True,
**options))
# Indexes
- indexes = self.get_indexes(table_name, schema, **table.dialect_kwargs)
+ indexes = self.get_indexes(table_name, schema)
for index_d in indexes:
name = index_d['name']
columns = index_d['column_names']