mdbq 2.1.4__tar.gz → 2.1.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. {mdbq-2.1.4 → mdbq-2.1.5}/PKG-INFO +1 -1
  2. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/config/products.py +13 -2
  3. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/mysql/mysql.py +3 -2
  4. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/other/sku_picture.py +1 -1
  5. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq.egg-info/PKG-INFO +1 -1
  6. {mdbq-2.1.4 → mdbq-2.1.5}/setup.py +1 -1
  7. {mdbq-2.1.4 → mdbq-2.1.5}/README.txt +0 -0
  8. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/__init__.py +0 -0
  9. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/__version__.py +0 -0
  10. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/aggregation/__init__.py +0 -0
  11. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/aggregation/aggregation.py +0 -0
  12. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/aggregation/df_types.py +0 -0
  13. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/aggregation/mysql_types.py +0 -0
  14. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/aggregation/optimize_data.py +0 -0
  15. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/aggregation/query_data.py +0 -0
  16. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/bdup/__init__.py +0 -0
  17. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/bdup/bdup.py +0 -0
  18. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/clean/__init__.py +0 -0
  19. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/clean/data_clean.py +0 -0
  20. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/company/__init__.py +0 -0
  21. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/company/copysh.py +0 -0
  22. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/company/home_sh.py +0 -0
  23. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/config/__init__.py +0 -0
  24. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/config/get_myconf.py +0 -0
  25. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/config/set_support.py +0 -0
  26. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/config/update_conf.py +0 -0
  27. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/dataframe/__init__.py +0 -0
  28. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/dataframe/converter.py +0 -0
  29. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/log/__init__.py +0 -0
  30. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/log/mylogger.py +0 -0
  31. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/mongo/__init__.py +0 -0
  32. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/mongo/mongo.py +0 -0
  33. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/mysql/__init__.py +0 -0
  34. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/mysql/s_query.py +0 -0
  35. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/mysql/year_month_day.py +0 -0
  36. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/other/__init__.py +0 -0
  37. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/other/porxy.py +0 -0
  38. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/other/pov_city.py +0 -0
  39. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/other/ua_sj.py +0 -0
  40. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/pbix/__init__.py +0 -0
  41. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/pbix/pbix_refresh.py +0 -0
  42. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/pbix/refresh_all.py +0 -0
  43. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq/spider/__init__.py +0 -0
  44. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq.egg-info/SOURCES.txt +0 -0
  45. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq.egg-info/dependency_links.txt +0 -0
  46. {mdbq-2.1.4 → mdbq-2.1.5}/mdbq.egg-info/top_level.txt +0 -0
  47. {mdbq-2.1.4 → mdbq-2.1.5}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mdbq
3
- Version: 2.1.4
3
+ Version: 2.1.5
4
4
  Home-page: https://pypi.org/project/mdbsql
5
5
  Author: xigua,
6
6
  Author-email: 2587125111@qq.com
@@ -126,8 +126,10 @@ class Products:
126
126
  df=df,
127
127
  db_name='属性设置2',
128
128
  table_name='货品年份基准',
129
+ move_insert = False,
129
130
  df_sql=False, # 值为 True 时使用 df.to_sql 函数上传整个表, 不会排重
130
131
  drop_duplicates=True, # 值为 True 时检查重复数据再插入,反之直接上传,会比较慢
132
+ icm_update=[],
131
133
  service_database=service_database, # 用来追踪处理进度
132
134
  )
133
135
 
@@ -149,6 +151,15 @@ def main():
149
151
  if __name__ == '__main__':
150
152
  product_id = '696017020186'
151
153
  p = Products()
152
- # p.to_mysql(service_databases=[{'home_lx': 'mysql'}, {'company': 'mysql'}])
153
154
  year = p.market_date(product_id=product_id)
154
- print(year)
155
+ print(f'{product_id}: {year}')
156
+
157
+ p.to_mysql(service_databases=[
158
+ {
159
+ 'home_lx': 'mysql'
160
+ },
161
+ {
162
+ 'company': 'mysql'
163
+ }
164
+ ]
165
+ )
@@ -68,7 +68,7 @@ class MysqlUpload:
68
68
 
69
69
  return wrapper
70
70
 
71
- # @try_except
71
+ @try_except
72
72
  def df_to_mysql(self, df, table_name, db_name='远程数据源', icm_update=[], service_database={'home_lx': 'mysql'}, move_insert=False, df_sql=False, drop_duplicates=False, filename=None, count=None, json_path=None, reset_id=False):
73
73
  """
74
74
  将 df 写入数据库
@@ -249,11 +249,12 @@ class MysqlUpload:
249
249
  if drop_duplicates: # 查重插入
250
250
  sql = "SELECT %s FROM %s WHERE %s" % (cols, table_name, condition)
251
251
  # sql = f"SELECT {cols} FROM `{table_name}` WHERE `创建时间` = '2014-09-19 14:32:33'"
252
- # print(sql)
253
252
  cursor.execute(sql)
254
253
  result = cursor.fetchall() # 获取查询结果, 有结果返回 list 表示数据已存在(不重复插入),没有则返回空 tuple
254
+ # print(result)
255
255
  if not result: # 数据不存在则插入
256
256
  sql = f"INSERT INTO `{table_name}` ({cols}) VALUES (%s);" % (values)
257
+ # print(sql)
257
258
  cursor.execute(sql)
258
259
  # else:
259
260
  # print(f'重复数据不插入: {condition[:50]}...')
@@ -21,7 +21,7 @@ from mdbq.config import set_support
21
21
  from mdbq.config import get_myconf
22
22
  from mdbq.mysql import mysql
23
23
  from mdbq.mysql import s_query
24
- import ua_sj
24
+ from mdbq.other import ua_sj
25
25
  import requests
26
26
 
27
27
  import io
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mdbq
3
- Version: 2.1.4
3
+ Version: 2.1.5
4
4
  Home-page: https://pypi.org/project/mdbsql
5
5
  Author: xigua,
6
6
  Author-email: 2587125111@qq.com
@@ -3,7 +3,7 @@
3
3
  from setuptools import setup, find_packages
4
4
 
5
5
  setup(name='mdbq',
6
- version='2.1.4',
6
+ version='2.1.5',
7
7
  author='xigua, ',
8
8
  author_email="2587125111@qq.com",
9
9
  url='https://pypi.org/project/mdbsql',
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes