From cae2e6d92e130d10b096c20847f5dbca92051edd Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 13 Jan 2024 14:26:36 +0100 Subject: [PATCH] Hopefully fixed db errors --- src/cpl_core/__init__.py | 16 ++++++++-------- src/cpl_core/application/__init__.py | 16 ++++++++-------- src/cpl_core/configuration/__init__.py | 16 ++++++++-------- src/cpl_core/console/__init__.py | 16 ++++++++-------- src/cpl_core/cpl-core.json | 4 ++-- src/cpl_core/database/__init__.py | 16 ++++++++-------- src/cpl_core/database/connection/__init__.py | 16 ++++++++-------- src/cpl_core/database/context/__init__.py | 16 ++++++++-------- .../database/context/database_context.py | 5 +---- src/cpl_core/dependency_injection/__init__.py | 16 ++++++++-------- src/cpl_core/environment/__init__.py | 16 ++++++++-------- src/cpl_core/logging/__init__.py | 16 ++++++++-------- src/cpl_core/mailing/__init__.py | 16 ++++++++-------- src/cpl_core/pipes/__init__.py | 16 ++++++++-------- src/cpl_core/time/__init__.py | 16 ++++++++-------- src/cpl_core/utils/__init__.py | 16 ++++++++-------- 16 files changed, 115 insertions(+), 118 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 14bfdc4e..9d5f2cf8 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -6,21 +6,21 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index e71170a1..f690a158 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.application' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.application" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -28,5 +28,5 @@ from .application_extension_abc import ApplicationExtensionABC from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 235bac61..fa6e3537 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.configuration' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.configuration" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -34,5 +34,5 @@ from .flag_argument import FlagArgument from .validator_abc import ValidatorABC from .variable_argument import VariableArgument -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index aff04b94..8cb0063e 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.console' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.console" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -27,5 +27,5 @@ from .console_call import ConsoleCall from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index c54f904c..ccde4c04 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,14 +4,14 @@ "Version": { "Major": "2023", "Minor": "10", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", "Description": "CPL core", "LongDescription": "CPL core package", "URL": "https://www.sh-edraft.de", - "CopyrightDate": "2020 - 2023", + "CopyrightDate": "2020 - 2024", "CopyrightName": "sh-edraft.de", "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index b7d94ebc..443edffb 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.database' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.database" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .database_settings_name_enum import DatabaseSettingsNameEnum from .database_settings import DatabaseSettings from .table_abc import TableABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 8a2232b9..919d3569 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.database.connection' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.database.connection" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index ac8ea4b6..c810f41f 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.database.context' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.database.context" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/database/context/database_context.py b/src/cpl_core/database/context/database_context.py index 809d206b..ce2a3e4e 100644 --- a/src/cpl_core/database/context/database_context.py +++ b/src/cpl_core/database/context/database_context.py @@ -21,7 +21,6 @@ class DatabaseContext(DatabaseContextABC): DatabaseContextABC.__init__(self) self._db: DatabaseConnectionABC = DatabaseConnection() - self._tables: list[TableABC] = TableABC.__subclasses__() self._settings: Optional[DatabaseSettings] = None @property @@ -32,7 +31,7 @@ class DatabaseContext(DatabaseContextABC): def _ping_and_reconnect(self): try: self._db.server.ping(reconnect=True, attempts=3, delay=5) - except mysql.connector.Error as err: + except Exception as err: # reconnect your cursor as you did in __init__ or wherever if self._settings is None: raise Exception("Call DatabaseContext.connect first") @@ -42,8 +41,6 @@ class DatabaseContext(DatabaseContextABC): if self._settings is None: self._settings = database_settings self._db.connect(database_settings) - for table in self._tables: - self._db.cursor.execute(table.get_create_string()) self.save_changes() diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index ef3f36fa..eab92e4e 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.dependency_injection' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.dependency_injection" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -30,5 +30,5 @@ from .service_lifetime_enum import ServiceLifetimeEnum from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 1c45d8c0..e1ef090a 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.environment' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.environment" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .application_environment_abc import ApplicationEnvironmentABC from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index 82dcde55..f28f1707 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.logging' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.logging" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -27,5 +27,5 @@ from .logging_level_enum import LoggingLevelEnum from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index b05601d8..f60b502e 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.mailing' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.mailing" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -27,5 +27,5 @@ from .email_client_abc import EMailClientABC from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 4ab2c213..3f3f90ef 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.pipes' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.pipes" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .bool_pipe import BoolPipe from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 36c5fbb3..6dde12a8 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.time' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.time" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index e9cfc8cc..118a8f7b 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.utils' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.utils" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .credential_manager import CredentialManager from .string import String from .pip import Pip -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2")