X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=902d23713566abaed295050faa9b8aa22ac238f2;hb=d83dc5004cd660c3aa43a56550c5e527524b5bde;hp=aa615c2e077f1b373912c6597dd6c5f14e75dc54;hpb=fe6e3af37054aa100679acf8236e17cc45c883a1;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index aa615c2..902d237 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -25,34 +25,48 @@ import ldap
 
 from django.db.models.query import QuerySet as BaseQuerySet
 from django.db.models.query_utils import Q
-from django.db.models.sql import BaseQuery
-from django.db.models.sql.where import WhereNode
-from granadilla.db import connection as ldap_connection
+from django.db.models.sql import Query as BaseQuery
+from django.db.models.sql.where import WhereNode as BaseWhereNode, AND, OR
 
-def compile(q):
-    filterstr = ""
-    for item in q.children:
-        if isinstance(item, WhereNode):
-            filterstr += compile(item)
-            continue
-        table, column, type, x, y, values = item
-        if q.negated:
-            filterstr += "(!(%s=%s))" % (column,values[0])
+import ldapdb
+
+class WhereNode(BaseWhereNode):
+    def as_sql(self):
+        bits = []
+        for item in self.children:
+            if isinstance(item, WhereNode):
+                bits.append(item.as_sql())
+                continue
+            if len(item) == 4:
+                # django 1.1
+                (table, column, type), x, y, values = item
+            else:
+                # django 1.0
+                table, column, type, x, y, values = item
+            if self.negated:
+                bits.append('(!(%s=%s))' % (column,values[0]))
+            else:
+                bits.append('(%s=%s)' % (column,values[0]))
+        if len(bits) == 1:
+            return bits[0]
+        elif self.connector == AND:
+            return '(&%s)' % ''.join(bits)
+        elif self.connector == OR:
+            return '(|%s)' % ''.join(bits)
         else:
-            filterstr += "(%s=%s)" % (column,values[0])
-    return filterstr
+            raise Exception("Unhandled WHERE connector: %s" % self.connector)
 
 class Query(BaseQuery):
     def results_iter(self):
         # FIXME: use all object classes
-        filterstr = '(objectClass=%s)' % self.model._meta.object_classes[0]
-        filterstr += compile(self.where)
+        filterstr = '(objectClass=%s)' % self.model.object_classes[0]
+        filterstr += self.where.as_sql()
         filterstr = '(&%s)' % filterstr
         attrlist = [ x.db_column for x in self.model._meta.local_fields if x.db_column ]
 
         try:
-            vals = ldap_connection.search_s(
-                self.model._meta.dn,
+            vals = ldapdb.connection.search_s(
+                self.model.base_dn,
                 ldap.SCOPE_SUBTREE,
                 filterstr=filterstr,
                 attrlist=attrlist,
@@ -60,15 +74,34 @@ class Query(BaseQuery):
         except:
             raise self.model.DoesNotExist
 
+        # perform sorting
+        if self.extra_order_by:
+            ordering = self.extra_order_by
+        elif not self.default_ordering:
+            ordering = self.order_by
+        else:
+            ordering = self.order_by or self.model._meta.ordering
+        def getkey(x):
+            keys = []
+            for k in ordering:
+                attr = self.model._meta.get_field(k).db_column
+                keys.append(x[1].get(attr, None))
+            return keys
+        vals = sorted(vals, key=lambda x: getkey(x))
+
+        # process results
         for dn, attrs in vals:
-            row = [dn]
+            row = []
             for field in iter(self.model._meta.fields):
-                row.append(attrs.get(field.db_column, None))
+                if field.attname == 'dn':
+                    row.append(dn)
+                else:
+                    row.append(attrs.get(field.db_column, None))
             yield row
 
 class QuerySet(BaseQuerySet):
     def __init__(self, model=None, query=None):
         if not query:
-            query = Query(model, None)
+            query = Query(model, None, WhereNode)
         super(QuerySet, self).__init__(model, query)