From: Randall Smith <randall@tnr.cc>
Date: Sat, 7 Mar 2009 20:36:19 +0000 (+0000)
Subject: fixed pkey for include_columns and fkey options
X-Git-Tag: rel_0_6_6~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c4afb80500d188502bba70a9f7aad755aee2247;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fixed pkey for include_columns and fkey options
---

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 19cefd4b55..b3e52f9df6 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1984,6 +1984,8 @@ class MySQLDialect(default.DefaultDialect):
         # primary keys
         pkey_cols = self.get_primary_keys(connection, table.name,
                                           table.schema, parsed_state=parsed_state)
+        if include_columns:
+            pkey_cols = [p for p in pkey_cols if p in include_columns]
         pkey = sa_schema.PrimaryKeyConstraint()
         for col in [table.c[name] for name in pkey_cols]:
             pkey.append_column(col)
@@ -1998,7 +2000,7 @@ class MySQLDialect(default.DefaultDialect):
             ref_schema = fkey_d['referred_schema']
             ref_name = fkey_d['referred_table']
             ref_names = fkey_d['referred_columns']
-            options = fkey_d['options']
+            con_kw = fkey_d['options']
             refspec = []
 
             # load related table