From c4fa96587315cd27dbebbb9ccb939dbd46c1e291 Mon Sep 17 00:00:00 2001 From: jlaine Date: Mon, 11 Apr 2011 11:04:06 +0000 Subject: [PATCH] use django's database router instead of hard-coding ldapdb.connection git-svn-id: https://svn.bolloretelecom.eu/opensource/django-ldapdb/trunk@1027 e071eeec-0327-468d-9b6a-08194a12b294 --- ldapdb/models/base.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/ldapdb/models/base.py b/ldapdb/models/base.py index 661c2ed..cd407a2 100644 --- a/ldapdb/models/base.py +++ b/ldapdb/models/base.py @@ -106,11 +106,18 @@ class Model(django.db.models.base.Model): """ Delete this entry. """ + using = using or router.db_for_write(self.__class__, instance=self) + connection = connections[using] logging.debug("Deleting LDAP entry %s" % self.dn) - ldapdb.connection.delete_s(self.dn) + connection.delete_s(self.dn) signals.post_delete.send(sender=self.__class__, instance=self) - - def save(self): + + def save(self, using=None): + """ + Saves the current instance. + """ + using = using or router.db_for_write(self.__class__, instance=self) + connection = connections[using] if not self.dn: # create a new entry record_exists = False @@ -122,10 +129,10 @@ class Model(django.db.models.base.Model): continue value = getattr(self, field.name) if value: - entry.append((field.db_column, field.get_db_prep_save(value, connection=ldapdb.connection))) + entry.append((field.db_column, field.get_db_prep_save(value, connection=connection))) logging.debug("Creating new LDAP entry %s" % new_dn) - ldapdb.connection.add_s(new_dn, entry) + connection.add_s(new_dn, entry) # update object self.dn = new_dn @@ -142,7 +149,7 @@ class Model(django.db.models.base.Model): new_value = getattr(self, field.name, None) if old_value != new_value: if new_value: - modlist.append((ldap.MOD_REPLACE, field.db_column, field.get_db_prep_save(new_value, connection=ldapdb.connection))) + modlist.append((ldap.MOD_REPLACE, field.db_column, field.get_db_prep_save(new_value, connection=connection))) elif old_value: modlist.append((ldap.MOD_DELETE, field.db_column, None)) @@ -151,11 +158,11 @@ class Model(django.db.models.base.Model): new_dn = self.build_dn() if new_dn != self.dn: logging.debug("Renaming LDAP entry %s to %s" % (self.dn, new_dn)) - ldapdb.connection.rename_s(self.dn, self.build_rdn()) + connection.rename_s(self.dn, self.build_rdn()) self.dn = new_dn logging.debug("Modifying existing LDAP entry %s" % self.dn) - ldapdb.connection.modify_s(self.dn, modlist) + connection.modify_s(self.dn, modlist) else: logging.debug("No changes to be saved to LDAP entry %s" % self.dn) -- 2.30.2