Changeset 8326

Timestamp:

06/06/12 11:39:29 (9 years ago)

Author:

mnagni

Message:

Other improvement on how SA alchemy session is managed (infoDB)

Location:

mauRepo/MolesManager/trunk/src

Files:

• MolesManager/molesSessionMiddleware.py (modified) (3 diffs)
• libs/migration/InfodbEPB.py (modified) (2 diffs)
• libs/migration/processor/EPBRepo.py (modified) (1 diff)
• libs/migration/processor/deployment.py (modified) (1 diff)
• libs/migration/tests/migrationprocess.py (modified) (5 diffs)

mauRepo/MolesManager/trunk/src/MolesManager/molesSessionMiddleware.py

@@ -10 +10 @@
     MOLES3_DB_SCRIPT, EVENTS_DB, INFO_DB_CONNECTION
 from libs.commons_db import DbManager
-from libs.migration.InfodbEPB import InfodbEPB
+from libs.migration.InfodbEPB import InfodbEPBFactory
 from libs.migration.MigrationEPB import MigrationEPBFactory
 
@@ -21 +21 @@
     #_migrationThread = MigrationThread(interval = MIGRATION_INTERVAL)
     _epbInitialized = False
+    _infodbEPBFactory = None    
     _moles3EPBFactory = None
     _migrationEPBFactory = None
@@ -26 +27 @@
     def _doInitialization(self):
         infoDB = DbManager(INFO_DB_CONNECTION)
-        InfodbEPB.overrrideDBManager(infoDB)
+        MolesSessionMiddleware._infodbEPBFactory = InfodbEPBFactory(infoDB)
+        #InfodbEPB.overrrideDBManager(infoDB)
            
         migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT)

mauRepo/MolesManager/trunk/src/libs/migration/InfodbEPB.py

@@ -5 +5 @@
 '''
 from libs.epb import EPB
-from libs.migration.exception.exceptions import NoDBManager
-from sqlalchemy.sql.expression import text, bindparam
-from sqlalchemy.types import String
+from sqlalchemy.sql.expression import text
 
+class InfodbEPBFactory(EPB):
+    
+    def __init__(self, dbManager):
+        self._dbManager = dbManager
+
+    def _getSession(self):
+        if self._dbManager is not None:
+            return self._dbManager.createDbSession()                
+        return None
+        
+    def createMigrationEPB(self):
+        return InfodbEPB(self._getSession())
 
 class InfodbEPB(EPB):
     
-    _infoDB = None
-    
-    @classmethod
-    def overrrideDBManager(self, dbManager):
-        """
-            Sets the infodbEPB libs.commons_db.DbManager
-        """
-        InfodbEPB._infoDB = dbManager
+    def __init__(self, session):
+        self._session = session            
 
-    @classmethod
-    def getCedaInfoApp_dataentityByDE_ID(self, de_id, session = None):
+    def close(self):
+        return self._session.close()
+
+    def getCedaInfoApp_dataentityByDE_ID(self, de_id):
         """
             Returns a dictionary representing the cedainfoapp_dataentity table in the cedainfo DB.
@@ -38 +44 @@
                     ON cedainfoapp_dataentity.responsible_officer_id=cedainfoapp_person.id \
             WHERE cedainfoapp_dataentity.dataentity_id=:i_id")
-        records = InfodbEPB._infoDB.engine.execute(query_string, i_id=de_id)
+        records = self._session.execute(query_string, params={'i_id':de_id})
         ret = records.fetchone()
         records.close()
         return ret
-
-
-    @classmethod
-    def getNewInfoConnection(self):
-        return InfodbEPB._getConnection()
-
-    @classmethod
-    def _getConnection(self, session = None):
-        if InfodbEPB._infoDB is None:
-            raise NoDBManager("InfodbEPB")
-        return EPB._getSession(InfodbEPB._infoDB, session)

mauRepo/MolesManager/trunk/src/libs/migration/processor/EPBRepo.py

@@ -7 +7 @@
     moles3EPB = None
     migrationEPB = None
+    infodbEPB = None

mauRepo/MolesManager/trunk/src/libs/migration/processor/deployment.py

@@ -311 +311 @@
         dataentity_id = '%s__ATOM__%s' % (self._dataEntityMigration.doc_owner, self._dataEntityMigration.doc_name)
         dataentity_id = dataentity_id.replace('.atom', '')           
-        infodb_de = InfodbEPB.getCedaInfoApp_dataentityByDE_ID(dataentity_id)
+        infodb_de = EPBRepo.infodbEPB.getCedaInfoApp_dataentityByDE_ID(dataentity_id)
         i_logical_path = '/dummy'
         if infodb_de is None:

mauRepo/MolesManager/trunk/src/libs/migration/tests/migrationprocess.py

@@ -6 +6 @@
 from unittest import TestCase
 from libs.commons_db import DbManager
-from libs.migration.MigrationEPB import MigrationEPB, MigrationEPBFactory
+from libs.migration.MigrationEPB import MigrationEPBFactory
 from libs.migration.processor.loadResources import LoadResources
 from libs.migration.db.classes import MigrationObject
 from libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED
-from MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory
+from MolesManager.moles3epb import Moles3EPBFactory
 from libs.migration.processor.migrationProcess import MigrationProcess
 from testconfig import MIGRATION_DB_CONNECTION,\
     MIGRATION_DB_SCRIPT, MOLES3_DB_SCRIPT, MOLES3_DB_CONNECTION, INFO_DB_CONNECTION 
-from libs.migration.InfodbEPB import InfodbEPB
+from libs.migration.InfodbEPB import InfodbEPBFactory
 from MolesManager.settings import EVENTS_DB
 from libs.migration.client import EPBRepo
@@ -34 +34 @@
         #infoDB = DbManager(INFO_DB_CONNECTION, sql_echo=True)
         infoDB = DbManager(INFO_DB_CONNECTION)        
-        InfodbEPB.overrrideDBManager(infoDB)
+        infoFactory = InfodbEPBFactory(infoDB)
         
         moles3Factory = Moles3EPBFactory(molesDB)
@@ -41 +41 @@
         EPBRepo.moles3EPB = moles3Factory.createMoles3EPB() 
         EPBRepo.migrationEPB = migrationFactory.createMigrationEPB()
-        
+        EPBRepo.infodbEPB = infoFactory.createMigrationEPB()
+
         lr = LoadResources()
         ex = lr.process()
@@ -71 +72 @@
             print e
         #self._dropAllTables()
-        
+
+    """        
     def _dropAllTables(self):
         session = Moles3EPB.getNewMolesSession()
@@ -81 +83 @@
         session.commit()
         session.close()        
+    """    
         
         
-