From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 12 Sep 2006 21:44:17 +0000 (+0000)
Subject: moved "c.name" to "c.key" for processing defaults since bind params use column key
X-Git-Tag: rel_0_3_0~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8474a4da82e65f06816b3ac1833fd510452d108;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

moved "c.name" to "c.key" for processing defaults since bind params use column key
---

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index f73ede7565..dd9a0d278c 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -186,18 +186,18 @@ class DefaultExecutionContext(base.ExecutionContext):
                 last_inserted_ids = []
                 need_lastrowid=False
                 for c in compiled.statement.table.c:
-                    if not param.has_key(c.name) or param[c.name] is None:
+                    if not param.has_key(c.key) or param[c.key] is None:
                         if isinstance(c.default, schema.PassiveDefault):
                             self._lastrow_has_defaults = True
                         newid = drunner.get_column_default(c)
                         if newid is not None:
-                            param[c.name] = newid
+                            param[c.key] = newid
                             if c.primary_key:
-                                last_inserted_ids.append(param[c.name])
+                                last_inserted_ids.append(param[c.key])
                         elif c.primary_key:
                             need_lastrowid = True
                     elif c.primary_key:
-                        last_inserted_ids.append(param[c.name])
+                        last_inserted_ids.append(param[c.key])
                 if need_lastrowid:
                     self._last_inserted_ids = None
                 else:
@@ -213,10 +213,10 @@ class DefaultExecutionContext(base.ExecutionContext):
             self._lastrow_has_defaults = False
             for param in plist:
                 for c in compiled.statement.table.c:
-                    if c.onupdate is not None and (not param.has_key(c.name) or param[c.name] is None):
+                    if c.onupdate is not None and (not param.has_key(c.key) or param[c.key] is None):
                         value = drunner.get_column_onupdate(c)
                         if value is not None:
-                            param[c.name] = value
+                            param[c.key] = value
                 self._last_updated_params = param