fix(transfer): preserve Oracle character length semantics
This commit is contained in:
1 parent
9fc7721590
commit
4d32bc4981
3 files changed
+178
-5
No files matched your search
@@ -45,8 +45,8 @@ pub(crate) use table_select::{
|
|||||||
quote_table_data_identifier, table_data_qualified_table_name, table_data_schema, uses_connection_identifier_quote,
|
quote_table_data_identifier, table_data_qualified_table_name, table_data_schema, uses_connection_identifier_quote,
|
||||||
};
|
};
|
||||||
pub use type_rewrite::{
|
pub use type_rewrite::{
|
||||||
apply_auto_inc_to_column_def, column_is_auto_increment, rewrite_column_type, split_type_base_params,
|
apply_auto_inc_to_column_def, column_is_auto_increment, normalize_len_params, rewrite_column_type,
|
||||||
type_looks_integer, AutoIncColumnBuild,
|
split_type_base_params, type_looks_integer, AutoIncColumnBuild,
|
||||||
};
|
};
|
||||||
pub use types::*;
|
pub use types::*;
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,53 @@ fn first_length_param(params: Option<&str>) -> Option<u32> {
|
|||||||
params.and_then(|p| p.split(',').next()).and_then(|p| p.trim().parse::<u32>().ok())
|
params.and_then(|p| p.split(',').next()).and_then(|p| p.trim().parse::<u32>().ok())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Strip Oracle-specific length-unit qualifiers (`CHAR` / `BYTE`) from a
|
||||||
|
/// parenthesized length slice such as `(50 CHAR)` → `(50)`.
|
||||||
|
///
|
||||||
|
/// Oracle allows character columns to declare their length unit explicitly:
|
||||||
|
/// `VARCHAR2(50 CHAR)` (characters) or `VARCHAR2(50 BYTE)` (bytes). The unit
|
||||||
|
/// qualifier is Oracle-only syntax — MySQL's `VARCHAR(n)` always means
|
||||||
|
/// characters and rejects `VARCHAR(50 CHAR)` with ERROR 1064. Stripping the
|
||||||
|
/// qualifier here keeps the generated target DDL valid while preserving the
|
||||||
|
/// numeric length.
|
||||||
|
///
|
||||||
|
/// Only single numeric parameters followed by `CHAR`/`BYTE` are touched;
|
||||||
|
/// precision/scale lists (`(10,2)`) and enum/set lists (`('a','b')`) are
|
||||||
|
/// returned unchanged.
|
||||||
|
pub fn normalize_len_params(parenthesized: &str) -> String {
|
||||||
|
let Some(open) = parenthesized.find('(') else {
|
||||||
|
return parenthesized.to_string();
|
||||||
|
};
|
||||||
|
let Some(close) = parenthesized.rfind(')') else {
|
||||||
|
return parenthesized.to_string();
|
||||||
|
};
|
||||||
|
if open >= close {
|
||||||
|
return parenthesized.to_string();
|
||||||
|
}
|
||||||
|
// Keep any prefix (base type or whitespace) so a full type string such as
|
||||||
|
// `varchar(50)` round-trips as-is instead of losing its base name.
|
||||||
|
format!("{}({})", &parenthesized[..open], strip_length_unit(&parenthesized[open + 1..close]))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Strip a trailing `CHAR`/`BYTE` unit from a single length parameter,
|
||||||
|
/// e.g. `50 CHAR` → `50`. Multi-part or non-numeric parameters are unchanged.
|
||||||
|
fn strip_length_unit(params: &str) -> String {
|
||||||
|
let trimmed = params.trim();
|
||||||
|
if trimmed.is_empty() || trimmed.contains(',') {
|
||||||
|
return trimmed.to_string();
|
||||||
|
}
|
||||||
|
let upper = trimmed.to_ascii_uppercase();
|
||||||
|
for unit in ["CHAR", "BYTE"] {
|
||||||
|
if let Some(head) = upper.strip_suffix(unit) {
|
||||||
|
let head = head.trim_end();
|
||||||
|
if !head.is_empty() && head.bytes().all(|b| b.is_ascii_digit()) {
|
||||||
|
return head.to_string();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
trimmed.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
fn apply_template(template: &str, params: Option<&str>, max_varchar_len: Option<u32>) -> String {
|
fn apply_template(template: &str, params: Option<&str>, max_varchar_len: Option<u32>) -> String {
|
||||||
if !template.contains("{}") {
|
if !template.contains("{}") {
|
||||||
return template.to_string();
|
return template.to_string();
|
||||||
@@ -240,4 +287,33 @@ mod tests {
|
|||||||
let t = rewrite_column_type("int(11)", DatabaseType::Mysql, None);
|
let t = rewrite_column_type("int(11)", DatabaseType::Mysql, None);
|
||||||
assert_eq!(t, "int(11)");
|
assert_eq!(t, "int(11)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn normalize_len_params_strips_oracle_char_unit() {
|
||||||
|
assert_eq!(normalize_len_params("(6 CHAR)"), "(6)");
|
||||||
|
assert_eq!(normalize_len_params("(50 char)"), "(50)");
|
||||||
|
assert_eq!(normalize_len_params("(50 CHAR)"), "(50)");
|
||||||
|
assert_eq!(normalize_len_params("(20 BYTE)"), "(20)");
|
||||||
|
assert_eq!(normalize_len_params("(20 byte)"), "(20)");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn normalize_len_params_leaves_non_unit_params_untouched() {
|
||||||
|
// Plain length without a unit qualifier.
|
||||||
|
assert_eq!(normalize_len_params("(50)"), "(50)");
|
||||||
|
// Precision/scale must never be disturbed.
|
||||||
|
assert_eq!(normalize_len_params("(10,2)"), "(10,2)");
|
||||||
|
// Enum/set lists must never be disturbed.
|
||||||
|
assert_eq!(normalize_len_params("('a','b')"), "('a','b')");
|
||||||
|
// Non-numeric head (defensive) is left alone.
|
||||||
|
assert_eq!(normalize_len_params("(MAX CHAR)"), "(MAX CHAR)");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn normalize_len_params_handles_malformed_input() {
|
||||||
|
assert_eq!(normalize_len_params("varchar(50)"), "varchar(50)");
|
||||||
|
assert_eq!(normalize_len_params("no-parens"), "no-parens");
|
||||||
|
assert_eq!(normalize_len_params("(unclosed"), "(unclosed");
|
||||||
|
assert_eq!(normalize_len_params(")"), ")");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,7 @@ use crate::query::{
|
|||||||
agent_execute_query_params, pool_error_action, PoolErrorAction, QueryExecutionOptions, AGENT_PROTOCOL_MAX_ROWS,
|
agent_execute_query_params, pool_error_action, PoolErrorAction, QueryExecutionOptions, AGENT_PROTOCOL_MAX_ROWS,
|
||||||
};
|
};
|
||||||
use crate::sql::{split_sql_statements, split_sql_statements_for_database};
|
use crate::sql::{split_sql_statements, split_sql_statements_for_database};
|
||||||
use crate::sql_dialect::{qualified_transfer_table, quote_transfer_identifier};
|
use crate::sql_dialect::{normalize_len_params, qualified_transfer_table, quote_transfer_identifier};
|
||||||
|
|
||||||
static CANCELLED: std::sync::LazyLock<RwLock<HashSet<String>>> =
|
static CANCELLED: std::sync::LazyLock<RwLock<HashSet<String>>> =
|
||||||
std::sync::LazyLock::new(|| RwLock::new(HashSet::new()));
|
std::sync::LazyLock::new(|| RwLock::new(HashSet::new()));
|
||||||
@@ -2790,6 +2790,17 @@ fn is_timezone_suffix(value: &str) -> bool {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn transfer_length_params(source_type: &str, target_db: &DatabaseType) -> String {
|
||||||
|
let params = &source_type[source_type.find('(').expect("caller checked length parameters")..];
|
||||||
|
if matches!(target_db, DatabaseType::Oracle | DatabaseType::OceanbaseOracle | DatabaseType::Dameng) {
|
||||||
|
params.to_string()
|
||||||
|
} else {
|
||||||
|
// Oracle length-unit qualifiers are invalid for non-Oracle-family
|
||||||
|
// targets, which only accept the numeric length.
|
||||||
|
normalize_len_params(params)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn map_column_type(source_type: &str, _source_db: &DatabaseType, target_db: &DatabaseType) -> String {
|
pub fn map_column_type(source_type: &str, _source_db: &DatabaseType, target_db: &DatabaseType) -> String {
|
||||||
if _source_db == target_db {
|
if _source_db == target_db {
|
||||||
return source_type.to_string();
|
return source_type.to_string();
|
||||||
@@ -2873,7 +2884,7 @@ pub fn map_column_type(source_type: &str, _source_db: &DatabaseType, target_db:
|
|||||||
}
|
}
|
||||||
"varchar" | "nvarchar" | "character varying" | "varchar2" => {
|
"varchar" | "nvarchar" | "character varying" | "varchar2" => {
|
||||||
if t.contains('(') {
|
if t.contains('(') {
|
||||||
let len_part = &t[t.find('(').unwrap()..];
|
let len_part = transfer_length_params(&t, target_db);
|
||||||
match target_db {
|
match target_db {
|
||||||
target_db if is_postgres_transfer_dialect(target_db) => format!("VARCHAR{len_part}"),
|
target_db if is_postgres_transfer_dialect(target_db) => format!("VARCHAR{len_part}"),
|
||||||
DatabaseType::Mysql => format!("VARCHAR{len_part}"),
|
DatabaseType::Mysql => format!("VARCHAR{len_part}"),
|
||||||
@@ -2886,7 +2897,7 @@ pub fn map_column_type(source_type: &str, _source_db: &DatabaseType, target_db:
|
|||||||
}
|
}
|
||||||
"char" | "nchar" | "character" => {
|
"char" | "nchar" | "character" => {
|
||||||
if t.contains('(') {
|
if t.contains('(') {
|
||||||
let len_part = &t[t.find('(').unwrap()..];
|
let len_part = transfer_length_params(&t, target_db);
|
||||||
format!("CHAR{len_part}")
|
format!("CHAR{len_part}")
|
||||||
} else {
|
} else {
|
||||||
"CHAR(1)".into()
|
"CHAR(1)".into()
|
||||||
@@ -9016,6 +9027,29 @@ mod tests {
|
|||||||
assert!(ddl.contains("PRIMARY KEY (`id`)"));
|
assert!(ddl.contains("PRIMARY KEY (`id`)"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn oracle_to_mysql_create_table_ddl_strips_char_length_units() {
|
||||||
|
// Issue #6479 end-to-end: Oracle columns reported with CHAR length
|
||||||
|
// semantics must produce valid MySQL DDL (`VARCHAR(6)`, not
|
||||||
|
// `VARCHAR(6 char)` which fails with ERROR 1064).
|
||||||
|
let cols = vec![
|
||||||
|
test_column("ID", "VARCHAR2(6 CHAR)"),
|
||||||
|
test_column("DWMC", "VARCHAR2(50 CHAR)"),
|
||||||
|
test_column("JOB", "VARCHAR2(20 CHAR)"),
|
||||||
|
test_column("FLAG", "CHAR(1 CHAR)"),
|
||||||
|
];
|
||||||
|
let ddl =
|
||||||
|
generate_create_table_ddl(&cols, "USERS", "", "", &DatabaseType::Mysql, &DatabaseType::Oracle, None, None);
|
||||||
|
assert!(ddl.contains("`ID` VARCHAR(6)"), "ddl: {ddl}");
|
||||||
|
assert!(ddl.contains("`DWMC` VARCHAR(50)"), "ddl: {ddl}");
|
||||||
|
assert!(ddl.contains("`JOB` VARCHAR(20)"), "ddl: {ddl}");
|
||||||
|
assert!(ddl.contains("`FLAG` CHAR(1)"), "ddl: {ddl}");
|
||||||
|
// A `char`/`CHAR` immediately before `)` would be a leaked Oracle unit
|
||||||
|
// qualifier (`VARCHAR(6 char)`); a legit `CHAR(1)` does not match.
|
||||||
|
assert!(!ddl.contains("char)"), "Oracle length unit leaked into DDL: {ddl}");
|
||||||
|
assert!(!ddl.contains("CHAR)"), "Oracle length unit leaked into DDL: {ddl}");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn dameng_create_table_omits_if_not_exists_without_changing_other_prefixes() {
|
fn dameng_create_table_omits_if_not_exists_without_changing_other_prefixes() {
|
||||||
let cols = vec![test_column("id", "int")];
|
let cols = vec![test_column("id", "int")];
|
||||||
@@ -11352,6 +11386,69 @@ SELECT 1 FROM dual"#
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_column_type_oracle_char_semantics_to_mysql() {
|
||||||
|
// Issue #6479: Oracle `VARCHAR2(50 CHAR)` must rewrite to `VARCHAR(50)`,
|
||||||
|
// not `VARCHAR(50 char)` which MySQL rejects with ERROR 1064 (42000).
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(6 CHAR)", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(6)");
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(50 CHAR)", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(50)");
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(20 char)", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(20)");
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(50 CHAR)", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(50)");
|
||||||
|
// NVARCHAR2 keeps its pre-existing fallback (TEXT) — no length unit leaks.
|
||||||
|
assert_eq!(map_column_type("NVARCHAR2(50 CHAR)", &DatabaseType::Oracle, &DatabaseType::Mysql), "TEXT");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_column_type_oracle_plain_varchar2_to_mysql() {
|
||||||
|
// Plain VARCHAR2 without a length unit must keep working unchanged.
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(50)", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(50)");
|
||||||
|
assert_eq!(map_column_type("VARCHAR2", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(255)");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_column_type_preserves_length_units_for_oracle_family_targets() {
|
||||||
|
for target in [DatabaseType::Oracle, DatabaseType::OceanbaseOracle, DatabaseType::Dameng] {
|
||||||
|
let source =
|
||||||
|
if target == DatabaseType::Oracle { DatabaseType::OceanbaseOracle } else { DatabaseType::Oracle };
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(50 CHAR)", &source, &target), "VARCHAR(50 char)");
|
||||||
|
assert_eq!(map_column_type("CHAR(20 BYTE)", &source, &target), "CHAR(20 byte)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_column_type_strips_length_units_for_non_oracle_targets() {
|
||||||
|
for target in [DatabaseType::Mysql, DatabaseType::Postgres, DatabaseType::SqlServer] {
|
||||||
|
assert!(!map_column_type("VARCHAR2(50 CHAR)", &DatabaseType::Oracle, &target).contains("char"));
|
||||||
|
assert!(!map_column_type("CHAR(20 BYTE)", &DatabaseType::Oracle, &target).contains("byte"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_column_type_keeps_real_char_type_untouched() {
|
||||||
|
// CHAR(10) is a valid type on its own and must not lose its length.
|
||||||
|
assert_eq!(map_column_type("CHAR(10)", &DatabaseType::Oracle, &DatabaseType::Mysql), "CHAR(10)");
|
||||||
|
assert_eq!(map_column_type("char(10)", &DatabaseType::Mysql, &DatabaseType::Postgres), "CHAR(10)");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_column_type_oracle_byte_semantics_locked() {
|
||||||
|
// MySQL has no BYTE length semantics. The qualifier is stripped so the
|
||||||
|
// generated DDL stays valid; `VARCHAR2(20 BYTE)` maps to `VARCHAR(20)`
|
||||||
|
// (character length). This intentionally locks in the conservative
|
||||||
|
// behavior: never emit `VARCHAR(20 byte)`.
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(20 BYTE)", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(20)");
|
||||||
|
assert_eq!(map_column_type("VARCHAR2(20 byte)", &DatabaseType::Oracle, &DatabaseType::Mysql), "VARCHAR(20)");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_column_type_preserves_numeric_precision_scale() {
|
||||||
|
// Precision/scale parameter lists must not be disturbed.
|
||||||
|
assert_eq!(map_column_type("NUMBER(10,2)", &DatabaseType::Oracle, &DatabaseType::Mysql), "DECIMAL(10,2)");
|
||||||
|
assert_eq!(map_column_type("DECIMAL(10,2)", &DatabaseType::Oracle, &DatabaseType::Mysql), "DECIMAL(10,2)");
|
||||||
|
assert_eq!(map_column_type("NUMBER(10)", &DatabaseType::Oracle, &DatabaseType::Mysql), "DECIMAL(10)");
|
||||||
|
assert_eq!(map_column_type("TIMESTAMP(6)", &DatabaseType::Oracle, &DatabaseType::Mysql), "DATETIME");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn map_column_type_preserves_longtext_for_mysql_target() {
|
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");
|
||||||
|
|||||||
Reference in new issue
Block a user