fix(sqlserver): use numeric literals for bitn
This commit is contained in:
1 parent
6d9132e2a9
commit
e83f41c63c
1 file changed
+48
-2
@@ -1161,7 +1161,11 @@ fn is_bit_literal_column(column_info: Option<&DataGridColumnInfo>) -> bool {
|
|||||||
|
|
||||||
fn is_bit_column_type(data_type: &str) -> bool {
|
fn is_bit_column_type(data_type: &str) -> bool {
|
||||||
let lower = data_type.to_ascii_lowercase();
|
let lower = data_type.to_ascii_lowercase();
|
||||||
lower.split(|ch: char| !ch.is_ascii_alphanumeric()).any(|token| token == "bit")
|
lower.split(|ch: char| !ch.is_ascii_alphanumeric()).any(|token| {
|
||||||
|
// SQL Server/tiberius reports nullable BIT result columns as `bitn`.
|
||||||
|
// They still need numeric 0/1 literals in generated UPDATE SQL.
|
||||||
|
matches!(token, "bit" | "bitn")
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_mysql_geometry_literal_database(database_type: Option<DatabaseType>) -> bool {
|
fn is_mysql_geometry_literal_database(database_type: Option<DatabaseType>) -> bool {
|
||||||
@@ -1845,7 +1849,9 @@ fn is_numeric_type(data_type: &str) -> bool {
|
|||||||
|
|
||||||
fn is_boolean_type(data_type: &str) -> bool {
|
fn is_boolean_type(data_type: &str) -> bool {
|
||||||
let lower = data_type.to_ascii_lowercase();
|
let lower = data_type.to_ascii_lowercase();
|
||||||
lower.split(|ch: char| !ch.is_ascii_alphanumeric()).any(|token| matches!(token, "bool" | "boolean" | "bit"))
|
lower
|
||||||
|
.split(|ch: char| !ch.is_ascii_alphanumeric())
|
||||||
|
.any(|token| matches!(token, "bool" | "boolean" | "bit" | "bitn"))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_numeric_literal(text: &str) -> bool {
|
fn is_numeric_literal(text: &str) -> bool {
|
||||||
@@ -2040,6 +2046,16 @@ mod tests {
|
|||||||
.as_deref(),
|
.as_deref(),
|
||||||
Some("\"created_at\"::text NOT LIKE '%2026%'")
|
Some("\"created_at\"::text NOT LIKE '%2026%'")
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
build_data_grid_column_value_filter_condition(DataGridColumnValueFilterConditionOptions {
|
||||||
|
database_type: Some(DatabaseType::SqlServer),
|
||||||
|
column_name: "active".to_string(),
|
||||||
|
column_info: Some(column("active", "bitn", false, None)),
|
||||||
|
raw_value: "false".to_string(),
|
||||||
|
})
|
||||||
|
.as_deref(),
|
||||||
|
Some("[active] = 0")
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -2274,6 +2290,36 @@ mod tests {
|
|||||||
assert_eq!(format_grid_sql_literal(&json!("0"), Some(DatabaseType::Postgres), Some(&bit)), "'0'");
|
assert_eq!(format_grid_sql_literal(&json!("0"), Some(DatabaseType::Postgres), Some(&bit)), "'0'");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn prepares_sqlserver_bitn_updates_with_numeric_literals() {
|
||||||
|
let result = prepare_data_grid_save(DataGridSaveStatementOptions {
|
||||||
|
database_type: Some(DatabaseType::SqlServer),
|
||||||
|
table_meta: DataGridTableMeta {
|
||||||
|
schema: Some("dbo".to_string()),
|
||||||
|
table_name: "flags".to_string(),
|
||||||
|
primary_keys: vec![],
|
||||||
|
columns: Some(vec![column("id", "int", false, None), column("active", "bitn", false, None)]),
|
||||||
|
},
|
||||||
|
columns: vec!["id".to_string(), "active".to_string()],
|
||||||
|
source_columns: None,
|
||||||
|
rows: vec![vec![json!(1), json!(false)]],
|
||||||
|
dirty_rows: vec![(0, vec![(1, json!(true))])],
|
||||||
|
deleted_rows: vec![],
|
||||||
|
new_rows: vec![],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_eq!(result.validation_error, None);
|
||||||
|
assert_eq!(result.statements, vec!["UPDATE [dbo].[flags] SET [active] = 1 WHERE [id] = 1 AND [active] = 0;"]);
|
||||||
|
assert_eq!(
|
||||||
|
result.rollback_statements,
|
||||||
|
vec!["UPDATE [dbo].[flags] SET [active] = 0 WHERE [id] = 1 AND [active] = 1 AND [active] = 1;"]
|
||||||
|
);
|
||||||
|
for sql in result.statements.iter().chain(result.rollback_statements.iter()) {
|
||||||
|
assert!(!sql.contains("TRUE"));
|
||||||
|
assert!(!sql.contains("FALSE"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn saves_empty_nullable_mysql_numeric_cell_as_null() {
|
fn saves_empty_nullable_mysql_numeric_cell_as_null() {
|
||||||
let result = prepare_data_grid_save(DataGridSaveStatementOptions {
|
let result = prepare_data_grid_save(DataGridSaveStatementOptions {
|
||||||
|
|||||||
Reference in new issue
Block a user