fix: #390 special pwd bug fix

eosphoros-ai · Dec 6, 2023 · bc6ca11 · bc6ca11
1 parent 063c4fe
commit bc6ca11
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 52 deletions.
diff --git a/pilot/base_modules/meta_data/meta_data.py b/pilot/base_modules/meta_data/meta_data.py
@@ -30,14 +30,7 @@
 
 if CFG.LOCAL_DB_TYPE == "mysql":
     engine_temp = create_engine(
-        f"mysql+pymysql://"
-        + quote(CFG.LOCAL_DB_USER)
-        + ":"
-        + urlquote(CFG.LOCAL_DB_PASSWORD)
-        + "@"
-        + CFG.LOCAL_DB_HOST
-        + ":"
-        + str(CFG.LOCAL_DB_PORT)
+        f"mysql+pymysql://{quote(CFG.LOCAL_DB_USER)}:{urlquote(CFG.LOCAL_DB_PASSWORD)}@{CFG.LOCAL_DB_HOST}:{str(CFG.LOCAL_DB_PORT)}"
     )
     # check and auto create mysqldatabase
     try:
@@ -52,15 +45,7 @@
         logger.error(f"{db_name} not connect success!")
 
     engine = create_engine(
-        f"mysql+pymysql://"
-        + quote(CFG.LOCAL_DB_USER)
-        + ":"
-        + urlquote(CFG.LOCAL_DB_PASSWORD)
-        + "@"
-        + CFG.LOCAL_DB_HOST
-        + ":"
-        + str(CFG.LOCAL_DB_PORT)
-        + f"/{db_name}"
+        f"mysql+pymysql://{quote(CFG.LOCAL_DB_USER)}:{urlquote(CFG.LOCAL_DB_PASSWORD)}@{CFG.LOCAL_DB_HOST}:{str(CFG.LOCAL_DB_PORT)}/{db_name}"
     )
 else:
     engine = create_engine(f"sqlite:///{db_path}")

diff --git a/pilot/connections/rdbms/base.py b/pilot/connections/rdbms/base.py
@@ -114,17 +114,7 @@ def from_uri_db(
             engine_args (Optional[dict]):other engine_args.
         """
         db_url: str = (
-            cls.driver
-            + "://"
-            + quote(user)
-            + ":"
-            + urlquote(pwd)
-            + "@"
-            + host
-            + ":"
-            + str(port)
-            + "/"
-            + db_name
+            f"{cls.driver}://{quote(user)}:{urlquote(pwd)}@{host}:{str(port)}/{db_name}"
         )
         return cls.from_uri(db_url, engine_args, **kwargs)
 

diff --git a/pilot/connections/rdbms/conn_clickhouse.py b/pilot/connections/rdbms/conn_clickhouse.py
@@ -32,17 +32,7 @@ def from_uri_db(
         **kwargs: Any,
     ) -> RDBMSDatabase:
         db_url: str = (
-            cls.driver
-            + "://"
-            + quote(user)
-            + ":"
-            + urlquote(pwd)
-            + "@"
-            + host
-            + ":"
-            + str(port)
-            + "/"
-            + db_name
+            f"{cls.driver}://{quote(user)}:{urlquote(pwd)}@{host}:{str(port)}/{db_name}"
         )
         return cls.from_uri(db_url, engine_args, **kwargs)
 

diff --git a/pilot/connections/rdbms/conn_duckdb.py b/pilot/connections/rdbms/conn_duckdb.py
@@ -82,5 +82,3 @@ def table_simple_info(self) -> Iterable[str]:
 
             results.append(f"{table_name}({','.join(table_colums)});")
         return results
-
-
diff --git a/pilot/connections/rdbms/conn_postgresql.py b/pilot/connections/rdbms/conn_postgresql.py
@@ -22,17 +22,7 @@ def from_uri_db(
         **kwargs: Any,
     ) -> RDBMSDatabase:
         db_url: str = (
-            cls.driver
-            + "://"
-            + quote(user)
-            + ":"
-            + urlquote(pwd)
-            + "@"
-            + host
-            + ":"
-            + str(port)
-            + "/"
-            + db_name
+            f"{cls.driver}://{quote(user)}:{urlquote(pwd)}@{host}:{str(port)}/{db_name}"
         )
         return cls.from_uri(db_url, engine_args, **kwargs)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -82,5 +82,3 @@ def table_simple_info(self) -> Iterable[str]:

		results.append(f"{table_name}({','.join(table_colums)});")
		return results