feat: v1.0.14

ddc · Dec 7, 2024 · 92af9b8 · 92af9b8
1 parent dfb2905
commit 92af9b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/ddcDatabases/db_utils.py b/ddcDatabases/db_utils.py
@@ -3,7 +3,6 @@
 from contextlib import asynccontextmanager, contextmanager
 from datetime import datetime
 from typing import AsyncGenerator, Generator, Optional
-
 import sqlalchemy as sa
 from sqlalchemy import RowMapping
 from sqlalchemy.engine import create_engine, Engine, URL
@@ -13,7 +12,6 @@
     create_async_engine,
 )
 from sqlalchemy.orm import Session, sessionmaker
-
 from .exceptions import (
     DBDeleteAllDataException,
     DBExecuteException,
@@ -82,7 +80,7 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
 
     @contextmanager
     def engine(self) -> Generator:
-        _connection_url = URL.create(**self.connection_url, drivername=self.sync_driver)
+        _connection_url = URL.create(drivername=self.sync_driver, **self.connection_url)
         _engine_args = {
             "url": _connection_url,
             **self.engine_args,
@@ -93,7 +91,7 @@ def engine(self) -> Generator:
 
     @asynccontextmanager
     async def async_engine(self) -> AsyncGenerator:
-        _connection_url = URL.create(**self.connection_url, drivername=self.async_driver)
+        _connection_url = URL.create(drivername=self.async_driver, **self.connection_url)
         _engine_args = {
             "url": _connection_url,
             **self.engine_args,

diff --git a/ddcDatabases/mssql.py b/ddcDatabases/mssql.py
@@ -41,7 +41,7 @@ def __init__(
         self.odbcdriver_version = int(_settings.odbcdriver_version)
         self.connection_url = {
             "host": host or _settings.host,
-            "port": port or int(_settings.port),
+            "port":  int(port or _settings.port),
             "database": database or _settings.database,
             "username": user or _settings.user,
             "password": password or _settings.password,

diff --git a/ddcDatabases/postgresql.py b/ddcDatabases/postgresql.py
@@ -31,7 +31,7 @@ def __init__(
         self.sync_driver = _settings.sync_driver
         self.connection_url = {
             "host": host or _settings.host,
-            "port": port or int(_settings.port),
+            "port":  int(port or _settings.port),
             "database": database or _settings.database,
             "username": user or _settings.user,
             "password": password or _settings.password,