mdbq 1.2.6__py3-none-any.whl → 1.2.8__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -300,6 +300,7 @@ class DatabaseUpdate:
                     df.insert(loc=0, column='日期', value=date)
                     df['省份'] = pov
                     df['省+市'] = df[['省份', '城市']].apply(lambda x: f'{x["省份"]}-{x["城市"]}', axis=1)
+                    df.replace('NAN', 0, inplace=True)
                 elif name.endswith('csv') and 'order' in name:
                     # 生意经，订单数据，仅限月数据
                     pattern = re.findall(r'(.*)(\d{4})(\d{2})(\d{2})-(\d{4})(\d{2})(\d{2})', name)
@@ -639,7 +640,13 @@ class DatabaseUpdate:
                             collection_name=collection_name,
                             is_file_dtype=True,  # 默认本地文件优先: True
                         )
-                        m.df_to_mysql(df=df, db_name=db_name, table_name=collection_name)
+                        m.df_to_mysql(
+                            df=df,
+                            db_name=db_name,
+                            table_name=collection_name,
+                            df_sql=False,  # 值为 True 时使用 df.to_sql 函数上传整个表, 不会排重
+                            drop_dup=True  # 值为 True 时检查重复数据再插入，反之直接上传
+                        )
                 df_to_json.as_json_file()  # 写入 json 文件, 包含数据的 dtypes 信息
 
     def new_unzip(self, path=None, is_move=None):
@@ -984,4 +991,13 @@ if __name__ == '__main__':
     #     dbs={'mysql': True, 'mongodb': False},
     # )
 
-    test2()
+    # test2()
+
+    file = '/Users/xigua/Downloads/余额查询.csv'
+    df = pd.read_csv(file, encoding='utf-8_sig', header=0, na_filter=False)
+    username, password, host, port = get_myconf.select_config_values(target_service='company', database='mysql')
+    m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
+    m.df_to_mysql(df=df, db_name='test', table_name='增量更新测试',
+                  drop_dup=False,
+                  icm_update=['日期', '推广费余额']
+                  )

mdbq/aggregation/mysql_types.py

@@ -206,7 +206,7 @@ def mysql_all_dtypes(db_name=None, table_name=None, path=None):
         time.sleep(0.5)
 
     d = DataTypes()
-    d.json_file = os.path.join(path, 'mysql_types.json')  # # json 保存位置
+    d.json_file = os.path.join(path, f'mysql_types.json')  # # json 保存位置
     for result in results:
         for db_n, table_n in result.items():
             # print(db_n, table_n, db_name, table_name)

mdbq/aggregation/query_data.py

@@ -388,19 +388,22 @@ class GroupBy:
             self.data_tgyj['商品id图片对照表'],
             self.data_tgyj['商品成本'])  # 这里不要加逗号
         pic['商品id'] = pic['商品id'].astype(str)
-        df = pd.merge(idbm, pic, how='left', left_on='宝贝id', right_on='商品id')
+        df = pd.merge(idbm, pic, how='left', left_on='宝贝id', right_on='商品id')  # id 编码表合并图片表
         df = df[['宝贝id', '商家编码', '商品图片']]
-        df = pd.merge(df, cost, how='left', left_on='商家编码', right_on='款号')
+        df = pd.merge(df, cost, how='left', left_on='商家编码', right_on='款号')  # df 合并商品成本表
         df = df[['宝贝id', '商家编码', '商品图片', '成本价']]
-        df = pd.merge(tg, df, how='left', left_on='商品id', right_on='宝贝id')
+        df = pd.merge(tg, df, how='left', left_on='商品id', right_on='宝贝id')  # 推广表合并 df
         df.drop(labels='宝贝id', axis=1, inplace=True)
         if bb_tg is True:
             # 生意经合并推广表，完整的数据表，包含全店所有推广、销售数据
             df = pd.merge(syj, df, how='left', left_on=['日期', '宝贝id'], right_on=['日期', '商品id'])
+            df.drop(labels='商品id', axis=1, inplace=True)  # 因为生意经中的宝贝 id 列才是完整的
+            df.rename(columns={'宝贝id': '商品id'}, inplace=True)
+            # df.to_csv('/Users/xigua/Downloads/test.csv', encoding='utf-8_sig', index=False, header=True)
         else:
             # 推广表合并生意经 , 以推广数据为基准，销售数据不齐全
             df = pd.merge(df, syj, how='left', left_on=['日期', '商品id'], right_on=['日期', '宝贝id'])
