mdbq 3.10.2__py3-none-any.whl → 3.10.3__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '3.10.2'
+VERSION = '3.10.3'

mdbq/mysql/uploader.py

@@ -303,8 +303,8 @@ class MySQLUploader:
                     return exists
         except Exception as e:
             logger.error(sys._getframe().f_code.co_name, {
+                '库': db_name,
                 '检查数据库是否存在时出错': str(e),
-                '库': db_name
             })
             raise
 
@@ -546,9 +546,9 @@ class MySQLUploader:
 
         except Exception as e:
             logger.error(sys._getframe().f_code.co_name, {
-                '建表失败': str(e),
                 '库': db_name,
                 '表': table_name,
+                '建表失败': str(e),
             })
             conn.rollback()
             raise
@@ -678,9 +678,9 @@ class MySQLUploader:
                     return set_typ
         except Exception as e:
             logger.error(sys._getframe().f_code.co_name, {
-                '无法获取表列信息': str(e),
                 '库': db_name,
                 '表': table_name,
+                '无法获取表列信息': str(e),
             })
             raise
 
@@ -709,9 +709,9 @@ class MySQLUploader:
                                    allow_null=allow_null)
             else:
                 logger.error(sys._getframe().f_code.co_name, {
-                    '数据表不存在': table_name,
                     '库': db_name,
                     '表': table_name,
+                    '数据表不存在': table_name,
                 })
                 raise ValueError(f"数据表不存在: `{db_name}`.`{table_name}`")
 
@@ -719,9 +719,9 @@ class MySQLUploader:
         table_columns = self._get_table_columns(db_name, table_name)
         if not table_columns:
             logger.error(sys._getframe().f_code.co_name, {
-                '获取列失败': table_columns,
                 '库': db_name,
                 '表': table_name,
+                '获取列失败': table_columns,
             })
             raise ValueError(f"获取列失败 `{db_name}`.`{table_name}`")
 
@@ -729,9 +729,9 @@ class MySQLUploader:
         for col in set_typ:
             if col not in table_columns:
                 logger.error(sys._getframe().f_code.co_name, {
-                    '列不存在': f'{col} -> {table_columns}',
                     '库': db_name,
                     '表': table_name,
+                    '列不存在': f'{col} -> {table_columns}',
                 })
                 raise ValueError(f"列不存在: `{col}` -> `{db_name}`.`{table_name}`")
 
