mdbq 4.0.25__py3-none-any.whl → 4.0.27__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.25'
+VERSION = '4.0.27'

mdbq/myconf/myconf.py

@@ -408,49 +408,63 @@ class ConfigParser:
         if file_path is None:
             self._ensure_file_open()
             file_path = self._current_file
+        else:
+            file_path = Path(file_path)
+            
         if not self._validate_key(key):
             raise ConfigException.invalid_key_error(key, file_path, section)
+            
         section = section or self.options.default_section
         original_lines = []
-        if file_path.exists():
-            with open(file_path, 'r', encoding=self.options.encoding) as file:
-                original_lines = file.readlines()
-        config = self.read(file_path)
-        if section not in config:
-            config[section] = {}
-        if value_type is not None:
-            try:
-                if value_type == bool:
-                    if isinstance(value, str):
-                        value = value.lower() in ('true', 'yes', '1', 'on')
-                    else:
-                        value = bool(value)
-                else:
-                    value = value_type(value)
-            except (ValueError, TypeError) as e:
-                raise ConfigException.conversion_error(value, value_type, file_path, section=section, key=key)
-        if isinstance(value, bool):
-            value = str(value).lower()
-        else:
-            value = str(value)
-        config[section][key] = value
+        
         try:
+            if file_path.exists():
+                with open(file_path, 'r', encoding=self.options.encoding) as file:
+                    original_lines = file.readlines()
+                    
+            config = self.read(file_path)
+            if section not in config:
+                config[section] = {}
+                
+            if value_type is not None:
+                try:
+                    if value_type == bool:
+                        if isinstance(value, str):
+                            value = value.lower() in ('true', 'yes', '1', 'on')
+                        else:
+                            value = bool(value)
+                    else:
+                        value = value_type(value)
+                except (ValueError, TypeError) as e:
+                    raise ConfigException.conversion_error(value, value_type, file_path, section=section, key=key)
+                    
+            if isinstance(value, bool):
+                value = str(value).lower()
+            else:
+                value = str(value)
+                
+            config[section][key] = value
+            
             file_path.parent.mkdir(parents=True, exist_ok=True)
             with open(file_path, 'w', encoding=self.options.encoding) as file:
                 current_section = self.options.default_section
                 section_separators = {}
+                
                 for line in original_lines:
                     stripped_line = line.strip()
                     if not stripped_line:
                         file.write(line)
                         continue
+                        
                     if stripped_line.startswith('[') and stripped_line.endswith(']'):
                         current_section = stripped_line[1:-1]
                         file.write(line)
                         continue
+                        
                     if self._is_comment_line(stripped_line):
                         file.write(line)
                         continue
+                        
                     key_value = self._split_key_value(stripped_line)
                     if key_value:
                         orig_key, orig_value = key_value
@@ -458,6 +472,7 @@ class ConfigParser:
                             if sep in line:
                                 section_separators.setdefault(current_section, {})[orig_key] = sep
                                 break
+                                
                         if current_section == section and orig_key == key:
                             separator = section_separators.get(current_section, {}).get(orig_key, self.options.separators[0])
                             comment = ''
@@ -471,10 +486,13 @@ class ConfigParser:
                             file.write(line)
                     else:
                         file.write(line)
+                        
                 if section not in [line.strip()[1:-1] for line in original_lines if line.strip().startswith('[') and line.strip().endswith(']')]:
                     file.write(f'\n[{section}]\n')
                     file.write(f'{key}={value}\n')
+                    
             self._clear_cache(str(file_path))
+            
         except Exception as e:
             raise ConfigException.write_error(file_path, e)
 

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.25.dist-info → mdbq-4.0.27.dist-info}/METADATA

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

{mdbq-4.0.25.dist-info → mdbq-4.0.27.dist-info}/RECORD

@@ -1,16 +1,16 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=mf2PMEnDnEKefV3pOhDSCsYd3oE27gy3kyQiCKjY5o0,18
+mdbq/__version__.py,sha256=BLG9qI65B4G2SR9uwnNZDJXbyRfkGwa15Y-2HC-0wj4,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/query_data.py,sha256=3lvLLy1sEn5ctf4FRacFvWF-J3isK5siOSItGXmCCrg,166877
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=9w_o5mYB3FooIxobq_lSa6oCYTKIhPxDFox-jeLtUHI,21714
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/myconf/myconf.py,sha256=8b3qHPKII9eh0zPHu97UiykminLjT7ePL_Bj4511wno,30737
+mdbq/myconf/myconf.py,sha256=GR250mf2KKImRUamPM2TEi9no_65tR4uKXn7eHNCAmg,31205
 mdbq/myconf/myconf_bak.py,sha256=39tLUBVlWQZzQfrwk7YoLEfipo11fpwWjaLBHcUt2qM,33341
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/deduplicator.py,sha256=kAnkI_vnN8CchgDQAFzeh0M0vLXE2oWq9SfDPNZZ3v0,73215
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
-mdbq/mysql/s_query.py,sha256=RFQIWPk9kE4CDXxAni0GdhlXDTsZm36oaNjlV9VUsOU,42925
+mdbq/mysql/s_query.py,sha256=UqmR592HAFzQ5mwArHisd8HFUFiNa2HJuwiIbh8N8n8,44995
 mdbq/mysql/unique_.py,sha256=eA0RHGobXsMJtImMW1QvhrmguzJOYz5pX9vOA1G-gxQ,21117
 mdbq/mysql/uploader.py,sha256=f1wxouaQk3narxFQ4XiAtlA0LTX_WSz3qXTkn7m_tQQ,81141
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -25,7 +25,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=juOqpr_dHeE1RyjCu67VcpzoJAWMO7FKv0i8KiH8WUo,21552
-mdbq-4.0.25.dist-info/METADATA,sha256=v8LbM8m9st9iQG2IM4JQrkaH2v6Mm44y1eHdozfv6LA,364
-mdbq-4.0.25.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.25.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.25.dist-info/RECORD,,
+mdbq-4.0.27.dist-info/METADATA,sha256=ho97HRTp4AqSe_HLBpN_L7b6MkBHmrNOqdggrG8CRwg,364
+mdbq-4.0.27.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.27.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.27.dist-info/RECORD,,