-        df.drop(labels='宝贝id', axis=1, inplace=True)
+            df.drop(labels='宝贝id', axis=1, inplace=True)
         df.drop_duplicates(subset=['日期', '商品id', '花费', '销售额'], keep='last', inplace=True, ignore_index=True)
         df['成本价'] = df['成本价'].astype('float64')
         df['商品成本'] = df.apply(lambda x: (x['成本价'] + x['销售额']/x['销售量'] * 0.11 + 6) * x['销售量'] if x['销售量'] > 0 else 0, axis=1)
@@ -425,6 +428,8 @@ class GroupBy:
             path = os.path.join(self.output, path)
         if not os.path.exists(path):
             os.makedirs(path)
+        if filename.endswith('.csv'):
+            filename = filename[:-4]
         if st_ascend and ascend:
             try:
                 df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
@@ -510,47 +515,71 @@ def data_aggregation(service_databases=[{}]):
                 {
                     '数据库名': '聚合数据',
                     '集合名': '宝贝主体报表',
+                    '唯一主键': ['日期', '推广渠道', '营销场景', '商品id', '花费'],
                     '数据主体': sdq.tg_wxt(),
                 },
                 {
                     '数据库名': '聚合数据',
                     '集合名': '天猫生意经_宝贝指标',
+                    '唯一主键': ['日期', '宝贝id'],
                     '数据主体': sdq.syj(),
                 },
                 {
                     '数据库名': '聚合数据',
                     '集合名': '天猫_店铺来源_日数据',
+                    '唯一主键': ['日期', '一级来源', '二级来源', '三级来源'],
                     '数据主体': sdq.dplyd(),
                 },
                 {
                     '数据库名': '聚合数据',
                     '集合名': '商品id编码表',
+                    '唯一主键': ['宝贝id'],
                     '数据主体': sdq.idbm(),
                 },
                 {
                     '数据库名': '聚合数据',
                     '集合名': '商品id图片对照表',
+                    '唯一主键': ['商品id'],
                     '数据主体': sdq.sp_picture(),
                 },
                 {
                     '数据库名': '聚合数据',
                     '集合名': '商品成本',
+                    '唯一主键': ['款号'],
                     '数据主体': sdq.sp_cost(),
                 },
             ]
             for items in data_dict:  # 遍历返回结果
-                db_name, table_name, df = items['数据库名'], items['集合名'], items['数据主体']
+                db_name, table_name, unique_key_list, df = items['数据库名'], items['集合名'], items['唯一主键'], items['数据主体']
                 df = g.groupby(df=df, table_name=table_name, is_maximize=True)  # 2. 聚合数据
-                # g.as_csv(df=df, filename=table_name + '.csv')
-                m.df_to_mysql(df=df, db_name=db_name, table_name=table_name, drop_dup=True)  # 3. 回传数据库
+                g.as_csv(df=df, filename=table_name + '.csv')  # 导出 csv
+                m.df_to_mysql(
+                    df=df,
+                    db_name=db_name,
+                    table_name=table_name,
+                    drop_dup=False,
+                    icm_update=unique_key_list
+                )  # 3. 回传数据库
             res = g.performance(bb_tg=True)   # 盈亏表，依赖其他表，单独做
-            m.df_to_mysql(df=res, db_name='聚合数据', table_name='_全店商品销售', drop_dup=True)
+            m.df_to_mysql(
+                df=res,
+                db_name='聚合数据',
+                table_name='_全店商品销售',
+                drop_dup=False,
+                icm_update=['日期', '商品id']  # 设置唯一主键
+            )
             res = g.performance(bb_tg=False)  # 盈亏表，依赖其他表，单独做
-            m.df_to_mysql(df=res, db_name='聚合数据', table_name='_推广商品销售', drop_dup=True)
+            m.df_to_mysql(
+                df=res,
+                db_name='聚合数据',
+                table_name='_推广商品销售',
+                drop_dup=False,
+                icm_update=['日期', '商品id']  # 设置唯一主键
+            )
 
     # optimize_data.op_data(service_databases=service_databases, days=3650)  # 立即启动对聚合数据的清理工作
 
 
 if __name__ == '__main__':
