mdbq 4.0.62__tar.gz → 4.0.64__tar.gz

{mdbq-4.0.62 → mdbq-4.0.64}/PKG-INFO

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

mdbq-4.0.64/mdbq/__version__.py

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

{mdbq-4.0.62 → mdbq-4.0.64}/mdbq/mysql/uploader.py

@@ -267,7 +267,7 @@ class MySQLUploader:
         :return: 存在返回True，否则返回False
         :raises: 可能抛出数据库相关异常
         """
-        db_name = self._validate_identifier(db_name)
+        db_name = self._validate_identifier(db_name, is_database=True)
         sql = 'SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = %s'
         conn = None
         try:
@@ -289,7 +289,7 @@ class MySQLUploader:
         :param db_name: 要创建的数据库名称
         :raises: 可能抛出数据库相关异常
         """
-        db_name = self._validate_identifier(db_name)
+        db_name = self._validate_identifier(db_name, is_database=True)
         sql = f'CREATE DATABASE IF NOT EXISTS `{db_name}` CHARACTER SET {self.charset} COLLATE {self.collation}'
         conn = None
         try:
@@ -327,11 +327,12 @@ class MySQLUploader:
             logger.error('分表方式无效', {'表': table_name, '分表方式': partition_by})
             raise ValueError("分表方式必须是 'year' 或 'month' 或 'None'")
 
-    def _validate_identifier(self, identifier: str) -> str:
+    def _validate_identifier(self, identifier: str, is_database: bool = False) -> str:
         """
         验证并清理数据库标识符(表名、列名等)
 
         :param identifier: 要验证的标识符
+        :param is_database: 是否为数据库名，数据库名不能以数字开头
         :return: 清理后的安全标识符
         :raises ValueError: 当标识符无效时抛出
         """
@@ -349,9 +350,14 @@ class MySQLUploader:
             hash_suffix = hashlib.md5(identifier.encode('utf-8')).hexdigest()[:8]
             cleaned = f'unknown_col_{hash_suffix}'
         
-        # 确保标识符不以数字开头（MySQL要求）
-        if cleaned and cleaned[0].isdigit():
-            cleaned = f'col_{cleaned}'
+        # 数据库名不能以数字开头（MySQL要求），但表名和列名可以
+        if is_database and cleaned and cleaned[0].isdigit():
+            cleaned = f'db_{cleaned}'
+            logger.warning('为数字开头的数据库名添加db_前缀', {
+                '原始标识符': identifier,
+                '清理后': cleaned
+            })
+        
         mysql_keywords = {
             'select', 'insert', 'update', 'delete', 'from', 'where', 'and', 'or',
             'not', 'like', 'in', 'is', 'null', 'true', 'false', 'between'
@@ -379,7 +385,7 @@ class MySQLUploader:
             if time.time() - cached_time < self.metadata_cache_ttl:
                 logger.debug('表存在缓存命中', {'库': db_name, '表': table_name, '存在': result})
                 return result
-        db_name = self._validate_identifier(db_name)
+        db_name = self._validate_identifier(db_name, is_database=True)
         table_name = self._validate_identifier(table_name)
         sql = """
                 SELECT TABLE_NAME 
@@ -413,7 +419,7 @@ class MySQLUploader:
         """
         创建数据表，优化索引创建方式
         """
-        db_name = self._validate_identifier(db_name)
+        db_name = self._validate_identifier(db_name, is_database=True)
         table_name = self._validate_identifier(table_name)
         if not set_typ:
             logger.error('建表时未指定set_typ', {'库': db_name, '表': table_name})
@@ -859,7 +865,7 @@ class MySQLUploader:
         :return: 列名和数据类型字典 {列名: 数据类型}
         :raises: 可能抛出数据库相关异常
         """
-        db_name = self._validate_identifier(db_name)
+        db_name = self._validate_identifier(db_name, is_database=True)
         table_name = self._validate_identifier(table_name)
         sql = """
         SELECT COLUMN_NAME, DATA_TYPE 
@@ -885,7 +891,7 @@ class MySQLUploader:
         """
         确保某列有索引，如果没有则创建。
         """
-        db_name = self._validate_identifier(db_name)
+        db_name = self._validate_identifier(db_name, is_database=True)
         table_name = self._validate_identifier(table_name)
         column = self._validate_identifier(column)
         # 检查索引是否已存在
@@ -914,7 +920,7 @@ class MySQLUploader:
         获取表中所有UNIQUE KEY的列组合（不含主键）。
         返回：[[col1, col2], ...]
         """
-        db_name = self._validate_identifier(db_name)
+        db_name = self._validate_identifier(db_name, is_database=True)
         table_name = self._validate_identifier(table_name)
         sql = '''
             SELECT INDEX_NAME, COLUMN_NAME
@@ -1323,6 +1329,14 @@ class MySQLUploader:
         total_inserted = 0
         total_skipped = 0
         total_failed = 0
+        validated_primary_keys = None
+        validated_indexes = None
+        validated_unique_keys = None
+        prepared_data = None
+        filtered_set_typ = None
+        inserted = None
+        skipped = None
+        failed = None
 
         try:
             # 验证参数格式
@@ -1487,7 +1501,7 @@ class MySQLUploader:
             })
 
         # 更新索引（只有在成功时才执行）
-        if success_flag and 'validated_indexes' in locals():
+        if success_flag and validated_indexes:
             try:
                 self._update_indexes(db_name, table_name, validated_indexes)
             except Exception as e:

{mdbq-4.0.62 → mdbq-4.0.64}/mdbq.egg-info/PKG-INFO

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

mdbq-4.0.62/mdbq/__version__.py

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