|
@@ -30,7 +30,7 @@ class SQLHandlerPool(metaclass=SingletonThreadsafe):
|
|
|
self._sql_handlers = [SQLHandler() for _ in range(self._size)]
|
|
|
log.warning("Ran out of SQL handlers, 10 more have been added. Are you sure you've returned yours?")
|
|
|
return self._sql_handlers.pop()
|
|
|
-
|
|
|
+
|
|
|
def release(self, mongodb_handler):
|
|
|
if len(self._sql_handlers) < self._size:
|
|
|
self._sql_handlers.append(mongodb_handler)
|
|
@@ -57,13 +57,14 @@ class SQLHandler:
|
|
|
'''
|
|
|
|
|
|
from cdplib.log import Log
|
|
|
- from cdplib.configuration import default as cfg
|
|
|
from sqlalchemy_utils import database_exists, create_database
|
|
|
|
|
|
self._log = Log(name='SQLHandler')
|
|
|
|
|
|
if db_uri is None:
|
|
|
|
|
|
+ from libraries.configuration import default as cfg
|
|
|
+
|
|
|
db_uri = "mysql+pymysql://{0}:{1}@{2}:{3}/{4}?charset=utf8&local_infile=1"\
|
|
|
.format(cfg["SQL"]["SQL_USER"],
|
|
|
cfg["SQL"]["SQL_PASSWORD"],
|
|
@@ -143,7 +144,7 @@ class SQLHandler:
|
|
|
self.execute("DROP DATABASE IF EXISTS {}".format(database))
|
|
|
self._engine.execute("CREATE DATABASE {}".format(database))
|
|
|
self._engine.execute("USE {}".format(database))
|
|
|
-
|
|
|
+
|
|
|
@property
|
|
|
def _db_metadata(self) -> dict:
|
|
|
'''
|
|
@@ -203,7 +204,7 @@ class SQLHandler:
|
|
|
'''
|
|
|
connection = self._engine.connect()
|
|
|
transaction = connection.begin()
|
|
|
-
|
|
|
+
|
|
|
errors = []
|
|
|
|
|
|
# in the case of multi-query execute each query
|