From: Mike Bayer Date: Fri, 14 Feb 2014 19:32:00 +0000 (-0500) Subject: - Revised this very old issue where the Postgresql "get primary key" X-Git-Tag: rel_0_8_5~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30febd7c193b00edc89d79ce833cb83f2bea3144;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - Revised this very old issue where the Postgresql "get primary key" reflection query were updated to take into account primary key constraints that were renamed; the newer query fails on very old versions of Postgresql such as version 7, so the old query is restored in those cases when server_version_info < (8, 0) is detected. #2291 --- diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst index 71aee218b3..80217b12f9 100644 --- a/doc/build/changelog/changelog_08.rst +++ b/doc/build/changelog/changelog_08.rst @@ -11,6 +11,16 @@ .. changelog:: :version: 0.8.5 + .. change:: + :tags: bug, postgresql + :tickets: 2291 + + Revised this very old issue where the Postgresql "get primary key" + reflection query were updated to take into account primary key constraints + that were renamed; the newer query fails on very old versions of + Postgresql such as version 7, so the old query is restored in those cases + when server_version_info < (8, 0) is detected. + .. change:: :tags: bug, sql :tickets: 2957 diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index c451d46764..1eaa6f6e1f 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -1824,7 +1824,21 @@ class PGDialect(default.DefaultDialect): table_oid = self.get_table_oid(connection, table_name, schema, info_cache=kw.get('info_cache')) - if self.server_version_info < (8, 4): + if self.server_version_info < (8, 0): + # the shortcoming of this query is that it will + # not detect a PK constraint that has been renamed. + # This query was removed with #2291, however it was reported + # that the newer queries do not work with PG 7 so here + # it is restored when old PG versions are detected. + PK_SQL = """ + SELECT attname FROM pg_attribute + WHERE attrelid = ( + SELECT indexrelid FROM pg_index i + WHERE i.indrelid = :table_oid + AND i.indisprimary = 't') + ORDER BY attnum + """ + elif self.server_version_info < (8, 4): # unnest() and generate_subscripts() both introduced in # version 8.4 PK_SQL = """