mdbq 4.2.6__tar.gz → 4.2.7__tar.gz

{mdbq-4.2.6 → mdbq-4.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.2.6
+Version: 4.2.7
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.2.7/mdbq/__version__.py

@@ -0,0 +1 @@
+VERSION = '4.2.7'

{mdbq-4.2.6 → mdbq-4.2.7}/mdbq/mysql/uploader.py

@@ -770,8 +770,7 @@ class TableManager:
         except Exception as e:
             raise ValueError(f"无效的日期值: {date_value}, 错误: {str(e)}")
     
-    @staticmethod
-    def _sanitize_identifier(identifier: str) -> str:
+    def _sanitize_identifier(self, identifier: str) -> str:
         """清理标识符"""
         if not identifier or not isinstance(identifier, str):
             raise ValueError(f"无效的标识符: {identifier}")
@@ -783,18 +782,16 @@ class TableManager:
         if not cleaned:
             raise ValueError(f"标识符清理后为空: {identifier}")
         
-        # 检查MySQL关键字
-        mysql_keywords = {
-            'select', 'insert', 'update', 'delete', 'from', 'where', 'and', 'or',
-            'not', 'like', 'in', 'is', 'null', 'true', 'false', 'between'
-        }
+        # # 检查MySQL关键字
+        # mysql_keywords = {
+        #     'select', 'insert', 'update', 'delete', 'from', 'where', 'and', 'or',
+        #     'not', 'like', 'in', 'is', 'null', 'true', 'false', 'between'
+        # }
         
         if len(cleaned) > 64:
             cleaned = cleaned[:64]
         
-        if cleaned.lower() in mysql_keywords:
-            return f"`{cleaned}`"
-        
+        # 不在这里添加反引号，让调用者决定是否需要
         return cleaned
     
 
@@ -918,8 +915,9 @@ class DataProcessor:
 class DataInserter:
     """数据插入器"""
     
-    def __init__(self, connection_manager: DatabaseConnectionManager):
+    def __init__(self, connection_manager: DatabaseConnectionManager, table_manager: TableManager = None):
         self.conn_mgr = connection_manager
+        self.table_mgr = table_manager
     
     def insert_data(self, db_name: str, table_name: str, data: List[Dict], 
                    set_typ: Dict[str, str], update_on_duplicate: bool = False) -> Tuple[int, int, int]:
@@ -929,7 +927,7 @@ class DataInserter:
         
         # 准备SQL语句（排除系统列）
         columns = [col for col in set_typ.keys() if col.lower() not in ['id', 'create_at', 'update_at']]
-        safe_columns = [TableManager._sanitize_identifier(col) for col in columns]
+        safe_columns = [self.table_mgr._sanitize_identifier(col) if self.table_mgr else col for col in columns]
         placeholders = ','.join(['%s'] * len(columns))
         
         sql = f"""
@@ -1098,7 +1096,7 @@ class MySQLUploader:
         # 初始化组件
         self.conn_mgr = DatabaseConnectionManager(self.config)
         self.table_mgr = TableManager(self.conn_mgr, collation)
-        self.data_inserter = DataInserter(self.conn_mgr)
+        self.data_inserter = DataInserter(self.conn_mgr, self.table_mgr)
     
     @retry_on_failure(max_retries=3)
     def upload_data(self, db_name: str, table_name: str, 

{mdbq-4.2.6 → mdbq-4.2.7}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.2.6
+Version: 4.2.7
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.2.6/mdbq/__version__.py

@@ -1 +0,0 @@
-VERSION = '4.2.6'