-    data_aggregation(service_databases=[{'home_lx': 'mysql'}])
+    data_aggregation(service_databases=[{'company': 'mysql'}])
     # optimize_data.op_data(service_databases=[{'company': 'mysql'}], days=3650)  # 立即启动对聚合数据的清理工作

mdbq/clean/data_clean.py

@@ -1136,15 +1136,15 @@ class DataClean:
         if not path:
             path = self.path
 
-        if self.set_up_to_mogo:
-            username, password, host, port = get_myconf.select_config_values(target_service='home_lx',
-                                                                             database='mongodb')
-            d = mongo.UploadMongo(username=username, password=password, host=host, port=port,
-                                         drop_duplicates=False
-                                         )
-        if self.set_up_to_mysql:
-            username, password, host, port = get_myconf.select_config_values(target_service='home_lx', database='mysql')
-            m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
+        # if self.set_up_to_mogo:
+        #     username, password, host, port = get_myconf.select_config_values(target_service='home_lx',
+        #                                                                      database='mongodb')
+        #     d = mongo.UploadMongo(username=username, password=password, host=host, port=port,
+        #                                  drop_duplicates=False
+        #                                  )
+        # if self.set_up_to_mysql:
+        #     username, password, host, port = get_myconf.select_config_values(target_service='home_lx', database='mysql')
+        #     m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
         new_save_path = os.path.join(self.source_path, '属性设置', '商品素材')
         for root, dirs, files in os.walk(path, topdown=False):
             for name in files:
@@ -1181,17 +1181,17 @@ class DataClean:
                         )
                         # mysql 可能改变 df 列名，所以在上传 mysql 前保存 csv
                         self.save_to_csv(df, new_save_path, new_name, encoding='utf-8_sig')
-                        try:
-                            if self.set_up_to_mogo:
-                                d.df_to_mongo(df=df, db_name=db_name, collection_name=collection_name)
-                            if self.set_up_to_mysql:
-                                m.df_to_mysql(df=df, db_name=db_name, tabel_name=collection_name)
-                        except Exception as e:
-                            print(e)
+                        # try:
+                        #     if self.set_up_to_mogo:
+                        #         d.df_to_mongo(df=df, db_name=db_name, collection_name=collection_name)
+                        #     if self.set_up_to_mysql:
+                        #         m.df_to_mysql(df=df, db_name=db_name, tabel_name=collection_name)
+                        # except Exception as e:
+                        #     print(e)
                         os.remove(os.path.join(root, name))
-        if self.set_up_to_mogo:
-            if d.client:
-                d.client.close()  # 必须手动关闭数据库连接
+        # if self.set_up_to_mogo:
+        #     if d.client:
+        #         d.client.close()  # 必须手动关闭数据库连接
 
     # @try_except
     def new_unzip(self, path=None, is_move=None):

mdbq/dataframe/converter.py

@@ -61,7 +61,8 @@ class DataFrameConverter(object):
             # 转换日期样式的列为日期类型
             value = df.loc[0, col]
             if value:
-                res = re.match(r'\d{4}-\d{2}-\d{2}|\d{4}-\d{2}-\d{2} |\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}', str(value))
+                res = re.match(r'\d{4}-\d{2}-\d{2}|\d{4}-\d{2}-\d{2} |\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}'
+                               r'|\d{4}/\d{1}/\d{1}|\d{4}/\d{1}/\d{2}|\d{4}/\d{2}/\d{1}|\d{4}/\d{2}/\d{2}', str(value))
                 if res:
                     try:
                         df[col] = df[col].apply(lambda x: pd.to_datetime(x))

mdbq/mysql/mysql.py

@@ -10,6 +10,7 @@ import pymysql
 import numpy as np
 import pandas as pd
 import sqlalchemy.types
+from macholib.mach_o import rpath_command
 from more_itertools.more import iequals
 from pandas.core.dtypes.common import INT64_DTYPE
 from sqlalchemy import create_engine
@@ -60,15 +61,17 @@ class MysqlUpload:
         }
         self.filename = None
 
