mdbq 1.4.4__py3-none-any.whl → 1.4.5__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -594,15 +594,15 @@ class DatabaseUpdate:
                     if is_move:
                         os.remove(os.path.join(root, name))
 
-        df = self.date_table()  # 创建一个日期表
-        self.datas.append(
-            {
-                '数据库名': '聚合数据',
-                '集合名称': '日期表',
-                '数据主体': df,
-                '文件名': '日期表文件名',
-            }
-        )
+        # df = self.date_table()  # 创建一个日期表
+        # self.datas.append(
+        #     {
+        #         '数据库名': '聚合数据',
+        #         '集合名称': '日期表',
+        #         '数据主体': df,
+        #         '文件名': '日期表文件名',
+        #     }
+        # )
 
     def upload_df(self, service_databases=[{}], path=None, system_name=None):
         """
@@ -633,6 +633,8 @@ class DatabaseUpdate:
                             is_file_dtype=True,  # 默认本地文件优先: True
                         )
                         d.df_to_mongo(df=df, db_name=db_name, collection_name=collection_name)
+                    if d.client:
+                        d.client.close()
 
                 elif database == 'mysql':
                     username, password, host, port = get_myconf.select_config_values(
@@ -782,7 +784,7 @@ class DatabaseUpdate:
             encod = chardet.detect(f1).get('encoding')
         return encod
 
-    def date_table(self):
+    def date_table(self, service_databases=[{}]):
         """
         生成 pbix使用的日期表
         """
@@ -807,7 +809,29 @@ class DatabaseUpdate:
         df['索引'] = p
         df['月索引'] = mon
         df.sort_values('日期', ascending=False, ignore_index=True, inplace=True)
-        return df
+
+        for service_database in service_databases:
+            for service_name, database in service_database.items():
+                username, password, host, port = get_myconf.select_config_values(
+                    target_service=service_name,
+                    database=database,
+                )
+                m = mysql.MysqlUpload(
+                    username=username,
+                    password=password,
+                    host=host,
+                    port=port,
+                )
+                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 时检查重复数据再插入，反之直接上传，会比较慢
+                    filename=None,  # 用来追踪处理进度
+                    system_name=service_name,  # 用来追踪处理进度
+                )
+        # return df
 
 
 def upload_dir(path, db_name, collection_name, dbs={'mysql': True, 'mongodb': True}, json_path=None, system_name=None):

mdbq/company/copysh.py

@@ -347,6 +347,7 @@ def main():
             dp.new_unzip(is_move=True)
             dp.cleaning(is_move=True)  # 公司台式机需要移除自身下载的文件
             dp.upload_df(service_databases=[{'company': 'mysql'}], system_name='company')
+            dp.date_table(service_databases=[{'company': 'mysql'}])  # 因为日期表不受 days 参数控制，因此单独更新日期表
 
             # 此操作用于修改 .copysh_conf 文件，将 ch_record 改为 false (更新完成)
             w = update_conf.UpdateConf()

{mdbq-1.4.4.dist-info → mdbq-1.4.5.dist-info}/METADATA

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

{mdbq-1.4.4.dist-info → mdbq-1.4.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=xm9H2bD9GjKQd-sHQ5WIeskzagzaHwYMuokZnhGdFY8,58303
+mdbq/aggregation/aggregation.py,sha256=CpjtTECUqcU_Mw3u5UhQMS7mqiOuFxabQBsQ89biiU8,59446
 mdbq/aggregation/df_types.py,sha256=oQJS2IBU3_IO6GMgbssHuC2yCjNnbta0QPGrFOwNLnU,7591
 mdbq/aggregation/mysql_types.py,sha256=3j_SUTi7qYJyY3JtV_lRLIyczIczmRPE_WaIrXiZ6Rw,11425
 mdbq/aggregation/optimize_data.py,sha256=u2Kl_MFtZueXJ57ycy4H2OhXD431RctUYJYCl637uT0,4176
@@ -11,7 +11,7 @@ mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
 mdbq/clean/data_clean.py,sha256=BIzc1XCJjJaZyPT6DCRXRCCRwBaeC5_lER0aqYF1P3M,87778
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=XBnSalNHJPCBkswyiDpHhhVPqxRMOGcbAncWytrhCyQ,17039
+mdbq/company/copysh.py,sha256=RWlQqfpqDiRO1QaVCbPhgAYSopnMoOgcnFhRi0TNFnM,17181
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/get_myconf.py,sha256=bp6bVARZVm3ANj1pmM9hLB8Ao539TUWeM9xxeSsBpzw,5994
 mdbq/config/products.py,sha256=9gqXJMsw8KKuD4Xs6krNgcF7AuWDvV7clI6wVi3QjcA,4260
@@ -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.4.4.dist-info/METADATA,sha256=k_rFWJWIrV84IBHNX4pfTrN9L3uoFh31MlFapUllfgs,245
-mdbq-1.4.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-1.4.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-1.4.4.dist-info/RECORD,,
+mdbq-1.4.5.dist-info/METADATA,sha256=C1KT9XfO_sxc79FzWzNBEiEGYDSd1Jiw9wm4WjErj9g,245
+mdbq-1.4.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-1.4.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-1.4.5.dist-info/RECORD,,