got clause elements inside INSERTs going...

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index c0aebcbaed9c88bbae610f0faf498f946a784d7b..322af156216b7b665485ed06afc8a747cfd56033 100644 (file)
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -452,13 +452,21 @@ class ANSICompiler(sql.Compiled):
         
         self.isinsert = True
         colparams = self._get_colparams(insert_stmt)
-        for c in colparams:
-            b = c[1]
-            self.binds[b.key] = b
-            self.binds[b.shortname] = b
-            
+
+        def create_param(p):
+            if isinstance(p, sql.BindParamClause):
+                self.binds[p.key] = p
+                self.binds[p.shortname] = p
+                return self.bindparam_string(p.key)
+            else:
+                p.accept_visitor(self)
+                if isinstance(p, sql.ClauseElement) and not isinstance(p, sql.ColumnElement):
+                    return "(" + self.get_str(p) + ")"
+                else:
+                    return self.get_str(p)
+
         text = ("INSERT INTO " + insert_stmt.table.fullname + " (" + string.join([c[0].name for c in colparams], ', ') + ")" +
-         " VALUES (" + string.join([self.bindparam_string(c[1].key) for c in colparams], ', ') + ")")
+         " VALUES (" + string.join([create_param(c[1]) for c in colparams], ', ') + ")")
          
         self.strings[insert_stmt] = text
 
@@ -482,7 +490,7 @@ class ANSICompiler(sql.Compiled):
                 return self.bindparam_string(p.key)
             else:
                 p.accept_visitor(self)
-                if isinstance(p, sql.ClauseElement) and not isinstance(p, sql.ColumnClause):
+                if isinstance(p, sql.ClauseElement) and not isinstance(p, sql.ColumnElement):
                     return "(" + self.get_str(p) + ")"
                 else:
                     return self.get_str(p)

diff --git a/test/select.py b/test/select.py
index 610e05cb40caa1060dbf6264c60a8519a4e05a84..081cd83beebdd4d5fe48b305d3b5cd3c1c9485d6 100644 (file)
--- a/test/select.py
+++ b/test/select.py
@@ -57,7 +57,6 @@ addresses = table('addresses',
 
 class SQLTest(PersistTest):
     def runtest(self, clause, result, engine = None, params = None, checkparams = None):
-        print "TEST with e", engine
         c = clause.compile(parameters=params, engine=engine)
         self.echo("\nSQL String:\n" + str(c) + repr(c.get_params()))
         cc = re.sub(r'\n', '', str(c))
@@ -523,6 +522,9 @@ class CRUDTest(SQLTest):
             "INSERT INTO mytable (myid, name, description) VALUES (:myid, :name, :description)",
             checkparams = {'myid':3, 'name':'jack', 'description':'mydescription'}
         )
+    
+    def testinsertexpression(self):
+        self.runtest(insert(table1), "INSERT INTO mytable (myid) VALUES (lala())", params=dict(myid=func.lala()))
         
     def testupdate(self):
         self.runtest(update(table1, table1.c.myid == 7), "UPDATE mytable SET name=:name WHERE mytable.myid = :mytable_myid", params = {table1.c.name:'fred'})
@@ -543,7 +545,7 @@ class CRUDTest(SQLTest):
             values = {
             table1.c.name : table1.c.name + "lala",
             table1.c.myid : func.do_stuff(table1.c.myid, literal('hoho'))
-            }), "UPDATE mytable SET myid=(do_stuff(mytable.myid, :literal_2)), name=(mytable.name + :mytable_name) WHERE mytable.myid = hoho(:hoho) AND mytable.name = :literal + mytable.name + :literal_1")
+            }), "UPDATE mytable SET myid=do_stuff(mytable.myid, :literal_2), name=mytable.name + :mytable_name WHERE mytable.myid = hoho(:hoho) AND mytable.name = :literal + mytable.name + :literal_1")
         
     def testcorrelatedupdate(self):
         # test against a straight text subquery