-    def df_to_mysql(self, df, table_name, db_name='远程数据源', df_sql=False, drop_dup=True, drop_duplicates=False, filename=None, count=None):
+    def df_to_mysql(self, df, table_name, db_name='远程数据源', icm_update=[], icm_up=[], df_sql=False, drop_dup=True, drop_duplicates=False, filename=None, count=None):
         """
         将 df 写入数据库
         db_name: 数据库名称
         table_name: 集合/表名称
-        df_sql: 使用 df.to_sql 函数上传整个表, 不会排重
-        drop_duplicates：仅限于聚合数据使用，其他情况不要设置此参数
+        df_sql: 这是一个临时参数, 值为 True 时使用 df.to_sql 函数上传整个表, 不会排重
+        drop_duplicates：值为 True 时（仅限于聚合数据使用），其他情况不要设置此参数
         drop_dup: 值为 True 时检查重复数据再插入，反之直接上传
         filename: 传这个参数是方便定位产生错误的文件
+        icm_update: 增量更新, 在聚合数据中使用，原始文件不要使用，设置此参数时需将 drop_dup 改为 False
+                使用增量更新: 必须确保 icm_update 传进来的列必须是数据表中唯一主键，值不会发生变化，不会重复，否则可能产生错乱覆盖情况
         """
         self.filename = filename
         if isinstance(df, pd.DataFrame):
@@ -168,6 +171,7 @@ class MysqlUpload:
 
             # print(cl, db_n, tb_n)
             # 返回这些结果的目的是等添加完列再写 json 文件才能读到 types 信息
+            # ⚠️ mysql_all_dtypes 函数默认只读取 home_lx 的数据库信息，不会读取其他系统
             if cl and db_n and tb_n:
                 mysql_types.mysql_all_dtypes(db_name=db_name, table_name=table_name)  # 更新一个表的 dtypes
             elif cl and db_n:
@@ -190,8 +194,10 @@ class MysqlUpload:
 
             datas = df.to_dict(orient='records')
             for data in datas:
+                # data 是传进来待处理的数据, 不是数据库数据
+                # data 示例: {'日期': Timestamp('2024-08-27 00:00:00'), '推广费余额': 33299, '品销宝余额': 2930.73, '短信剩余': 67471}
                 try:
-                    cols = ', '.join(f"`{item}`" for item in data.keys())  # 列名转义
+                    cols = ', '.join(f"`{item}`" for item in data.keys())  # 列名需要转义
                     # data.update({item: f"{data[item]}" for item in data.keys()})  # 全部值转字符, 不是必须的
                     values = ', '.join([f"'{item}'" for item in data.values()])  # 值要加单引号 ''
                     condition = []
@@ -200,7 +206,7 @@ class MysqlUpload:
                     condition = ' AND '.join(condition)  # 构建查询条件
                     # print(condition)
 
-                    if drop_dup:
+                    if drop_dup:  # 查重插入
                         sql = f"SELECT {cols} FROM `{table_name}` WHERE {condition}"
                         # sql = f"SELECT {cols} FROM `{table_name}` WHERE `创建时间` = '2014-09-19 14:32:33'"
                         cursor.execute(sql)
@@ -210,6 +216,76 @@ class MysqlUpload:
                             cursor.execute(sql)
                         # else:
                         #     print(f'重复数据不插入: {condition[:50]}...')
