mdbq 3.9.10__py3-none-any.whl → 3.9.12__py3-none-any.whl

mdbq/mysql/uploader.py

@@ -351,16 +351,24 @@ class MySQLUploader:
         :raises ValueError: 如果日期格式无效或分表方式无效
         """
         try:
-            # date_obj = datetime.datetime.strptime(date_value, '%Y-%m-%d %H:%M:%S')
+            # date_obj = datetime.datetime.strptime(date_value, '%Y-%m-%d')
             date_obj = self._validate_datetime(date_value, True)
         except ValueError:
-            try:
-                # date_obj = datetime.datetime.strptime(date_value, '%Y-%m-%d')
-                date_obj = self._validate_datetime(date_value, True)
-            except ValueError:
-                error_msg = f"无效的日期格式1: {date_value}"
-                logger.error(error_msg)
-                raise ValueError(error_msg)
+            error_msg = f"`{table_name}` 无效的日期格式1: {date_value}"
+            logger.error(error_msg)
+            raise ValueError(error_msg)
+
+        # try:
+        #     # date_obj = datetime.datetime.strptime(date_value, '%Y-%m-%d %H:%M:%S')
+        #     date_obj = self._validate_datetime(date_value, True)
+        # except ValueError:
+        #     try:
+        #         # date_obj = datetime.datetime.strptime(date_value, '%Y-%m-%d')
+        #         date_obj = self._validate_datetime(date_value, True)
+        #     except ValueError:
+        #         error_msg = f"无效的日期格式1: {date_value}"
+        #         logger.error(error_msg)
+        #         raise ValueError(error_msg)
 
         if partition_by == 'year':
             return f"{table_name}_{date_obj.year}"
@@ -600,15 +608,14 @@ class MySQLUploader:
             column_type_lower = column_type.lower()
 
             # 处理百分比值
-            if isinstance(value, str):
-                if value.endswith('%'):
-                    try:
-                        # 移除百分号并转换为小数
-                        percent_value = float(value.strip().replace('%', ''))
-                        decimal_value = percent_value / 100
-                        return decimal_value
-                    except ValueError:
-                        pass  # 如果不是有效的百分比数字，继续正常处理
+            if str(value).strip().endswith('%'):
+                try:
+                    # 移除百分号并转换为小数
+                    percent_value = float(value.strip().replace('%', ''))
+                    decimal_value = percent_value / 100
+                    return decimal_value
+                except ValueError:
+                    pass  # 如果不是有效的百分比数字，继续正常处理
 
             elif 'int' in column_type_lower:
                 if isinstance(value, str):
@@ -625,7 +632,7 @@ class MySQLUploader:
                     # 处理可能包含逗号的数字字符串
                     value = value.replace(',', '')
                 return float(value) if value is not None else None
-            elif '日期' in column_type_lower or 'time' in column_type_lower:
+            elif 'date' in column_type_lower or 'time' in column_type_lower:
                 if isinstance(value, (datetime.datetime, pd.Timestamp)):
                     return value.strftime('%Y-%m-%d %H:%M:%S')
                 elif isinstance(value, str):
@@ -945,11 +952,9 @@ class MySQLUploader:
         })
 
         try:
-            # # 验证参数
-            # if not set_typ:
-            #     error_msg = "列的数据类型缺失"
-            #     logger.error(error_msg)
-            #     raise ValueError(error_msg)
+            # 验证参数
+            if not set_typ:
+                logger.debug(f'set_typ 参数缺失，建表不指定数据类型字典，后续存储数据容易引发异常')
 
             if partition_by:
                 partition_by = str(partition_by).lower()
@@ -1286,7 +1291,7 @@ def main():
     # 准备数据
     data = [
         {'日期': '2023-01-8', 'name': 'JACk', 'AGE': '24', 'salary': 555.1545},
-        {'日期': '2023-01-15', 'name': 'Alice', 'AGE': 35, 'salary': 100},
+        {'日期': '2023-01-15', 'name': 'Alice', 'AGE': 35, 'salary': '100'},
         {'日期': '2023-01-15', 'name': 'Alice', 'AGE': 30, 'salary': 0.0},
         {'日期': '2023-02-20', 'name': 'Bob', 'AGE': 25, 'salary': 45000.75}
     ]
@@ -1310,5 +1315,25 @@ def main():
     uploader.close()
 
 
+def test():
+    uploader = MySQLUploader(username='root', password='188988yang188', host='localhost')
+
+    # 测试按月分表
+    table_name = uploader._get_partition_table_name(
+        table_name='test_table',
+        date_value='2025-01-15',
+        partition_by='month'
+    )
+    print(table_name)  # 输出: test_table_2025-01
+
+    # 测试按年分表
+    table_name = uploader._get_partition_table_name(
+        table_name='test_table',
+        date_value='2025-01-15',
+        partition_by='year'
+    )
+    print(table_name)  # 输出: test_table_2025
+
+
 if __name__ == '__main__':
-    main()
+    test()

{mdbq-3.9.10.dist-info → mdbq-3.9.12.dist-info}/METADATA

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

{mdbq-3.9.10.dist-info → mdbq-3.9.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=83jYP6xnYylgp029cctX2BP7k_exd-phUiwATgIjhH0,18
+mdbq/__version__.py,sha256=OR3dWHQidbCP1TUcpS6TXR3qOZQ4mSJVjcHuaGUGPDc,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
@@ -10,9 +10,9 @@ mdbq/log/mylogger.py,sha256=jHCVO7KPQrg2kcCaIrakHivZmFBJyy-24sIn2rsbK4Y,24440
 mdbq/log/spider_logging.py,sha256=-ozWWEGm3HVv604ozs_OOvVwumjokmUPwbaodesUrPY,1664
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/deduplicator.py,sha256=brhX3eyE8-kn3nAYweKfBbAkXiNcyw_pL4CTyPqmPBg,21983
-mdbq/mysql/mysql.py,sha256=jTcizvUtRdwMhWK2i_LA9yDPmcifLjUzVhwTbC3wfJk,119785
+mdbq/mysql/mysql.py,sha256=Fzaqbjg5g3HdNl50jInIrdurdzcgR2CCzdKLVImD1-Q,55339
 mdbq/mysql/s_query.py,sha256=X055aLRAgxVvueXx4NbfNjp6MyBI02_XBb1pTKw09L0,8660
-mdbq/mysql/uploader.py,sha256=V23PAzT59lMUqijkUiwV6a1qNwk9T76k8HKxY8fYW9w,52140
+mdbq/mysql/uploader.py,sha256=JGkQYx36uLTBTXqQEDGnDiOzePawTF5XWVXjl3-uKNI,52985
 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=OhyEv1VyAKTOHjLDM37iNDQeRg5OnrNoKODoG2VxHes,19806
-mdbq-3.9.10.dist-info/METADATA,sha256=Ln51lgeqZn0zAjgLUKXaMNJ5ZXCkX3Eyu0iao37_IQw,364
-mdbq-3.9.10.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.9.10.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.9.10.dist-info/RECORD,,
+mdbq-3.9.12.dist-info/METADATA,sha256=nyuDxrQTOnWTgU_kOlvhp3h-2pFVRwHKx5c2PtNEIJQ,364
+mdbq-3.9.12.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.9.12.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.9.12.dist-info/RECORD,,