git-svn-id: https://svn.bolloretelecom.eu/opensource/django-ldapdb/trunk@1029
e071eeec-0327-468d-9b6a-
08194a12b294
import ldap
import ldapdb
import ldap
import ldapdb
+from ldapdb.backends.ldap.compiler import query_as_ldap
from examples.models import LdapUser, LdapGroup
class BaseTestCase(TestCase):
from examples.models import LdapUser, LdapGroup
class BaseTestCase(TestCase):
def test_ldap_filter(self):
# single filter
qs = LdapGroup.objects.filter(name='foogroup')
def test_ldap_filter(self):
# single filter
qs = LdapGroup.objects.filter(name='foogroup')
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(cn=foogroup))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(cn=foogroup))')
qs = LdapGroup.objects.filter(Q(name='foogroup'))
qs = LdapGroup.objects.filter(Q(name='foogroup'))
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(cn=foogroup))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(cn=foogroup))')
# AND filter
qs = LdapGroup.objects.filter(gid=1000, name='foogroup')
# AND filter
qs = LdapGroup.objects.filter(gid=1000, name='foogroup')
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
qs = LdapGroup.objects.filter(Q(gid=1000) & Q(name='foogroup'))
qs = LdapGroup.objects.filter(Q(gid=1000) & Q(name='foogroup'))
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
# OR filter
qs = LdapGroup.objects.filter(Q(gid=1000) | Q(name='foogroup'))
# OR filter
qs = LdapGroup.objects.filter(Q(gid=1000) | Q(name='foogroup'))
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(|(gidNumber=1000)(cn=foogroup)))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(|(gidNumber=1000)(cn=foogroup)))')
# single exclusion
qs = LdapGroup.objects.exclude(name='foogroup')
# single exclusion
qs = LdapGroup.objects.exclude(name='foogroup')
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
qs = LdapGroup.objects.filter(~Q(name='foogroup'))
qs = LdapGroup.objects.filter(~Q(name='foogroup'))
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
# multiple exclusion
qs = LdapGroup.objects.exclude(name='foogroup', gid=1000)
# multiple exclusion
qs = LdapGroup.objects.exclude(name='foogroup', gid=1000)
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(!(&(gidNumber=1000)(cn=foogroup))))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(!(&(gidNumber=1000)(cn=foogroup))))')
qs = LdapGroup.objects.filter(name='foogroup').exclude(gid=1000)
qs = LdapGroup.objects.filter(name='foogroup').exclude(gid=1000)
- self.assertEquals(qs.query._ldap_filter(), '(&(objectClass=posixGroup)(&(cn=foogroup)(!(gidNumber=1000))))')
+ self.assertEquals(query_as_ldap(qs.query), '(&(objectClass=posixGroup)(&(cn=foogroup)(!(gidNumber=1000))))')
def test_filter(self):
qs = LdapGroup.objects.filter(name='foogroup')
def test_filter(self):
qs = LdapGroup.objects.filter(name='foogroup')