+                    elif icm_update:  # 增量更新
+                        """ 使用增量更新: 需确保 icm_update['主键'] 传进来的列必须是数据表中唯一主键，值不会发生变化且不会重复，否则可能产生覆盖情况 """
+                        sql = 'SELECT COLUMN_NAME FROM information_schema.columns WHERE table_schema = %s AND table_name = %s'
+                        cursor.execute(sql, (db_name, {table_name}))
+                        columns = cursor.fetchall()
+                        cols_exist = [col['COLUMN_NAME'] for col in columns]  # 数据表的所有列, 返回 list
+                        update_col = [item for item in cols_exist if item not in icm_update and item != 'id']  # 除了主键外的其他列
+
+                        # unique_keys 示例: `日期`, `推广费余额`
+                        unique_keys = ', '.join(f"`{item}`" for item in update_col)  # 列名需要转义
+                        condition = []
+                        for up_col in icm_update:
+                            condition += [f"`{up_col}` = '{data[up_col]}'"]
+                        condition = ' AND '.join(condition)  # condition值示例: `品销宝余额` = '2930.73' AND `短信剩余` = '67471'
+                        sql = f"SELECT {unique_keys} FROM `{table_name}` WHERE {condition}"
+                        # print(sql)
+                        # sql = f"SELECT {unique_keys} FROM `{table_name}` WHERE `创建时间` = '2014-09-19 14:32:33'"
+                        cursor.execute(sql)
+                        results = cursor.fetchall()  # results 是数据库取出的数据
+                        if results:  # 有数据返回，再进行增量检查
+                            for result in results:  # results 是数据库数据, data 是传进来的数据
+                                not_change_col = []
+                                change_values = []
+                                for col in update_col:
+                                    # 因为 mysql 里面有 decimal 数据类型，要移除末尾的 0 再做比较（df 默认将 5.00 小数截断为 5.0）
+                                    df_value = str(data[col])
+                                    mysql_value = str(result[col])
+                                    if '.' in df_value:
+                                        df_value = re.sub('0+$', '', df_value)
+                                        df_value = re.sub('\.$', '', df_value)
+                                    if '.' in mysql_value:
+                                        mysql_value = re.sub('0+$', '', mysql_value)
+                                        mysql_value = re.sub('\.$', '', mysql_value)
+                                    if df_value != mysql_value:  # 传进来的数据和数据库比较, 有变化
+                                        # print(f'{data['日期']}{data['商品id']}{col} 列的值有变化，{str(data[col])}  !=  {str(result[col])}')
+                                        change_values += [f"`{col}` = '{str(data[col])}'"]
+                                        not_change_col += [item for item in update_col if item != col]
+                                # change_values 是 df 传进来且和数据库对比后，发生了变化的数据，值示例： [`品销宝余额` = '9999.0', `短信剩余` = '888']
+                                if change_values:  # change_values 有数据返回，表示值需要更新
+                                    not_change_values = [f"`{col}` = '{str(data[col])}'" for col in not_change_col]
+                                    not_change_values = ' AND '.join(not_change_values)  # 示例: `短信剩余` = '888' AND `test1` = '93'
+                                    # print(change_values, not_change_values)
+                                    condition += f' AND {not_change_values}'  # 重新构建完整的查询条件，将未发生变化的列加进查询条件
+                                    change_values = ', '.join(f"{item}" for item in change_values)  # 注意这里 item 外面没有反引号
+                                    sql = f"UPDATE {table_name} SET {change_values} WHERE {condition}"
+                                    # print(sql)
+                                    cursor.execute(sql)
+                        else:  # 没有数据返回，则直接插入数据
+                            sql = f"INSERT INTO `{table_name}` ({cols}) VALUES ({values});"
+                            cursor.execute(sql)
+                    # elif icm_up:
+                    #     sql = 'SELECT COLUMN_NAME FROM information_schema.columns WHERE table_schema = %s AND table_name = %s'
+                    #     cursor.execute(sql, (db_name, {table_name}))
+                    #     columns = cursor.fetchall()
+                    #     cols_exist = [col['COLUMN_NAME'] for col in columns]  # 数据表的所有列, 返回 list
+                    #     cols_exist = [item for item in cols_exist if item != 'id']
+                    #     update_col = [item for item in cols_exist if item not in icm_up]  # 除了主键外的其他列
+                    #
+                    #     unique_keys = ', '.join([f"`{item}`" for item in cols_exist])
+                    #     unique_keys_values = ', '.join([f"'{data[item]}'" for item in cols_exist])
+                    #
+                    #     change_values = []
+                    #     for col in update_col:
+                    #         change_values += [f"`{col}` = '{str(data[col])}'"]
+                    #     change_values = ', '.join(f"{item}" for item in change_values)  # 注意这里 item 外面没有反引号
+                    #     # print(change_values)
+                    #     sql = f"INSERT INTO `{table_name}` ({unique_keys}) VALUES ({unique_keys_values}) ON DUPLICATE KEY UPDATE {change_values};"
+                    #     print(sql)
+                    #     # cursor.execute(sql)
+
                     else:
                         sql = f"INSERT INTO `{table_name}` ({cols}) VALUES ({values});"
                         cursor.execute(sql)

{mdbq-1.2.6.dist-info → mdbq-1.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 1.2.6
+Version: 1.2.8
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-1.2.6.dist-info → mdbq-1.2.8.dist-info}/RECORD

