mdbq 4.0.58__tar.gz → 4.0.59__tar.gz

{mdbq-4.0.58 → mdbq-4.0.59}/PKG-INFO

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

mdbq-4.0.59/mdbq/__version__.py

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

{mdbq-4.0.58 → mdbq-4.0.59}/mdbq/mysql/uploader.py

@@ -348,6 +348,10 @@ class MySQLUploader:
             import hashlib
             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_keywords = {
             'select', 'insert', 'update', 'delete', 'from', 'where', 'and', 'or',
             'not', 'like', 'in', 'is', 'null', 'true', 'false', 'between'
@@ -452,9 +456,33 @@ class MySQLUploader:
             
         # 处理主键
         if primary_keys and len(primary_keys) > 0:
-            # 如果指定了主键，直接使用指定的主键
-            safe_primary_keys = [_index_col_sql(pk) for pk in primary_keys]
-            primary_key_sql = f"PRIMARY KEY ({','.join(safe_primary_keys)})"
+            # 验证主键列是否存在于set_typ中
+            valid_primary_keys = []
+            for pk in primary_keys:
+                normalized_pk = self._normalize_col(pk)
+                if normalized_pk in set_typ:
+                    valid_primary_keys.append(pk)
+                else:
+                    logger.warning('主键列不存在于表结构中，跳过', {
+                        '库': db_name,
+                        '表': table_name,
+                        '列': pk,
+                        '规范化后': normalized_pk,
+                        '可用列': list(set_typ.keys())
+                    })
+            
+            if valid_primary_keys:
+                # 如果指定了主键，直接使用指定的主键
+                safe_primary_keys = [_index_col_sql(pk) for pk in valid_primary_keys]
+                primary_key_sql = f"PRIMARY KEY ({','.join(safe_primary_keys)})"
+            else:
+                # 如果没有有效的主键，使用id作为主键
+                logger.warning('所有主键列都不存在于表结构中，使用默认id主键', {
+                    '库': db_name,
+                    '表': table_name,
+                    '原始主键': primary_keys
+                })
+                primary_key_sql = f"PRIMARY KEY (`id`)"
         else:
             # 如果没有指定主键，使用id作为主键
             primary_key_sql = f"PRIMARY KEY (`id`)"
@@ -466,9 +494,18 @@ class MySQLUploader:
             index_defs.append(f"INDEX `idx_{self._normalize_col(date_column)}` ({safe_date_col})")
         if indexes:
             for idx_col in indexes:
-                if idx_col in set_typ:
+                normalized_idx_col = self._normalize_col(idx_col)
+                if normalized_idx_col in set_typ:
                     safe_idx_col = _index_col_sql(idx_col)
-                    index_defs.append(f"INDEX `idx_{self._normalize_col(idx_col)}` ({safe_idx_col})")
+                    index_defs.append(f"INDEX `idx_{normalized_idx_col}` ({safe_idx_col})")
+                else:
+                    logger.warning('索引列不存在于表结构中，跳过', {
+                        '库': db_name,
+                        '表': table_name,
+                        '列': idx_col,
+                        '规范化后': normalized_idx_col,
+                        '可用列': list(set_typ.keys())
+                    })
                     
         # UNIQUE KEY定义
         unique_defs = []
@@ -487,12 +524,48 @@ class MySQLUploader:
                             '主键': primary_keys
                         })
                         continue
-                safe_unique_cols = [_index_col_sql(col) for col in unique_cols]
-                unique_name = f"uniq_{'_'.join([self._normalize_col(c) for c in unique_cols])}"
+                
+                # 验证唯一约束的列是否存在于set_typ中
+                valid_unique_cols = []
+                for col in unique_cols:
+                    normalized_col = self._normalize_col(col)
+                    if normalized_col in set_typ:
+                        valid_unique_cols.append(col)
+                    else:
+                        logger.warning('唯一约束列不存在于表结构中，跳过', {
+                            '库': db_name,
+                            '表': table_name,
+                            '列': col,
+                            '规范化后': normalized_col,
+                            '可用列': list(set_typ.keys())
+                        })
+                
+                if not valid_unique_cols:
+                    logger.warning('唯一约束的所有列都不存在于表结构中，跳过整个约束', {
+                        '库': db_name,
+                        '表': table_name,
+                        '原始约束': unique_cols
+                    })
+                    continue
+                
+                safe_unique_cols = [_index_col_sql(col) for col in valid_unique_cols]
+                unique_name = f"uniq_{'_'.join([self._normalize_col(c) for c in valid_unique_cols])}"
                 unique_defs.append(f"UNIQUE KEY `{unique_name}` ({','.join(safe_unique_cols)})")
                 
         index_defs = list(set(index_defs))
         all_defs = column_defs + [primary_key_sql] + index_defs + unique_defs
+        
+        # 添加调试日志
+        logger.debug('建表SQL生成', {
+            '库': db_name,
+            '表': table_name,
+            '列定义': column_defs,
+            '主键': primary_key_sql,
+            '索引': index_defs,
+            '唯一约束': unique_defs,
+            'set_typ键': list(set_typ.keys())
+        })
+        
         sql = f"""
         CREATE TABLE IF NOT EXISTS `{db_name}`.`{table_name}` (
             {','.join(all_defs)}

{mdbq-4.0.58 → mdbq-4.0.59}/mdbq.egg-info/PKG-INFO

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

mdbq-4.0.58/mdbq/__version__.py

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