server/sources/rql2sql.py
changeset 7359 40490b9e0a6e
parent 7257 beea955b45e2
parent 7357 5ad3154a8810
child 7397 6a9e66d788b3
--- a/server/sources/rql2sql.py	Tue May 10 18:53:18 2011 +0200
+++ b/server/sources/rql2sql.py	Tue May 10 18:53:30 2011 +0200
@@ -588,16 +588,16 @@
                 rconditions.append(condition)
             else:
                 lconditions.append(condition)
-        else:
-            if louter is not None:
-                raise BadRQLQuery()
+        elif louter is None:
             # merge chains
             self.outer_chains.remove(lchain)
+            rchain += lchain
             self.mark_as_used_in_outer_join(leftalias)
-            rchain += lchain
             for alias, (aouter, aconditions, achain) in outer_tables.iteritems():
                 if achain is lchain:
                     outer_tables[alias] = (aouter, aconditions, rchain)
+        else:
+            raise BadRQLQuery()
 
     # sql generation helpers ###################################################