@@ -960,7 +960,7 @@ class MySQLUploader:
             默认值为 'batch'
         :raises: 可能抛出各种验证和数据库相关异常
         """
-        upload_start = time.time()
+        # upload_start = time.time()
         initial_row_count = len(data) if hasattr(data, '__len__') else 1
 
         batch_id = f"batch_{int(time.time() * 1000)}"
@@ -972,7 +972,7 @@ class MySQLUploader:
             '批次': batch_id,
             '分表方式': partition_by,
             '排重': check_duplicate,
-            '传入总计': len(data) if hasattr(data, '__len__') else 1,
+            '传入': len(data) if hasattr(data, '__len__') else 1,
             '自动建表': auto_create
         })
 
@@ -985,10 +985,10 @@ class MySQLUploader:
                 partition_by = str(partition_by).lower()
                 if partition_by not in ['year', 'month']:
                     logger.error(sys._getframe().f_code.co_name, {
-                        '分表方式必须是 "year" 或 "month" 或 "None"':  partition_by,
                         '库': db_name,
                         '表': table_name,
-                        '批次': batch_id
+                        '批次': batch_id,
+                        '分表方式必须是 "year" 或 "month" 或 "None"': partition_by,
                     })
                     raise ValueError("分表方式必须是 'year' 或 'month' 或 'None'")
 
@@ -1029,10 +1029,10 @@ class MySQLUploader:
                         partitioned_data[part_table].append(row)
                     except Exception as e:
                         logger.error(sys._getframe().f_code.co_name, {
-                            'row_data': row,
-                            '分表处理失败': str(e),
                             '库': db_name,
                             '表': table_name,
+                            'row_data': row,
+                            '分表处理失败': str(e),
                         })
                         continue  # 跳过当前行
 
@@ -1047,10 +1047,10 @@ class MySQLUploader:
                         )
                     except Exception as e:
                         logger.error(sys._getframe().f_code.co_name, {
-                            '分表': part_table,
-                            '分表上传失败': str(e),
                             '库': db_name,
                             '表': table_name,
+                            '分表': part_table,
+                            '分表上传失败': str(e),
                         })
                         continue  # 跳过当前分表，继续处理其他分表
             else:
@@ -1066,10 +1066,10 @@ class MySQLUploader:
 
         except Exception as e:
             logger.error(sys._getframe().f_code.co_name, {
-                '上传过程发生全局错误': str(e),
-                'error_type': type(e).__name__,
                 '库': db_name,
                 '表': table_name,
+                '上传过程发生全局错误': str(e),
+                'error_type': type(e).__name__,
             })
         finally:
             logger.info("存储完成", {
@@ -1077,7 +1077,7 @@ class MySQLUploader:
                 '表': table_name,
                 '批次': batch_id,
                 'success': success_flag,
-                '耗时': round(time.time() - upload_start, 2),
+                # '耗时': round(time.time() - upload_start, 2),
                 '数据行': initial_row_count
             })
 
@@ -1164,8 +1164,8 @@ class MySQLUploader:
             update_on_duplicate: bool
     ) -> str:
         """准备插入SQL语句"""
-        # 获取所有列名（排除id列）
-        all_columns = [col for col in set_typ.keys() if col.lower() != 'id']
+        # 获取所有列名（排除 `id`、`更新时间` 列）
+        all_columns = [col for col in set_typ.keys() if col.lower() not in ['id', '更新时间']]
         safe_columns = [self._validate_identifier(col) for col in all_columns]
         placeholders = ','.join(['%s'] * len(safe_columns))
 
@@ -1173,7 +1173,7 @@ class MySQLUploader:
             if not duplicate_columns:
                 duplicate_columns = all_columns
             else:
-                duplicate_columns = [col for col in duplicate_columns if col != 'id']
+                duplicate_columns = [col for col in duplicate_columns if col.lower() not in ['id', '更新时间']]
 
             conditions = []
             for col in duplicate_columns:

{mdbq-3.10.2.dist-info → mdbq-3.10.3.dist-info}/METADATA

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

{mdbq-3.10.2.dist-info → mdbq-3.10.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=tL5iFQ6j9Svg-3tbUuEZAgDFN3ipIhdJjFUPU6EHSRQ,18
+mdbq/__version__.py,sha256=S1pYeTgXo5MtZqzwck9ASp8x1pB1PZ33oC1NI7fY9dI,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/optimize.py,sha256=2oalzD9weZhDclUC22OLxYa8Zj7KnmsGUoUau_Jlyc4,19796
 mdbq/aggregation/query_data.py,sha256=5_OzjGR5Sq00q-EgAYmSE5V9i4Solw9y4hkldl4mvt8,179808
@@ -12,7 +12,7 @@ mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/deduplicator.py,sha256=brhX3eyE8-kn3nAYweKfBbAkXiNcyw_pL4CTyPqmPBg,21983
 mdbq/mysql/mysql.py,sha256=Fzaqbjg5g3HdNl50jInIrdurdzcgR2CCzdKLVImD1-Q,55339
 mdbq/mysql/s_query.py,sha256=X055aLRAgxVvueXx4NbfNjp6MyBI02_XBb1pTKw09L0,8660
-mdbq/mysql/uploader.py,sha256=XOSeGg74zN3qYFfWmLqr98H7tCj74dIMCS3C0cvS3kU,58994
+mdbq/mysql/uploader.py,sha256=9wgFxsiFSAngdX2pWj57jElaspwqfPtadC-xQqvweUc,59066
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=YU8DxKMXbdeE1OOKEA848WVp62jYHw5O4tXTjUdq9H0,44832
 mdbq/other/otk.py,sha256=iclBIFbQbhlqzUbcMMoePXBpcP1eZ06ZtjnhcA_EbmE,7241
@@ -25,7 +25,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=Uk8-cOWT0JU1qRyIVqdbYokSLvkDIAfcokmYj1ebw8k,24104
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=YyPWa_nOH1zs8wgTDcgzn5w8szGKWPyWzmWMVIPkFnU,21638
-mdbq-3.10.2.dist-info/METADATA,sha256=D9d_UixDPHEbrdRE1yjA4SHjo4tYoY60_R4cBGPF3ms,364
-mdbq-3.10.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.10.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.10.2.dist-info/RECORD,,
+mdbq-3.10.3.dist-info/METADATA,sha256=TM8JAb8gTTte7N0agKbaDWZ14bmkl66dgCxIbLTqCbc,364
+mdbq-3.10.3.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.10.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.10.3.dist-info/RECORD,,