fix lookups with django 1.2

[matthijs/upstream/django-ldapdb.git] / ldapdb / models / query.py

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index a8c614f7ccfe6a2ee487ac35b38bb474951efa0c..738124f0db7f2654613bfd5c0f85612e748eb689 100644 (file)
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -81,20 +81,26 @@ class WhereNode(BaseWhereNode):
             if isinstance(item, WhereNode):
                 bits.append(item.as_sql())
                 continue
-            constraint, x, y, values = item
+
+            constraint, lookup_type, y, values = item
+            comp = get_lookup_operator(lookup_type)
             if hasattr(constraint, "col"):
                 # django 1.2
-                comp = get_lookup_operator(constraint.lookup_type)
-                clause = "(%s%s%s)" % (constraint.col, comp, values)
+                column = constraint.col
+                if lookup_type == 'in':
+                    equal_bits = [ "(%s%s%s)" % (column, comp, value) for value in values ]
+                    clause = '(|%s)' % ''.join(equal_bits)
+                else:
+                    clause = "(%s%s%s)" % (constraint.col, comp, values)
             else:
                 # django 1.1
                 (table, column, db_type) = constraint
-                comp = get_lookup_operator(x)
                 equal_bits = [ "(%s%s%s)" % (column, comp, value) for value in values ]
                 if len(equal_bits) == 1:
                     clause = equal_bits[0]
                 else:
                     clause = '(|%s)' % ''.join(equal_bits)
+
             if self.negated:
                 bits.append('(!%s)' % clause)
             else: