sh-edraft.de/cpl
5
0
Fork 0
Code Issues 5 Pull Requests 2 Actions Packages Projects 1 Releases 12 Wiki Activity

Switched mysql package

Browse Source
This commit is contained in:
Sven Heidemann
2023-10-12 20:11:14 +02:00
parent affbbc822d
commit 2d8ecd424a
6 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/cpl_core/database/connection/database_connection.py
View File

@@ -25,27 +25,27 @@ class DatabaseConnection(DatabaseConnectionABC):
def cursor(self) -> MySQLCursorBuffered:
return self._cursor
def connect(self, database_settings: DatabaseSettings):
def connect(self, settings: DatabaseSettings):
connection = sql.connect(
host=database_settings.host,
port=database_settings.port,
user=database_settings.user,
passwd=CredentialManager.decrypt(database_settings.password),
charset=database_settings.charset,
use_unicode=database_settings.use_unicode,
buffered=database_settings.buffered,
auth_plugin=database_settings.auth_plugin,
host=settings.host,
port=settings.port,
user=settings.user,
passwd=CredentialManager.decrypt(settings.password),
charset=settings.charset,
use_unicode=settings.use_unicode,
buffered=settings.buffered,
auth_plugin=settings.auth_plugin,
)
connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{database_settings.database}`;")
connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{settings.database}`;")
self._database = sql.connect(
host=database_settings.host,
port=database_settings.port,
user=database_settings.user,
passwd=CredentialManager.decrypt(database_settings.password),
db=database_settings.database,
charset=database_settings.charset,
use_unicode=database_settings.use_unicode,
buffered=database_settings.buffered,
auth_plugin=database_settings.auth_plugin,
host=settings.host,
port=settings.port,
user=settings.user,
passwd=CredentialManager.decrypt(settings.password),
db=settings.database,
charset=settings.charset,
use_unicode=settings.use_unicode,
buffered=settings.buffered,
auth_plugin=settings.auth_plugin,
)
self._cursor = self._database.cursor()

8
src/cpl_core/database/database_settings.py
View File

@@ -13,10 +13,10 @@ class DatabaseSettings(ConfigurationModelABC):
user: str = None,
password: str = None,
database: str = None,
charset: str = None,
use_unicode: bool = None,
buffered: bool = None,
auth_plugin: str = None,
charset: str = "utf8mb4",
use_unicode: bool = False,
buffered: bool = False,
auth_plugin: str = "caching_sha2_password",
):
ConfigurationModelABC.__init__(self)