Fixed database port handling

src/cpl_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .startup_abc import StartupABC
 from .startup_extension_abc import StartupExtensionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC
 from .variable_argument import VariableArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/console/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/cpl-core.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "7",
-      "Micro": "0.post3"
+      "Micro": "0.post4"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_core/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/database/connection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/database/connection/database_connection.py

@@ -30,6 +30,7 @@ class DatabaseConnection(DatabaseConnectionABC):
     def connect(self, database_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,
@@ -41,6 +42,7 @@ class DatabaseConnection(DatabaseConnectionABC):
             f'CREATE DATABASE IF NOT EXISTS `{database_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,

src/cpl_core/database/context/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/database/database_settings.py

@@ -14,6 +14,7 @@ class DatabaseSettings(ConfigurationModelABC):
         ConfigurationModelABC.__init__(self)
 
         self._host: Optional[str] = None
+        self._port: Optional[int] = None
         self._user: Optional[str] = None
         self._password: Optional[str] = None
         self._databse: Optional[str] = None
@@ -26,6 +27,10 @@ class DatabaseSettings(ConfigurationModelABC):
     def host(self) -> Optional[str]:
         return self._host
 
+    @property
+    def port(self) -> Optional[int]:
+        return self._port
+
     @property
     def user(self) -> Optional[str]:
         return self._user
@@ -63,6 +68,10 @@ class DatabaseSettings(ConfigurationModelABC):
         """
         try:
             self._host = settings[DatabaseSettingsNameEnum.host.value]
+            if DatabaseSettingsNameEnum.port.value in settings:
+                self._port = settings[DatabaseSettingsNameEnum.port.value]
+            else:
+                self._port = 3306
             self._user = settings[DatabaseSettingsNameEnum.user.value]
             self._password = settings[DatabaseSettingsNameEnum.password.value]
             self._databse = settings[DatabaseSettingsNameEnum.database.value]

src/cpl_core/database/database_settings_name_enum.py

@@ -4,6 +4,7 @@ from enum import Enum
 class DatabaseSettingsNameEnum(Enum):
 
     host = 'Host'
+    port = 'Port'
     user = 'User'
     password = 'Password'
     database = 'Database'

src/cpl_core/dependency_injection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/environment/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/mailing/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.pipes'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .to_camel_case_pipe import ToCamelCasePipe
 from .to_snake_case_pipe import ToSnakeCasePipe
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/time/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')

src/cpl_core/utils/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.7.0.post3'
+__version__ = '2022.7.0.post4'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='7', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='7', micro='0.post4')