summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-10-27 18:14:44 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-10-27 18:14:44 -0400
commit1e2945d26c126f0aad0dbe1c06fdcb62d3172597 (patch)
tree9210335c72267fea7ae9730ce4e92cd91b1d31d0 /lib
parentfe7322a05559534fcbacb8ae9ffc1707e3b2f261 (diff)
downloadsqlalchemy-1e2945d26c126f0aad0dbe1c06fdcb62d3172597.tar.gz
- Fixed bug where index reflection would mis-interpret indkey values
when using the pypostgresql adapter, which returns these values as lists vs. psycopg2's return type of string. [ticket:2855]
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/__init__.py2
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index f40603258..b41f3f2bc 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -116,7 +116,7 @@ from .schema import (
from .inspection import inspect
from .engine import create_engine, engine_from_config
-__version__ = '0.9.0b1'
+__version__ = '0.9.0b2'
def __go(lcls):
global __all__
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 5c88ee023..e1dc4af71 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1963,11 +1963,14 @@ class PGDialect(default.DefaultDialect):
table_oid = self.get_table_oid(connection, table_name, schema,
info_cache=kw.get('info_cache'))
+ # 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,
ix.indisunique, ix.indexprs, ix.indpred,
- a.attname, a.attnum, ix.indkey
+ a.attname, a.attnum, ix.indkey::varchar
FROM
pg_class t
join pg_index ix on t.oid = ix.indrelid