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

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 2b82376..6b1c223 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -35,12 +35,12 @@
 from copy import deepcopy
 import ldap
 
+from django.db import connections
 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
 
@@ -87,33 +87,6 @@ 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:
@@ -122,8 +95,9 @@ class QuerySet(BaseQuerySet):
 
     def delete(self):
         "Bulk deletion."
+        connection = connections[self.db]
         try:
-            vals = ldapdb.connection.search_s(
+            vals = connection.search_s(
                 self.model.base_dn,
                 self.model.search_scope,
                 filterstr=compiler.query_as_ldap(self.query),
@@ -134,5 +108,5 @@ class QuerySet(BaseQuerySet):
 
         # FIXME : there is probably a more efficient way to do this 
         for dn, attrs in vals:
-            ldapdb.connection.delete_s(dn)
+            connection.delete_s(dn)