From 4b6881af557baf36ba04766fd92bbca88dc515b5 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 7 Nov 2007 21:48:16 +0000
Subject:   - fix to compiled bind parameters to not mistakenly populate None  
   [ticket:853]

---
 lib/sqlalchemy/sql/compiler.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib/sqlalchemy/sql/compiler.py')

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 9c8a6f56e..ba4842278 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -189,9 +189,13 @@ class DefaultCompiler(engine.Compiled):
         
         if params:
             pd = {}
-            for key, bindparam in self.binds.iteritems():
-                name = self.bind_names[bindparam]
-                pd[name] = params.get(key, bindparam.value)
+            for bindparam, name in self.bind_names.iteritems():
+                for paramname in (bindparam.key, bindparam.shortname, name):
+                    if paramname in params:
+                        pd[name] = params[paramname]
+                        break
+                else:
+                    pd[name] = bindparam.value
             return pd
         else:
             return dict([(self.bind_names[bindparam], bindparam.value) for bindparam in self.bind_names])
-- 
cgit v1.2.1