actually register database

git-svn-id: https://svn.bolloretelecom.eu/opensource/django-ldapdb/trunk@1024 e071eeec-0327-468d-9b6a-08194a12b294

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index 765bb5e1d773dc12c7db392a3b4771a43915d2a6..7dde301da3532915ec9e0a099a8b881026038f6c 100644 (file)
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -33,7 +33,7 @@
 #
 
 from django.conf import settings
 #
 
 from django.conf import settings

-from ldapdb.backends.ldap.base import DatabaseWrapper
+from django.db import connections

 
 def escape_ldap_filter(value):
     value = unicode(value)
 
 def escape_ldap_filter(value):
     value = unicode(value)


@@ -43,9 +43,11 @@ def escape_ldap_filter(value):
                 .replace(')', '\\29') \
                 .replace('\0', '\\00')
 
                 .replace(')', '\\29') \
                 .replace('\0', '\\00')
 

-# FIXME: is this the right place to initialize the LDAP connection?
-connection = DatabaseWrapper({
+# Add the LDAP backend to the configured databases
+settings.DATABASES['ldap'] = {
+    'ENGINE': 'ldapdb.backends.ldap',

     'NAME': settings.LDAPDB_SERVER_URI,
     'USER': settings.LDAPDB_BIND_DN,
     'NAME': settings.LDAPDB_SERVER_URI,
     'USER': settings.LDAPDB_BIND_DN,

-    'PASSWORD': settings.LDAPDB_BIND_PASSWORD}, 'ldap')
+    'PASSWORD': settings.LDAPDB_BIND_PASSWORD}
+connection = connections['ldap']