ezKit 1.12.49__py3-none-any.whl → 1.12.51__py3-none-any.whl

ezKit/database.py

@@ -137,11 +137,11 @@ def replace_datetime(source: str, to_pgsql: bool = True) -> str:
     """
 
     if to_pgsql:
-        pattern = re.compile(r"(^|\.)(datetime_date)(__|$)")
-        return pattern.sub(r"\1datetime::date\3", source, count=1)
+        pattern = re.compile(r"(^|\.)datetime_date(__|$)")
+        return pattern.sub(r"\1datetime::date\2", source, count=1)
 
-    pattern = re.compile(r"(^|\.)(datetime::date)$")
-    return pattern.sub(r"\1datetime_date\3", source, count=1)
+    pattern = re.compile(r"(^|_)datetime::date$")
+    return pattern.sub(r"\1datetime_date", source, count=1)
 
 
 def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, Any], list]]:
@@ -238,7 +238,7 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
             # 如果匹配到 datetime_date 或者 .datetime_date 或者 datetime_date__ 或者 .datetime_date__ 就替换
             # is_date_field = field == "datetime_date" or field.startswith("datetime_date__")
             # base_field = field.replace("datetime_date", "datetime::date", 1) if is_date_field else field
-            pattern_date_field = re.compile(r"(^|\.)(datetime_date)(__|$)")
+            pattern_date_field = re.compile(r"(^|\.)datetime_date(__|$)")
             if pattern_date_field.search(field):
                 # base_field = pattern_date.sub(r"\1datetime::date\3", field, count=1)
                 base_field = replace_datetime(field, to_pgsql=True)
@@ -255,7 +255,7 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                 # 特殊处理日期字段
                 # if param_key.startswith("datetime::date"):
                 #     param_key = param_key.replace("datetime::date", "datetime_date", 1)
-                pattern_param_key = re.compile(r"(^|\.)(datetime::date)$")
+                pattern_param_key = re.compile(r"(^|_)datetime::date$")
                 if pattern_param_key.search(param_key):
                     param_key = replace_datetime(param_key, to_pgsql=False)
 
@@ -282,7 +282,7 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                 # 如果匹配到 datetime_date 或者 .datetime_date 或者 datetime_date__ 或者 .datetime_date__ 就替换
                 # if param_key.startswith("datetime::date"):
                 #     param_key = param_key.replace("datetime::date", "datetime_date", 1)
-                pattern_param_key = re.compile(r"(^|\.)(datetime::date)$")
+                pattern_param_key = re.compile(r"(^|_)datetime::date$")
                 if pattern_param_key.search(param_key):
                     param_key = replace_datetime(param_key, to_pgsql=False)
                 sql_parts.append(f"{base_field} = :{param_key}")
@@ -599,18 +599,14 @@ class Database:
         try:
             # SQL文件优先
             if isinstance(read_sql_file, dict) and utils.isTrue(read_sql_file, dict):
-                read_sql_file.pop("encoding")
-                read_sql_file_kwargs: dict = {
-                    "mode": "r",
-                    "encoding": "utf-8",
-                    **read_sql_file,
-                }
-                with open(encoding="utf-8", **read_sql_file_kwargs) as _file:
-                    sql_statement = _file.read()
-            else:
-                if not isinstance(sql, str):
-                    return None
+                encoding = read_sql_file.pop("encoding", "utf-8")
+                file_kwargs = {"mode": "r", **read_sql_file}
+                with open(encoding=encoding, **file_kwargs) as f:
+                    sql_statement = f.read()
+            elif isinstance(sql, str):
                 sql_statement = sql
+            else:
+                return None
         except Exception as e:
             logger.exception(e)
             return None
@@ -618,36 +614,58 @@ class Database:
         # ------------------------------------------------------------------------------------------
 
         # 创建一个连接
-        with self.engine.connect() as connection:
+        # with self.engine.connect() as connection:
 
-            # 开始一个事务
-            with connection.begin():  # 事务会自动提交或回滚
+        #     # 开始一个事务
+        #     with connection.begin():  # 事务会自动提交或回滚
 
-                try:
+        #         try:
 
-                    # 执行 SQL 查询
-                    result = connection.execute(text(sql_statement))
+        #             # 执行 SQL 查询
+        #             result = connection.execute(text(sql_statement))
 
-                    # 执行成功
-                    logger.success(f"{info} [success]")
+        #             # 执行成功
+        #             logger.success(f"{info} [success]")
 
-                    # 返回查询结果
-                    if isinstance(save_to_csv, dict) and utils.isTrue(save_to_csv, dict):
-                        save_to_csv_kwargs: dict = {
-                            "mode": "w",
-                            "encoding": "utf-8",
-                            **save_to_csv,
-                        }
-                        with open(encoding="utf-8", **save_to_csv_kwargs) as _file:
-                            return self._result_save(_file, result)
+        #             # 返回查询结果
+        #             if isinstance(save_to_csv, dict) and utils.isTrue(save_to_csv, dict):
+        #                 save_to_csv_kwargs: dict = {
+        #                     "mode": "w",
+        #                     "encoding": "utf-8",
+        #                     **save_to_csv,
+        #                 }
+        #                 with open(encoding="utf-8", **save_to_csv_kwargs) as _file:
+        #                     return self._result_save(_file, result)
 
-                    return result
+        #             return result
 
-                except Exception as e:
-                    # 发生异常时回滚事务
-                    logger.info(f"{info} [failed]")
-                    logger.exception(e)
-                    return None
+        #         except Exception as e:
+        #             # 发生异常时回滚事务
+        #             logger.info(f"{info} [failed]")
+        #             logger.exception(e)
+        #             return None
+
+        try:
+
+            # 连接 + 事务
+            with self.engine.connect() as conn, conn.begin():
+
+                result = conn.execute(text(sql_statement))
+
+                logger.success(f"{info} [success]")
+
+                if isinstance(save_to_csv, dict) and utils.isTrue(save_to_csv, dict):
+                    encoding = save_to_csv.pop("encoding", "utf-8")
+                    csv_kwargs = {"mode": "w", **save_to_csv}
+                    with open(encoding=encoding, **csv_kwargs) as f:
+                        return self._result_save(f, result)
+
+                return result
+
+        except Exception as e:
+            logger.error(f"{info} [failed]")
+            logger.exception(e)
+            return None
 
     # ----------------------------------------------------------------------------------------------
 

{ezkit-1.12.49.dist-info → ezkit-1.12.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezKit
-Version: 1.12.49
+Version: 1.12.51
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.12.49.dist-info → ezkit-1.12.51.dist-info}/RECORD

@@ -4,7 +4,7 @@ ezKit/auth.py,sha256=HO19O4qOz68e0YwOP04habxMCAk42B3D7LW7yKgm9ZA,398
 ezKit/bottle.py,sha256=43h4v1kzz6qrLvCt5IMN0H-gFtaT0koG9wETqteXsps,181666
 ezKit/bottle_extensions.py,sha256=27rogmfK7mL2qUSjXH79IMGZbCVULtYEikql_N9O6Zs,1165
 ezKit/cipher.py,sha256=7jBarRH7ukSYzkz-Anl8B8JzluhnRz4CLHidPRRj_cg,2939
-ezKit/database.py,sha256=zXhbBd378w_dW_dLlq2lmTkw8ztzQJT1KKZDlEvWPrY,34688
+ezKit/database.py,sha256=PNWEIG7tcIgJqo1mVgmFUZ7YciKdTBpBly1mqXZZp50,35328
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/errors.py,sha256=92PggwPQfTS3Vg4og7GHYnO9CTSM7zmuh2w3kx_tSBE,1425
 ezKit/fastapix.py,sha256=-nz565ASKvp3nGs9J4wORTHxlhMozqCwv8zREWpmYtI,3382
@@ -18,8 +18,8 @@ ezKit/token.py,sha256=Ac-i9xfq4TqpGyfCzakjrh4NYzxHiN2sCQrMk1tzVi8,1716
 ezKit/utils.py,sha256=U457ahFkxIXuB-qWvS3995xJs-LlkFIX5_ZWVgmL5cY,43130
 ezKit/xftp.py,sha256=-XQXyhMqeigT63P6sXkSS7r4GROXyqqlkzKxITLWG-g,8278
 ezKit/zabbix.py,sha256=PkMnfu7mcuotwwIIsHaC9FsNg-gap6hD1xvm0AwSL1Y,33777
-ezkit-1.12.49.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.49.dist-info/METADATA,sha256=3NWuPiRzLrVCrmKkSL1vH8CeMra-YkfSrfq8oZ5k34o,317
-ezkit-1.12.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.49.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.49.dist-info/RECORD,,
+ezkit-1.12.51.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.51.dist-info/METADATA,sha256=Lk2T7zr1PyeZp_IINHyY01DdzVr_hkDHWbjqfVAZtVE,317
+ezkit-1.12.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.51.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.51.dist-info/RECORD,,