mdbq 4.0.24__tar.gz → 4.0.26__tar.gz

{mdbq-4.0.24 → mdbq-4.0.26}/PKG-INFO

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

mdbq-4.0.26/mdbq/__version__.py

@@ -0,0 +1 @@
+VERSION = '4.0.26'

{mdbq-4.0.24 → mdbq-4.0.26}/mdbq/aggregation/query_data.py

@@ -3684,16 +3684,20 @@ def main(months=3):
     # 1. 更新日期表  更新货品年份基准表， 属性设置 3 - 货品年份基准
     date_table()
     # 2. 数据聚合
-    download_manager = s_query.QueryDatas(
-        username=username, 
-        password=password, 
-        host=host, 
-        port=port,
-        pool_size=20,
-        )
-    query1(download_manager=download_manager, months=months)
-    query2(download_manager=download_manager, months=months)
-    query3(download_manager=download_manager, months=months)
+    db_config = {
+        'username': username,
+        'password': password,
+        'host': host,
+        'port': int(port),
+        'pool_size': 20,
+        'mincached': 5,
+        'maxcached': 10,
+    }
+    with s_query.QueryDatas(**db_config) as download_manager:
+        query1(download_manager=download_manager, months=months)
+        query2(download_manager=download_manager, months=months)
+        query3(download_manager=download_manager, months=months)
+    
     logger.info('数据聚合完成')
 
 

{mdbq-4.0.24 → mdbq-4.0.26}/mdbq/mysql/s_query.py

@@ -264,7 +264,26 @@ class QueryDatas:
             conn = self.pool.connection()
             if db_name:
                 with conn.cursor() as cursor:
-                    cursor.execute(f"USE `{db_name}`")
+                    # 先检查当前数据库
+                    cursor.execute("SELECT DATABASE()")
+                    current_db = cursor.fetchone()['DATABASE()']
+                    
+                    # 如果当前数据库不是目标数据库，则切换
+                    if current_db != db_name:
+                        cursor.execute(f"USE `{db_name}`")
+                        # 验证切换是否成功
+                        cursor.execute("SELECT DATABASE()")
+                        new_db = cursor.fetchone()['DATABASE()']
+                        if new_db != db_name:
+                            logger.error('数据库切换失败', {
+                                '期望数据库': db_name,
+                                '当前数据库': new_db
+                            })
+                            raise ConnectionError(f'无法切换到数据库: {db_name}')
+                        logger.debug('数据库切换成功', {
+                            '从': current_db,
+                            '到': db_name
+                        })
             return conn
         except pymysql.OperationalError as e:
             error_code = e.args[0] if e.args else None
@@ -353,6 +372,7 @@ class QueryDatas:
         """
         try:
             if info_type == 'exists':
+                # 检查数据库是否存在
                 result = self._execute_query("SHOW DATABASES LIKE %s", (db_name,))
                 if not result:
                     all_dbs = self._execute_query("SHOW DATABASES")
@@ -363,17 +383,39 @@ class QueryDatas:
                         '可能的原因': '数据库名称错误或没有访问权限'
                     })
                     return False
-                    
-                result = self._execute_query("SHOW TABLES LIKE %s", (table_name,), db_name=db_name)
+                
+                # 检查表是否存在（使用information_schema更可靠）
+                sql = """
+                    SELECT TABLE_NAME 
+                    FROM information_schema.TABLES 
+                    WHERE TABLE_SCHEMA = %s 
+                    AND TABLE_NAME = %s
+                """
+                result = self._execute_query(sql, (db_name, table_name))
                 if not result:
-                    all_tables = self._execute_query("SHOW TABLES", db_name=db_name)
-                    available_tables = [table[f'Tables_in_{db_name}'] for table in all_tables] if all_tables else []
-                    logger.info('表不存在', {
+                    # 获取所有表名（不区分大小写）
+                    sql = """
+                        SELECT TABLE_NAME 
+                        FROM information_schema.TABLES 
+                        WHERE TABLE_SCHEMA = %s
+                    """
+                    all_tables = self._execute_query(sql, (db_name,))
+                    available_tables = [table['TABLE_NAME'] for table in all_tables] if all_tables else []
+                    
+                    # 检查是否有大小写匹配的表
+                    case_insensitive_matches = [t for t in available_tables if t.lower() == table_name.lower()]
+                    
+                    error_info = {
                         '库': db_name,
                         '表': table_name,
                         '可用的表': available_tables,
                         '可能的原因': '表名称错误或没有访问权限'
-                    })
+                    }
+                    
+                    if case_insensitive_matches:
+                        error_info['可能的原因'] = f'表名大小写不匹配，请使用正确的表名: {case_insensitive_matches}'
+                    
+                    logger.info('表不存在', error_info)
                     return False
                 return True
                 

{mdbq-4.0.24 → mdbq-4.0.26}/mdbq.egg-info/PKG-INFO

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

mdbq-4.0.24/mdbq/__version__.py

@@ -1 +0,0 @@
-VERSION = '4.0.24'