Changeset 8326
- Timestamp:
- 06/06/12 11:39:29 (9 years ago)
- Location:
- mauRepo/MolesManager/trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/src/MolesManager/molesSessionMiddleware.py
r8325 r8326 10 10 MOLES3_DB_SCRIPT, EVENTS_DB, INFO_DB_CONNECTION 11 11 from libs.commons_db import DbManager 12 from libs.migration.InfodbEPB import InfodbEPB 12 from libs.migration.InfodbEPB import InfodbEPBFactory 13 13 from libs.migration.MigrationEPB import MigrationEPBFactory 14 14 … … 21 21 #_migrationThread = MigrationThread(interval = MIGRATION_INTERVAL) 22 22 _epbInitialized = False 23 _infodbEPBFactory = None 23 24 _moles3EPBFactory = None 24 25 _migrationEPBFactory = None … … 26 27 def _doInitialization(self): 27 28 infoDB = DbManager(INFO_DB_CONNECTION) 28 InfodbEPB.overrrideDBManager(infoDB) 29 MolesSessionMiddleware._infodbEPBFactory = InfodbEPBFactory(infoDB) 30 #InfodbEPB.overrrideDBManager(infoDB) 29 31 30 32 migrationDB = DbManager(MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT) -
mauRepo/MolesManager/trunk/src/libs/migration/InfodbEPB.py
r8323 r8326 5 5 ''' 6 6 from libs.epb import EPB 7 from libs.migration.exception.exceptions import NoDBManager 8 from sqlalchemy.sql.expression import text, bindparam 9 from sqlalchemy.types import String 7 from sqlalchemy.sql.expression import text 10 8 9 class InfodbEPBFactory(EPB): 10 11 def __init__(self, dbManager): 12 self._dbManager = dbManager 13 14 def _getSession(self): 15 if self._dbManager is not None: 16 return self._dbManager.createDbSession() 17 return None 18 19 def createMigrationEPB(self): 20 return InfodbEPB(self._getSession()) 11 21 12 22 class InfodbEPB(EPB): 13 23 14 _infoDB = None 15 16 @classmethod 17 def overrrideDBManager(self, dbManager): 18 """ 19 Sets the infodbEPB libs.commons_db.DbManager 20 """ 21 InfodbEPB._infoDB = dbManager 24 def __init__(self, session): 25 self._session = session 22 26 23 @classmethod 24 def getCedaInfoApp_dataentityByDE_ID(self, de_id, session = None): 27 def close(self): 28 return self._session.close() 29 30 def getCedaInfoApp_dataentityByDE_ID(self, de_id): 25 31 """ 26 32 Returns a dictionary representing the cedainfoapp_dataentity table in the cedainfo DB. … … 38 44 ON cedainfoapp_dataentity.responsible_officer_id=cedainfoapp_person.id \ 39 45 WHERE cedainfoapp_dataentity.dataentity_id=:i_id") 40 records = InfodbEPB._infoDB.engine.execute(query_string, i_id=de_id)46 records = self._session.execute(query_string, params={'i_id':de_id}) 41 47 ret = records.fetchone() 42 48 records.close() 43 49 return ret 44 45 46 @classmethod47 def getNewInfoConnection(self):48 return InfodbEPB._getConnection()49 50 @classmethod51 def _getConnection(self, session = None):52 if InfodbEPB._infoDB is None:53 raise NoDBManager("InfodbEPB")54 return EPB._getSession(InfodbEPB._infoDB, session) -
mauRepo/MolesManager/trunk/src/libs/migration/processor/EPBRepo.py
r8325 r8326 7 7 moles3EPB = None 8 8 migrationEPB = None 9 infodbEPB = None -
mauRepo/MolesManager/trunk/src/libs/migration/processor/deployment.py
r8325 r8326 311 311 dataentity_id = '%s__ATOM__%s' % (self._dataEntityMigration.doc_owner, self._dataEntityMigration.doc_name) 312 312 dataentity_id = dataentity_id.replace('.atom', '') 313 infodb_de = InfodbEPB.getCedaInfoApp_dataentityByDE_ID(dataentity_id)313 infodb_de = EPBRepo.infodbEPB.getCedaInfoApp_dataentityByDE_ID(dataentity_id) 314 314 i_logical_path = '/dummy' 315 315 if infodb_de is None: -
mauRepo/MolesManager/trunk/src/libs/migration/tests/migrationprocess.py
r8325 r8326 6 6 from unittest import TestCase 7 7 from libs.commons_db import DbManager 8 from libs.migration.MigrationEPB import MigrationEPB , MigrationEPBFactory8 from libs.migration.MigrationEPB import MigrationEPBFactory 9 9 from libs.migration.processor.loadResources import LoadResources 10 10 from libs.migration.db.classes import MigrationObject 11 11 from libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED 12 from MolesManager.moles3epb import Moles3EPB , Moles3EPBFactory12 from MolesManager.moles3epb import Moles3EPBFactory 13 13 from libs.migration.processor.migrationProcess import MigrationProcess 14 14 from testconfig import MIGRATION_DB_CONNECTION,\ 15 15 MIGRATION_DB_SCRIPT, MOLES3_DB_SCRIPT, MOLES3_DB_CONNECTION, INFO_DB_CONNECTION 16 from libs.migration.InfodbEPB import InfodbEPB 16 from libs.migration.InfodbEPB import InfodbEPBFactory 17 17 from MolesManager.settings import EVENTS_DB 18 18 from libs.migration.client import EPBRepo … … 34 34 #infoDB = DbManager(INFO_DB_CONNECTION, sql_echo=True) 35 35 infoDB = DbManager(INFO_DB_CONNECTION) 36 InfodbEPB.overrrideDBManager(infoDB)36 infoFactory = InfodbEPBFactory(infoDB) 37 37 38 38 moles3Factory = Moles3EPBFactory(molesDB) … … 41 41 EPBRepo.moles3EPB = moles3Factory.createMoles3EPB() 42 42 EPBRepo.migrationEPB = migrationFactory.createMigrationEPB() 43 43 EPBRepo.infodbEPB = infoFactory.createMigrationEPB() 44 44 45 lr = LoadResources() 45 46 ex = lr.process() … … 71 72 print e 72 73 #self._dropAllTables() 73 74 75 """ 74 76 def _dropAllTables(self): 75 77 session = Moles3EPB.getNewMolesSession() … … 81 83 session.commit() 82 84 session.close() 85 """ 83 86 84 87 85
Note: See TracChangeset
for help on using the changeset viewer.