X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fbackends%2Fldap%2Fcompiler.py;h=3636ede49732edf247d1580a7e5340cfb807e2d4;hb=refs%2Fheads%2Fmaster;hp=df3247f76b720d8d7c4c701db835496027dc0c42;hpb=34230614a161ca1d9b43af5d528d64f10dd5ea73;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/backends/ldap/compiler.py b/ldapdb/backends/ldap/compiler.py
index df3247f..3636ede 100644
--- a/ldapdb/backends/ldap/compiler.py
+++ b/ldapdb/backends/ldap/compiler.py
@@ -34,7 +34,8 @@
 
 import ldap
 
-from django.db.models.sql import compiler
+from django.db.models.sql import aggregates, compiler
+from django.db.models.sql.where import AND, OR
 
 def get_lookup_operator(lookup_type):
     if lookup_type == 'gte':
@@ -44,11 +45,22 @@ def get_lookup_operator(lookup_type):
     else:
         return '='
 
-def where_as_sql(self, qn=None, connection=None):
+def query_as_ldap(query):
+    # TODO: Filtering on objectClass temporarily disabled, since this
+    # breaks Model.save() after an objectclass was added (it queries the
+    # database for the old values to see what changed, but filtering on
+    # the new objectclasses does not return the object).
+    #filterstr = ''.join(['(objectClass=%s)' % cls for cls in query.model.object_classes])
+    filterstr = ''
+    sql, params = where_as_ldap(query.where)
+    filterstr += sql
+    return '(&%s)' % filterstr
+
+def where_as_ldap(self):
     bits = []
     for item in self.children:
         if hasattr(item, 'as_sql'):
-            sql, params = where_as_sql(item, qn=qn, connection=connection)
+            sql, params = where_as_ldap(item)
             bits.append(sql)
             continue
 
@@ -85,11 +97,36 @@ class SQLCompiler(object):
         self.connection = connection
         self.using = using
 
-    def _ldap_filter(self):
-        filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.query.model.object_classes])
-        sql, params = where_as_sql(self.query.where)
-        filterstr += sql
-        return '(&%s)' % filterstr
+    def execute_sql(self, result_type=compiler.MULTI):
+        if result_type !=compiler.SINGLE:
+            raise Exception("LDAP does not support MULTI queries")
+
+        for key, aggregate in self.query.aggregate_select.items():
+            if not isinstance(aggregate, aggregates.Count):
+                raise Exception("Unsupported aggregate %s" % aggregate)
+
+        try:
+            vals = self.connection.search_s(
+                self.query.model.base_dn,
+                self.query.model.search_scope,
+                filterstr=query_as_ldap(self.query),
+                attrlist=['dn'],
+            )
+        except ldap.NO_SUCH_OBJECT:
+            vals = []
+
+        if not vals:
+            return None
+
+        output = []
+        for alias, col in self.query.extra_select.iteritems():
+            output.append(col[0])
+        for key, aggregate in self.query.aggregate_select.items():
+            if isinstance(aggregate, aggregates.Count):
+                output.append(len(vals))
+            else:
+                output.append(None)
+        return output
 
     def results_iter(self):
         if self.query.select_fields:
@@ -103,7 +140,7 @@ class SQLCompiler(object):
             vals = self.connection.search_s(
                 self.query.model.base_dn,
                 self.query.model.search_scope,
-                filterstr=self._ldap_filter(),
+                filterstr=query_as_ldap(self.query),
                 attrlist=attrlist,
             )
         except ldap.NO_SUCH_OBJECT:
@@ -167,8 +204,8 @@ class SQLDeleteCompiler(compiler.SQLDeleteCompiler, SQLCompiler):
             vals = self.connection.search_s(
                 self.query.model.base_dn,
                 self.query.model.search_scope,
-                filterstr=self._ldap_filter(),
-                attrlist=[],
+                filterstr=query_as_ldap(self.query),
+                attrlist=['dn'],
             )
         except ldap.NO_SUCH_OBJECT:
             return