From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 4 Mar 2006 17:45:19 +0000 (+0000)
Subject: changed default "none" parameters to check positional style
X-Git-Tag: rel_0_1_4~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59ba54aeb872bf49d65f36dc91ad6458f252d1cf;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

changed default "none" parameters to check positional style
---

diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index 8828e2a0bd..e57cc7bc32 100644
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -500,9 +500,6 @@ class SQLEngine(schema.SchemaEngine):
 
         commit      -  if True, will automatically commit the statement after completion. """
         
-        if parameters is None:
-            parameters = {}
-
         if connection is None:
             connection = self.connection()
 
@@ -565,9 +562,6 @@ class SQLEngine(schema.SchemaEngine):
 
         commit      -  if True, will automatically commit the statement after completion. """
         
-        if parameters is None:
-            parameters = {}
-
         if connection is None:
             connection = self.connection()
 
@@ -594,6 +588,11 @@ class SQLEngine(schema.SchemaEngine):
 
     def _execute(self, c, statement, parameters):
         try:
+            if parameters is None:
+                if self.positional:
+                    parameters = ()
+                else:
+                    parameters = {}
             c.execute(statement, parameters)
         except Exception, e:
             raise exceptions.SQLError(statement, parameters, e)