Merge branch 'IOVDb.DBConnectionFlag' into 'master'

New Config: Introduce flag to set IOVDbSvc.dbConnection

See merge request !39706

Control/AthenaConfiguration/python/AllConfigFlags.py

@@ -156,6 +156,7 @@ def _createCfgFlags():
     # Run dependent simulation
     # map from runNumber to timestamp; migrated from RunDMCFlags.py
     acf.addFlag("IOVDb.RunToTimestampDict", lambda prevFlags: getRunToTimestampDict())
+    acf.addFlag("IOVDb.DBConnection", lambda prevFlags : "sqlite://;schema=mycool.db;dbname=" + prevFlags.IOVDb.DatabaseInstance)
 
 
     def __bfield():

Database/IOVDbSvc/python/IOVDbSvcConfig.py

@@ -34,12 +34,10 @@ def IOVDbSvcCfg(configFlags):
 
     # Set up IOVDbSvc
     iovDbSvc=IOVDbSvc()
-    dbname=configFlags.IOVDb.DatabaseInstance
-
-    localfile="sqlite://;schema=mycool.db;dbname="
-    iovDbSvc.dbConnection=localfile+dbname
+    
+    iovDbSvc.dbConnection=configFlags.IOVDb.DBConnection
     # setup knowledge of dbinstance in IOVDbSvc, for global tag x-check
-    iovDbSvc.DBInstance=dbname
+    iovDbSvc.DBInstance=configFlags.IOVDb.DatabaseInstance
 
     if 'FRONTIER_SERVER' in os.environ.keys() and os.environ['FRONTIER_SERVER']!="":
         iovDbSvc.CacheAlign=3