added "parenthesis" check on binary clauses referencing binary clauses, for [ticket...

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index b86c965c009b437533555737e8290b2ea1c7e627..7f77acf17752efda830d99ca1a721e4784ee7041 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -850,6 +850,10 @@ class BinaryClause(ClauseElement):
         self.operator = operator
         self.type = type
         self.parens = False
+        if isinstance(self.left, BinaryClause):
+            self.left.parens = True
+        if isinstance(self.right, BinaryClause):
+            self.right.parens = True
     def copy_container(self):
         return BinaryClause(self.left.copy_container(), self.right.copy_container(), self.operator)
     def _get_from_objects(self):

diff --git a/test/select.py b/test/select.py
index c11cff5ea52180821513e80f413b8166355937cf..c61b332511bbfe159931e783d7227df63c32a879 100644 (file)
--- a/test/select.py
+++ b/test/select.py
@@ -346,6 +346,30 @@ FROM mytable, myothertable WHERE foo.id = foofoo(lala) AND datetime(foo) = Today
         self.runtest(select([literal("foo") + literal("bar")], from_obj=[table1]), 
             "SELECT :literal + :liter_1 FROM mytable")
 
+    def testcalculatedcolumns(self):
+         value_tbl = table('values',
+             Column('id', Integer),
+             Column('val1', Float),
+             Column('val2', Float),
+         )
+
+         self.runtest(
+             select([value_tbl.c.id, (value_tbl.c.val2 -
+     value_tbl.c.val1)/value_tbl.c.val1]),
+             "SELECT values.id, (values.val2 - values.val1) / values.val1 FROM values"
+         )
+
+         self.runtest(
+             select([value_tbl.c.id], (value_tbl.c.val2 -
+     value_tbl.c.val1)/value_tbl.c.val1 > 2.0),
+             "SELECT values.id FROM values WHERE ((values.val2 - values.val1) / values.val1) > :literal"
+         )
+
+         self.runtest(
+             select([value_tbl.c.id], value_tbl.c.val1 / (value_tbl.c.val2 - value_tbl.c.val1) /value_tbl.c.val1 > 2.0),
+             "SELECT values.id FROM values WHERE ((values.val1 / (values.val2 - values.val1)) / values.val1) > :literal"
+         )
+         
     def testfunction(self):
         """tests the generation of functions using the func keyword"""
         # test an expression with a function
@@ -554,7 +578,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, :liter_2), name=mytable.name + :mytable_name WHERE mytable.myid = hoho(:hoho) AND mytable.name = :literal + mytable.name + :liter_1")
+            }), "UPDATE mytable SET myid=do_stuff(mytable.myid, :liter_2), name=mytable.name + :mytable_name WHERE mytable.myid = hoho(:hoho) AND mytable.name = ((:literal + mytable.name) + :liter_1)")
         
     def testcorrelatedupdate(self):
         # test against a straight text subquery