From: Mike Bayer Date: Sat, 16 Jun 2012 21:53:57 +0000 (-0400) Subject: - [bug] removed unnecessary table clause when X-Git-Tag: rel_0_8_0b1~383 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2528595802a7900e1a61570d7228bd445b5b7f3f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - [bug] removed unnecessary table clause when reflecting enums, [ticket:2510]. --- diff --git a/CHANGES b/CHANGES index 83be7c4833..ceeb06d8f7 100644 --- a/CHANGES +++ b/CHANGES @@ -402,6 +402,10 @@ CHANGES when reflecting domains, [ticket:2473] also in 0.7.7 + - [bug] removed unnecessary table clause when + reflecting enums, [ticket:2510]. Courtesy + Gunnlaugur Þór Briem. Also in 0.7.8. + - mysql - [bug] Fixed bug whereby column name inside of "KEY" clause for autoincrement composite diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 29f1651fbb..7363b23340 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -1588,7 +1588,6 @@ class PGDialect(default.DefaultDialect): e.enumlabel as "label" FROM pg_catalog.pg_type t LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace - LEFT JOIN pg_catalog.pg_constraint r ON t.oid = r.contypid LEFT JOIN pg_catalog.pg_enum e ON t.oid = e.enumtypid WHERE t.typtype = 'e' ORDER BY "name", e.oid -- e.oid gives us label order