[EditorialModel/classes.py] Passage au db_engine()

EditorialModel/classes.py

@@ -54,7 +54,7 @@ class EmClass(EmComponent):
         values = {'name': name, 'classtype': class_type['name'], 'icon': 0}
         resclass = super(EmClass, cls).create(**values)
 
-        dbe = cls.getDbE()
+        dbe = cls.db_engine()
         conn = dbe.connect()
 
         #Create a new table storing LodelObjects of this EmClass
@@ -76,7 +76,7 @@ class EmClass(EmComponent):
             do_delete = False
             return False
 
-        dbe = self.__class__.getDbE()
+        dbe = self.__class__.db_engine()
         meta = sqlutils.meta(dbe)
         #Here we have to give a connection
         class_table = sql.Table(self.name, meta)
@@ -95,7 +95,7 @@ class EmClass(EmComponent):
     ## Isolate SQL for EmClass::fieldgroups
     # @return An array of dict (sqlalchemy fetchall)
     def _fieldgroups_db(self):
-        dbe = self.__class__.getDbE()
+        dbe = self.__class__.db_engine()
         emfg = sql.Table(EditorialModel.fieldgroups.EmFieldGroup.table, sqlutils.meta(dbe))
         req = emfg.select().where(emfg.c.class_id == self.uid)
 
@@ -114,7 +114,7 @@ class EmClass(EmComponent):
         return fields
 
     def _fields_db(self, fieldgroup_id):
-        dbe = self.__class__.getDbE()
+        dbe = self.__class__.db_engine()
         fields = sql.Table(EditorialModel.fields.EmField.table, sqlutils.meta(dbe))
         req = fields.select().where(fields.c.fieldgroup_id == fieldgroup_id)
 
@@ -134,7 +134,7 @@ class EmClass(EmComponent):
     ## Isolate SQL for EmCLass::types
     # @return An array of dict (sqlalchemy fetchall)
     def _types_db(self):
-        dbe = self.__class__.getDbE()
+        dbe = self.__class__.db_engine()
         emtype = sql.Table(EditorialModel.types.EmType.table, sqlutils.meta(dbe))
         req = emtype.select().where(emtype.c.class_id == self.uid)
         conn = dbe.connect()
@@ -152,7 +152,7 @@ class EmClass(EmComponent):
 
     def _link_type_db(self, table_name):
         #Create a new table storing LodelObjects that are linked to this EmClass
-        conn = self.__class__.getDbE().connect()
+        conn = self.__class__.db_engine().connect()
         meta = sql.MetaData()
         emlinketable = sql.Table(table_name, meta, sql.Column('uid', sql.VARCHAR(50), primary_key=True))
         emlinketable.create(conn)
@@ -164,7 +164,7 @@ class EmClass(EmComponent):
         return self._linked_types_db()
 
     def _linked_types_db(self):
-        dbe = self.__class__.getDbE()
+        dbe = self.__class__.db_engine()
         meta = sql.MetaData()
         meta.reflect(dbe)