mdbq 3.10.5__py3-none-any.whl → 3.10.7__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '3.10.5'
+VERSION = '3.10.7'

mdbq/mysql/uploader.py

@@ -1219,6 +1219,25 @@ class MySQLUploader:
             """
         return sql
 
+    def _get_decimal_scale(self, decimal_type: str) -> int:
+        """
+        从DECIMAL类型定义中提取小数位数
+
+        :param decimal_type: DECIMAL类型字符串，如'DECIMAL(10,4)'
+        :return: 小数位数
+        :raises: 无显式抛出异常，但解析失败时返回默认值2
+        """
+        try:
+            # 匹配DECIMAL类型中的精度和小数位数
+            match = re.match(r'decimal\((\d+),\s*(\d+)\)', decimal_type.lower())
+            if match:
+                return int(match.group(2))
+        except (ValueError, AttributeError, IndexError):
+            pass
+
+        # 默认返回2位小数
+        return 2
+
     def _prepare_insert_sql(
             self,
             db_name: str,
@@ -1239,7 +1258,7 @@ class MySQLUploader:
         6. 当 check_duplicate=True 且 duplicate_columns 指定了排重列且 update_on_duplicate=False 时，按 duplicate_columns 指定的列（但排除`id`和`更新时间`）排重插入，不考虑是否更新旧数据。
 
         """
-        # 获取所有列名（排除id和更新时间列）
+        # 获取所有列名（排除id）
         all_columns = [col for col in set_typ.keys()
                        if col.lower() != 'id']
 
@@ -1248,9 +1267,15 @@ class MySQLUploader:
             return self._build_simple_insert_sql(db_name, table_name, all_columns,
                                                  update_on_duplicate)
 
+        # 确定排重列（排除id和更新时间列）
+        dup_cols = duplicate_columns if duplicate_columns else [
+            col for col in all_columns
+            if col.lower() not in self.base_excute_col
+        ]
+
         # 情况3-6：检查重复
         return self._build_duplicate_check_sql(db_name, table_name, all_columns,
-                                               duplicate_columns, update_on_duplicate, set_typ)
+                                               dup_cols, update_on_duplicate, set_typ)
 
     def _execute_batch_insert(
             self,
@@ -1403,7 +1428,14 @@ class MySQLUploader:
             # 准备参数
             row_values = [row.get(col) for col in all_columns]
             if check_duplicate:
-                row_values += [row.get(col) for col in duplicate_columns]
+                # 确定排重列（排除id和更新时间列）
+                dup_cols = duplicate_columns if duplicate_columns else [
+                    col for col in all_columns
+                    if col.lower() not in self.base_excute_col
+                ]
+
+                # 添加排重条件参数
+                row_values += [row.get(col) for col in dup_cols]
 
             # logger.info(sql)
             # logger.info(row_values)
@@ -1540,4 +1572,5 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    # main()
+    pass

{mdbq-3.10.5.dist-info → mdbq-3.10.7.dist-info}/METADATA

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

{mdbq-3.10.5.dist-info → mdbq-3.10.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=51aaiJO4QmLmJb4fxtT4uQtl5MznQsVENkLEBRAcEBc,18
+mdbq/__version__.py,sha256=luTjFBlvNtusrL5oiS9aezU8M7ZT0e3xyxokQP2F1Es,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=mQUcOFOuw1BeeJpPX1seDSKtJXuTzAG75GA8oQNWMT8,61195
+mdbq/mysql/uploader.py,sha256=Lw9lgzmJkr5ojHQ_VMy4z710ZJpIoH7pzn4zrpZokms,62371
 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.5.dist-info/METADATA,sha256=I0ojjsBkeW8KpaITA6ImuAvlJt3dONcmuJzRpLNkWqU,364
-mdbq-3.10.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.10.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.10.5.dist-info/RECORD,,
+mdbq-3.10.7.dist-info/METADATA,sha256=bsu32knUObF_BeSlp2OYExxro_8H1ygHLX2ZMay9Bug,364
+mdbq-3.10.7.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.10.7.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.10.7.dist-info/RECORD,,