mdbq 4.2.5__py3-none-any.whl → 4.2.6__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.2.5'
+VERSION = '4.2.6'

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
@@ -767,49 +797,7 @@ class TableManager:
         
         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:
@@ -1140,6 +1128,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.dist-info → mdbq-4.2.6.dist-info}/METADATA

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

{mdbq-4.2.5.dist-info → mdbq-4.2.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=O8I4iS-A5rEXojiLoZEoXrZC2HnbV02V4QULmZcdrdo,17
+mdbq/__version__.py,sha256=eHkRYCKowQZZAyCEcs2YyfHaFElV0-K-CqgZQLCnbA0,17
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
 mdbq/auth/auth_backend.py,sha256=iLN7AqiSq7fQgFtNtge_TIlVOR1hrCSZXH6oId6uGX4,116924
 mdbq/auth/crypto.py,sha256=fcZRFCnrKVVdWDUx_zds51ynFYwS9DBvJOrRQVldrfM,15931
@@ -15,7 +15,7 @@ mdbq/mysql/deduplicator.py,sha256=VGRBcIEsWUqQovkGpGCOittSW1l5fuMpiNWLbiOA5tI,72
 mdbq/mysql/mysql.py,sha256=eSrEE6DdS3GJ_EPPSggEZXhnVz6IqHPwUSsWfZJVFkY,57081
 mdbq/mysql/s_query.py,sha256=rCJZ0XPalwk3Z7HkqsvF9o0UX0sZT4Wk1JXryRrV6yQ,50472
 mdbq/mysql/unique_.py,sha256=MaztT-WIyEQUs-OOYY4pFulgHVcXR1BfCy3QUz0XM_U,21127
-mdbq/mysql/uploader.py,sha256=gvxYjkqNReuSN0jsORsvXBYtAp3ClKK7Uyvpo9Ei2bA,64223
+mdbq/mysql/uploader.py,sha256=8g1PkhNhfvZQnE8h6SNDwb0Uiwfn5JkQqy9Sxy21tBw,64358
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=pxcoNYoTP5KAhyvyHO2NQIrfhige5UN-LuB9Z8Iw3g8,45017
 mdbq/other/error_handler.py,sha256=4p5haAXSY-P78stp4Xwo_MwAngWYqyKj5ogWIuYXMeY,12631
@@ -35,7 +35,7 @@ mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.2.5.dist-info/METADATA,sha256=FaKLKKE30RZpI0oYAGc-ZXqMnYgDT_lluuJj2IB77xw,363
-mdbq-4.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.2.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.2.5.dist-info/RECORD,,
+mdbq-4.2.6.dist-info/METADATA,sha256=--nndNMQv1CLlqJU7mkPvb6VNFj8DPFa5NmvkEK1MkY,363
+mdbq-4.2.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.2.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.2.6.dist-info/RECORD,,

{mdbq-4.2.5.dist-info → mdbq-4.2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any