X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=795dee5f5327abc3ee00893d54b1c9d187b00400;hp=2b8237699bed2da8cab0f70c631e90abafa12b43;hb=ad7b10181730ec4888d4537256ef1c5202b564c4;hpb=0dcc0b21337a6bf4859c2a4f13c1951accf7639e

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 2b82376..795dee5 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -32,16 +32,10 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-from copy import deepcopy
-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 Query as BaseQuery
+from django.db.models.sql import Query
 from django.db.models.sql.where import WhereNode as BaseWhereNode, Constraint as BaseConstraint, AND, OR
 
-import ldapdb
-from ldapdb.backends.ldap import compiler
 from ldapdb.models.fields import CharField
 
 class Constraint(BaseConstraint):
@@ -87,52 +81,9 @@ class WhereNode(BaseWhereNode):
             obj = Constraint(obj.alias, obj.col, obj.field)
         super(WhereNode, self).add((obj, lookup_type, value), connector)
 
-class Query(BaseQuery):
-    def get_count(self, using):
-        try:
-            vals = ldapdb.connection.search_s(
-                self.model.base_dn,
-                self.model.search_scope,
-                filterstr=compiler.query_as_ldap(self),
-                attrlist=[],
-            )
-        except ldap.NO_SUCH_OBJECT:
-            return 0
-
-        number = len(vals)
-
-        # apply limit and offset
-        number = max(0, number - self.low_mark)
-        if self.high_mark is not None:
-            number = min(number, self.high_mark - self.low_mark)
-
-        return number
-
-    def get_compiler(self, using=None, connection=None):
-        return super(Query, self).get_compiler(connection=ldapdb.connection)
-
-    def has_results(self, using):
-        return self.get_count(using) != 0
-
 class QuerySet(BaseQuerySet):
     def __init__(self, model=None, query=None, using=None):
         if not query:
             query = Query(model, WhereNode)
         super(QuerySet, self).__init__(model=model, query=query, using=using)
 
-    def delete(self):
-        "Bulk deletion."
-        try:
-            vals = ldapdb.connection.search_s(
-                self.model.base_dn,
-                self.model.search_scope,
-                filterstr=compiler.query_as_ldap(self.query),
-                attrlist=[],
-            )
-        except ldap.NO_SUCH_OBJECT:
-            return
-
-        # FIXME : there is probably a more efficient way to do this 
-        for dn, attrs in vals:
-            ldapdb.connection.delete_s(dn)
-