From 3cbe90efbebd38c570a137d2801753e3aa55823b Mon Sep 17 00:00:00 2001 From: Diana Clarke Date: Mon, 2 Apr 2012 21:07:37 -0400 Subject: deprecate inspector.get_primary_keys() in favor of inspector.get_pk_constraint() - see #2422 --- lib/sqlalchemy/dialects/firebird/base.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/dialects/firebird/base.py') diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py index 5ef30b36d..a0e48da2c 100644 --- a/lib/sqlalchemy/dialects/firebird/base.py +++ b/lib/sqlalchemy/dialects/firebird/base.py @@ -474,7 +474,7 @@ class FBDialect(default.DefaultDialect): return None @reflection.cache - def get_primary_keys(self, connection, table_name, schema=None, **kw): + def get_pk_constraint(self, connection, table_name, schema=None, **kw): # Query to extract the PK/FK constrained fields of the given table keyqry = """ SELECT se.rdb$field_name AS fname @@ -486,7 +486,7 @@ class FBDialect(default.DefaultDialect): # get primary key fields c = connection.execute(keyqry, ["PRIMARY KEY", tablename]) pkfields = [self.normalize_name(r['fname']) for r in c.fetchall()] - return pkfields + return {'constrained_columns':pkfields, 'name':None} @reflection.cache def get_column_sequence(self, connection, @@ -541,7 +541,8 @@ class FBDialect(default.DefaultDialect): ORDER BY r.rdb$field_position """ # get the PK, used to determine the eventual associated sequence - pkey_cols = self.get_primary_keys(connection, table_name) + pk_constraint = self.get_pk_constraint(connection, table_name) + pkey_cols = pk_constraint['constrained_columns'] tablename = self.denormalize_name(table_name) # get all of the fields for this table -- cgit v1.2.1