From 6aca7c052f70f622f4122a7883d20ade1e15f038 Mon Sep 17 00:00:00 2001 From: John Jin Date: Tue, 16 Jun 2026 18:03:37 +0800 Subject: [PATCH] fix(transfer): solve automatic table creation statement * fix(transfer): solve automatic table creation statement * fix(transfer): fix the case issue of tests --- crates/dbx-core/src/transfer.rs | 77 ++++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/crates/dbx-core/src/transfer.rs b/crates/dbx-core/src/transfer.rs index 400af9a83b..1c05393406 100644 --- a/crates/dbx-core/src/transfer.rs +++ b/crates/dbx-core/src/transfer.rs @@ -842,8 +842,13 @@ fn is_timezone_suffix(value: &str) -> bool { } pub fn map_column_type(source_type: &str, _source_db: &DatabaseType, target_db: &DatabaseType) -> String { + if _source_db == target_db { + return source_type.to_string(); + } let t = source_type.to_lowercase(); - let base = t.split('(').next().unwrap_or(&t).trim(); + let mut base = t.split('(').next().unwrap_or(&t).trim(); + // Extract basic type, `bigint unsigned` -> `bigint` + base = base.split(' ').next().unwrap_or(base).trim(); if matches!(target_db, DatabaseType::Hive) { return match base { @@ -2798,15 +2803,19 @@ where .await .map_err(|e| format!("Failed to ensure schema exists: {e}"))?; } - let ddl = generate_create_table_ddl( - &columns, - table, - &request.source_schema, - &request.target_schema, - target_db_type, - source_db_type, - table_comment.as_deref(), - ); + let ddl = if is_mysql_family_target(source_db_type) && is_mysql_family_target(target_db_type) { + query_mysql_create_table_ddl(state, source_pool_key, &request.source_schema, table).await? + } else { + generate_create_table_ddl( + &columns, + table, + &request.source_schema, + &request.target_schema, + target_db_type, + source_db_type, + table_comment.as_deref(), + ) + }; log::info!("[transfer] creating target table: {}", ddl.chars().take(200).collect::()); let table_exists = match execute_on_pool(state, target_pool_key, &ddl).await { Ok(_) => true, @@ -2966,6 +2975,17 @@ where Ok(total_transferred) } +async fn query_mysql_create_table_ddl( + state: &AppState, + source_pool_key: &str, + source_schema: &str, + table: &str, +) -> Result { + let sql = format!("SHOW CREATE TABLE {}", qualified_table(table, source_schema, &DatabaseType::Mysql)); + let rows = execute_on_pool(state, source_pool_key, &sql).await?.rows; + rows.first().and_then(|row| json_string_cell(row, 1)).ok_or_else(|| format!("Failed to get MySQL DDL: {sql}")) +} + pub async fn transfer_postgres_schema_dependencies( state: &AppState, request: &TransferRequest, @@ -3376,7 +3396,7 @@ mod tests { db::ColumnInfo { comment: Some("用户姓名".to_string()), is_nullable: false, - ..test_column("name", "varchar(100)") + ..test_column("name", "VARCHAR(100)") }, db::ColumnInfo { comment: None, ..test_column("age", "int") }, ]; @@ -3962,22 +3982,47 @@ mod tests { #[test] fn map_column_type_preserves_longtext_for_mysql_target() { - assert_eq!(map_column_type("longtext", &DatabaseType::Mysql, &DatabaseType::Mysql), "LONGTEXT"); + assert_eq!(map_column_type("longtext", &DatabaseType::Mysql, &DatabaseType::Mysql), "longtext"); } #[test] fn map_column_type_preserves_mediumtext_for_mysql_target() { - assert_eq!(map_column_type("mediumtext", &DatabaseType::Mysql, &DatabaseType::Mysql), "MEDIUMTEXT"); + assert_eq!(map_column_type("mediumtext", &DatabaseType::Mysql, &DatabaseType::Mysql), "mediumtext"); } #[test] fn map_column_type_preserves_longblob_for_mysql_target() { - assert_eq!(map_column_type("longblob", &DatabaseType::Mysql, &DatabaseType::Mysql), "LONGBLOB"); + assert_eq!(map_column_type("longblob", &DatabaseType::Mysql, &DatabaseType::Mysql), "longblob"); } #[test] fn map_column_type_preserves_mediumblob_for_mysql_target() { - assert_eq!(map_column_type("mediumblob", &DatabaseType::Mysql, &DatabaseType::Mysql), "MEDIUMBLOB"); + assert_eq!(map_column_type("mediumblob", &DatabaseType::Mysql, &DatabaseType::Mysql), "mediumblob"); + } + + #[test] + fn map_column_type_preserves_same_database_type() { + assert_eq!(map_column_type("int unsigned", &DatabaseType::Mysql, &DatabaseType::Mysql), "int unsigned"); + assert_eq!( + map_column_type("int unsigned zerofill", &DatabaseType::Mysql, &DatabaseType::Mysql), + "int unsigned zerofill" + ); + assert_eq!(map_column_type("bigint unsigned", &DatabaseType::Mysql, &DatabaseType::Mysql), "bigint unsigned"); + assert_eq!( + map_column_type("bigint unsigned zerofill", &DatabaseType::Mysql, &DatabaseType::Mysql), + "bigint unsigned zerofill" + ); + } + + #[test] + fn map_column_type_preserves_numeric_type_from_mysql_to_postgres() { + assert_eq!(map_column_type("int unsigned", &DatabaseType::Mysql, &DatabaseType::Postgres), "INTEGER"); + assert_eq!(map_column_type("int unsigned zerofill", &DatabaseType::Mysql, &DatabaseType::Postgres), "INTEGER"); + assert_eq!(map_column_type("bigint unsigned", &DatabaseType::Mysql, &DatabaseType::Postgres), "BIGINT"); + assert_eq!( + map_column_type("bigint unsigned zerofill", &DatabaseType::Mysql, &DatabaseType::Postgres), + "BIGINT" + ); } #[test] @@ -4008,7 +4053,7 @@ mod tests { is_primary_key: true, is_nullable: false, extra: Some("auto_increment".to_string()), - ..test_column("id", "int") + ..test_column("id", "INT") }, db::ColumnInfo { is_nullable: false, ..test_column("name", "varchar(64)") }, ];