mdbq 4.2.5__tar.gz → 4.2.7__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: mdbq
-Version: 4.2.5
+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.5 → mdbq-4.2.7}/mdbq/mysql/uploader.py

@@ -701,11 +701,41 @@ class TableManager:
                 # 过滤掉系统列
                 filtered_uk = [col for col in uk if col.lower() not in ['id', 'create_at', 'update_at']]
                 if filtered_uk:
-                    # 使用前缀索引处理超长字段
-                    optimized_uk = self._apply_prefix_index_to_columns(filtered_uk, columns)
-                    safe_uk = [f"`{self._sanitize_identifier(col)}`" for col in optimized_uk]
+                    # 先清理列名标识符，再应用前缀索引
+                    safe_uk_parts = []
+                    for col in filtered_uk:
+                        safe_col_name = self._sanitize_identifier(col)
+                        # 检查是否需要前缀索引
+                        col_type = columns.get(col, 'varchar(255)').lower()
+                        if 'varchar' in col_type:
+                            # 提取varchar长度
+                            match = re.search(r'varchar\((\d+)\)', col_type)
+                            if match:
+                                length = int(match.group(1))
+                                # 如果varchar长度超过191字符，使用前缀索引
+                                if length > 191:
+                                    prefix_length = 191
+                                    safe_uk_parts.append(f"`{safe_col_name}`({prefix_length})")
+                                    logger.debug('应用前缀索引', {
+                                        '列名': col,
+                                        '原始长度': length,
+                                        '前缀长度': prefix_length
+                                    })
+                                else:
+                                    safe_uk_parts.append(f"`{safe_col_name}`")
+                            else:
+                                # 如果没有指定长度，默认使用前缀索引
+                                safe_uk_parts.append(f"`{safe_col_name}`(191)")
+                                logger.debug('应用默认前缀索引', {
+                                    '列名': col,
+                                    '前缀长度': 191
+                                })
+                        else:
+                            # 非varchar字段保持原样
+                            safe_uk_parts.append(f"`{safe_col_name}`")
+                    
                     unique_name = f"uniq_{i}"
-                    unique_defs.append(f"UNIQUE KEY `{unique_name}` ({','.join(safe_uk)})")
+                    unique_defs.append(f"UNIQUE KEY `{unique_name}` ({','.join(safe_uk_parts)})")
         
         # 组合所有定义
         all_defs = column_defs + [primary_key_def] + unique_defs
@@ -740,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}")
@@ -753,63 +782,19 @@ 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
     
-    def _apply_prefix_index_to_columns(self, columns: List[str], column_definitions: Dict[str, str]) -> List[str]:
-        """
-        为超长的varchar字段应用前缀索引，防止索引键长度超限
-        
-        :param columns: 列名列表
-        :param column_definitions: 列定义字典
-        :return: 应用前缀索引后的列名列表
-        """
-        optimized_columns = []
-        
-        for col in columns:
-            col_type = column_definitions.get(col, 'varchar(255)').lower()
-            
-            # 只对varchar字段应用前缀索引
-            if 'varchar' in col_type:
-                # 提取varchar长度
-                match = re.search(r'varchar\((\d+)\)', col_type)
-                if match:
-                    length = int(match.group(1))
-                    # 如果varchar长度超过191字符，使用前缀索引
-                    # 191 * 4 = 764字节，在3072字节限制内比较安全
-                    if length > 191:
-                        prefix_length = 191  # 使用191字符作为前缀
-                        optimized_columns.append(f"{col}({prefix_length})")
-                        logger.info('应用前缀索引', {
-                            '列名': col,
-                            '原始长度': length,
-                            '前缀长度': prefix_length
-                        })
-                    else:
-                        optimized_columns.append(col)
-                else:
-                    # 如果没有指定长度，默认使用前缀索引
-                    optimized_columns.append(f"{col}(191)")
-                    logger.info('应用默认前缀索引', {
-                        '列名': col,
-                        '前缀长度': 191
-                    })
-            else:
-                # 非varchar字段保持原样
-                optimized_columns.append(col)
-        
-        return optimized_columns
+
 
 
 class DataProcessor:
@@ -930,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]:
@@ -941,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"""
@@ -1110,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, 
@@ -1140,6 +1126,15 @@ class MySQLUploader:
         :param unique_keys: 唯一约束列表（无需包含系统列）
         :return: 上传结果详情
         """
+        if db_name is None or table_name is None:
+            logger.error('数据库名或表名不能为空', {'db_name': db_name, 'table_name': table_name})
+            return {
+                'success': False,
+                'inserted_rows': 0,
+                'skipped_rows': 0,
+                'failed_rows': 0,
+                'tables_created': []
+            }
         db_name = db_name.lower()
         table_name = table_name.lower()
         

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

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

mdbq-4.2.5/mdbq/__version__.py

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