mdbq 1.1.6__tar.gz → 1.1.8__tar.gz

{mdbq-1.1.6 → mdbq-1.1.8}/PKG-INFO

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

{mdbq-1.1.6 → mdbq-1.1.8}/mdbq/aggregation/aggregation.py

@@ -917,8 +917,8 @@ def upload(path, db_name, collection_name):
                         dtypes = {k: dtypes[k] for k in intersection_keys}  # 使用交集的键创建新字典
                         df = df.astype(dtypes)
 
-                    # d.df_to_mongo(df=df, db_name=db_name, collection_name=collection_name)
-                    m.df_to_mysql(df=df, db_name=db_name, table_name=collection_name, filename=name, count=f'{i}/{count}')
+                    d.df_to_mongo(df=df, db_name=db_name, collection_name=collection_name)
+                    m.df_to_mysql(df=df, db_name=db_name, table_name=collection_name, drop_dup=False, filename=name, count=f'{i}/{count}')
                     # nas.df_to_mysql(df=df, db_name=db_name, table_name=collection_name)
                 except Exception as e:
                     print(name, e)
@@ -951,6 +951,8 @@ def file_dir():
         # print(data)
         if data['入库进度'] == 0:
             sub_path, db_name, table_name = data['子文件夹'], data['数据库名'], data['数据表']
+            if platform.system() == 'Windows':
+                sub_path = sub_path.replace('/', '\\')
             # print(os.path.join(path, sub_path), db_name, table_name)
             # 从每个文件夹中取出一个文件
             real_path_list = []

{mdbq-1.1.6 → mdbq-1.1.8}/mdbq/mysql/mysql.py

@@ -37,7 +37,7 @@ class MysqlUpload:
         }
         self.filename = None
 
-    def df_to_mysql(self, df, table_name, db_name='远程数据源', drop_duplicates=False, filename=None, count=None):
+    def df_to_mysql(self, df, table_name, db_name='远程数据源', drop_dup=True, drop_duplicates=False, filename=None, count=None):
         """
         将 df 写入数据库
         db_name: 数据库名称
@@ -144,15 +144,19 @@ class MysqlUpload:
                     condition = ' AND '.join(condition)  # 构建查询条件
                     # print(condition)
 
-                    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)
-                    result = cursor.fetchall()  # 获取查询结果, 有结果返回 list 表示数据已存在(不重复插入)，没有则返回空 tuple
-                    if not result:  # 数据不存在则插入
+                    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)
+                        result = cursor.fetchall()  # 获取查询结果, 有结果返回 list 表示数据已存在(不重复插入)，没有则返回空 tuple
+                        if not result:  # 数据不存在则插入
+                            sql = f"INSERT INTO `{table_name}` ({cols}) VALUES ({values});"
+                            cursor.execute(sql)
+                        # else:
+                        #     print(f'重复数据不插入: {condition[:50]}...')
+                    else:
                         sql = f"INSERT INTO `{table_name}` ({cols}) VALUES ({values});"
                         cursor.execute(sql)
-                    # else:
-                    #     print(f'重复数据不插入: {condition[:50]}...')
                 except Exception as e:
                     # print(data)
                     # print(values)
@@ -198,10 +202,14 @@ class MysqlUpload:
             longest_value = None
             max_decimals = 0
             for num in number_list:
-                decimal_places = len(str(num).split('.')[1])
-                if decimal_places > max_decimals:
-                    max_decimals = decimal_places
+                try:
+                    decimal_places = len(str(num).split('.')[1])
+                    if decimal_places > max_decimals:
+                        max_decimals = decimal_places
+                        longest_value = num
+                except:
                     longest_value = num
+                    continue
             return longest_value
 
         # 最优先处理 ID 类型, 在 mysql 里面, 有些列数字过长不能存储为 int 类型

{mdbq-1.1.6 → mdbq-1.1.8}/mdbq.egg-info/PKG-INFO

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

{mdbq-1.1.6 → mdbq-1.1.8}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='1.1.6',
+      version='1.1.8',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',