Fixed database port handling

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'