@@ -1,15 +1,15 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
 mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/aggregation.py,sha256=mBgIY7afloW8H5qoBy56vCabIQRxVvAhrRZgGbZUxFQ,55791
+mdbq/aggregation/aggregation.py,sha256=ukOtdTJNXoCM0M1Nhrax4J5rJoWLSVYCw55TnrNStVc,56697
 mdbq/aggregation/df_types.py,sha256=rHLIgv82PJSFmDvXkZyOJAffXkFyyMyFO23w9tUt8EQ,7525
-mdbq/aggregation/mysql_types.py,sha256=umVixmbFZM63k-QhVWLvOuhcAde4P_oDKbdo8ry2O9w,10633
+mdbq/aggregation/mysql_types.py,sha256=_XIqpaX_qmqolFlGywMYfvBn32u8MbPCaX6n7rQOVRQ,10634
 mdbq/aggregation/optimize_data.py,sha256=jLAWtxPUuhpo4XTVrhKtT4xK3grs7r73ePQfLhxlu1I,779
-mdbq/aggregation/query_data.py,sha256=fg_9OdNSwHbo9vhK1pAKOazHFHZfE9_rBxRyQIWJX9U,25694
+mdbq/aggregation/query_data.py,sha256=kNX9htViFN0EnpF7D_eOQtTWy8BIa5-yJmJiqY7f8ds,27083
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
-mdbq/clean/data_clean.py,sha256=tcYu4tFkBm5jzSo6KHWyfyLEJ-s6EO_Za-fvakE-Jh0,85610
+mdbq/clean/data_clean.py,sha256=SjfKGhDUh4hv93J1nbfYTQy_sw-8IuGLSOyuY6Xu8QA,85648
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
 mdbq/company/copysh.py,sha256=i8f8YxmUg-EIzQR-ZHTtnC1A5InwsRtY1_sIsCznVp8,16363
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -18,13 +18,13 @@ mdbq/config/products.py,sha256=9gqXJMsw8KKuD4Xs6krNgcF7AuWDvV7clI6wVi3QjcA,4260
 mdbq/config/set_support.py,sha256=xkZCX6y9Bq1ppBpJAofld4B2YtchA7fl0eT3dx3CrSI,777
 mdbq/config/update_conf.py,sha256=taL3ZqKgiVWwUrDFuaYhim9a72Hm4BHRhhDscJTziR8,4535
 mdbq/dataframe/__init__.py,sha256=2HtCN8AdRj53teXDqzysC1h8aPL-mMFy561ESmhehGQ,22
-mdbq/dataframe/converter.py,sha256=BAst61HvtXqN3yWguia47zNY19c-wpby8CsdS48PC6g,3592
+mdbq/dataframe/converter.py,sha256=w0-gGJnIajGIhOgYGkCvc0JMcmxIHNpgPf_bgWUSOG4,3699
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=v9qvrp6p1ZRWuPpbSilqveiE0FEcZF7U5xUPI0RN4xs,31880
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=KvUQflP5sYOECTHOs2Fs9ABcQvgPCbBnAX2ZlE3JjgY,37544
+mdbq/mysql/mysql.py,sha256=4Omt9Su0Cv-oRDGBKUi4_62wbs8OfDE5ssoHIWn3Kys,44328
 mdbq/mysql/s_query.py,sha256=a33aYhW6gAnspIZfQ7l23ePln9-MD1f_ukypr5M0jd8,8018
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -35,7 +35,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=tgy762608HMaXWynbOURIf2UVMuSPybzrDXQnOOcnZU,6102
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-1.2.6.dist-info/METADATA,sha256=_s1z5j_Q_dSi4lrw46NcpwMlgz5TkZnndOmWp4290Mk,245
-mdbq-1.2.6.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-1.2.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-1.2.6.dist-info/RECORD,,
+mdbq-1.2.8.dist-info/METADATA,sha256=m6-ftUmS0npMhvz1brisQdXGN4Kc7jTAXBueFeE4HkE,245
+mdbq-1.2.8.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-1.2.8.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-1.2.8.dist-info/RECORD,,

{mdbq-1.2.6.dist-info → mdbq-1.2.8.dist-info}/WHEEL

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