fix(sql): preserve same-line TDSQL directives
This commit is contained in:
6 files changed
+145
-39
No files matched your search
@@ -11,13 +11,21 @@ pub fn is_profile(db_type: &DatabaseType, driver_profile: Option<&str>) -> bool
|
||||
&& driver_profile.is_some_and(|profile| profile.eq_ignore_ascii_case(DRIVER_PROFILE))
|
||||
}
|
||||
|
||||
pub(crate) fn preserves_proxy_directive_for_database_type(db_type: DatabaseType) -> bool {
|
||||
pub(crate) fn preserves_leading_directives_for_database_type(db_type: DatabaseType) -> bool {
|
||||
db_type == DatabaseType::Mysql
|
||||
}
|
||||
|
||||
pub(crate) fn proxy_directive_start(statement: &str, executable_start: usize) -> Option<usize> {
|
||||
let prefix = statement.get(..executable_start)?.trim_end();
|
||||
prefix.strip_suffix("/*proxy*/").map(|before| before.len())
|
||||
pub(crate) fn leading_directive_start(statement: &str, executable_start: usize) -> Option<usize> {
|
||||
let prefix = statement.get(..executable_start)?;
|
||||
let line_start = prefix.rfind(['\r', '\n']).map_or(0, |index| index + 1);
|
||||
let line_prefix = &prefix[line_start..];
|
||||
let trimmed_line_start = line_prefix.trim_start();
|
||||
if trimmed_line_start.starts_with("/*") && trimmed_line_start.trim_end().ends_with("*/") {
|
||||
return Some(line_start + line_prefix.len() - trimmed_line_start.len());
|
||||
}
|
||||
|
||||
let trimmed_prefix = prefix.trim_end();
|
||||
trimmed_prefix.strip_suffix("/*proxy*/").map(|before| before.len())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -32,23 +40,27 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn proxy_directive_is_available_only_to_mysql_parsing() {
|
||||
assert!(preserves_proxy_directive_for_database_type(DatabaseType::Mysql));
|
||||
assert!(!preserves_proxy_directive_for_database_type(DatabaseType::Postgres));
|
||||
fn leading_directives_are_available_only_to_mysql_parsing() {
|
||||
assert!(preserves_leading_directives_for_database_type(DatabaseType::Mysql));
|
||||
assert!(!preserves_leading_directives_for_database_type(DatabaseType::Postgres));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn proxy_directive_must_be_exact_and_adjacent_to_executable_sql() {
|
||||
fn leading_directives_preserve_same_line_and_exact_proxy_behavior() {
|
||||
let exact = "/*proxy*/ \n\tSHOW PROXY STATUS";
|
||||
let executable_start = exact.find("SHOW").unwrap();
|
||||
assert_eq!(proxy_directive_start(exact, executable_start), Some(0));
|
||||
assert_eq!(leading_directive_start(exact, executable_start), Some(0));
|
||||
|
||||
let ordinary = "/* proxy */\nSHOW PROXY STATUS";
|
||||
let executable_start = ordinary.find("SHOW").unwrap();
|
||||
assert_eq!(proxy_directive_start(ordinary, executable_start), None);
|
||||
let same_line = " /*sets:allsets */ SELECT 1";
|
||||
let executable_start = same_line.find("SELECT").unwrap();
|
||||
assert_eq!(leading_directive_start(same_line, executable_start), Some(2));
|
||||
|
||||
let separate_line = "/*sets:allsets */\nSELECT 1";
|
||||
let executable_start = separate_line.find("SELECT").unwrap();
|
||||
assert_eq!(leading_directive_start(separate_line, executable_start), None);
|
||||
|
||||
let separated = "/*proxy*/\n/* audit */\nSHOW PROXY STATUS";
|
||||
let executable_start = separated.find("SHOW").unwrap();
|
||||
assert_eq!(proxy_directive_start(separated, executable_start), None);
|
||||
assert_eq!(leading_directive_start(separated, executable_start), None);
|
||||
}
|
||||
}
|
||||
+43
-10
@@ -117,7 +117,7 @@ struct SqlDialectProfile {
|
||||
supports_hana_do_blocks: bool,
|
||||
supports_go_batch_separator: bool,
|
||||
keeps_sqlserver_module_batch_at_cursor: bool,
|
||||
preserves_tdsql_proxy_directive: bool,
|
||||
preserves_tdsql_leading_directives: bool,
|
||||
requires_whitespace_after_line_comment_dashes: bool,
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ impl Default for SqlDialectProfile {
|
||||
supports_hana_do_blocks: false,
|
||||
supports_go_batch_separator: false,
|
||||
keeps_sqlserver_module_batch_at_cursor: false,
|
||||
preserves_tdsql_proxy_directive: false,
|
||||
preserves_tdsql_leading_directives: false,
|
||||
requires_whitespace_after_line_comment_dashes: false,
|
||||
}
|
||||
}
|
||||
@@ -144,9 +144,8 @@ impl SqlDialectProfile {
|
||||
fn for_database_type(db_type: DatabaseType) -> Self {
|
||||
if matches!(db_type, DatabaseType::Mysql) {
|
||||
return Self {
|
||||
preserves_tdsql_proxy_directive: crate::db::tdsql_mysql::preserves_proxy_directive_for_database_type(
|
||||
db_type,
|
||||
),
|
||||
preserves_tdsql_leading_directives:
|
||||
crate::db::tdsql_mysql::preserves_leading_directives_for_database_type(db_type),
|
||||
..Self::mysql_compatible()
|
||||
};
|
||||
}
|
||||
@@ -2530,8 +2529,8 @@ fn executable_sql_bounds(statement: &str, options: SqlParsingOptions) -> Option<
|
||||
return None;
|
||||
}
|
||||
let executable_start = trimmed.len() - executable.len();
|
||||
let start = if options.profile.preserves_tdsql_proxy_directive {
|
||||
crate::db::tdsql_mysql::proxy_directive_start(trimmed, executable_start).unwrap_or(executable_start)
|
||||
let start = if options.profile.preserves_tdsql_leading_directives {
|
||||
crate::db::tdsql_mysql::leading_directive_start(trimmed, executable_start).unwrap_or(executable_start)
|
||||
} else {
|
||||
executable_start
|
||||
};
|
||||
@@ -3384,14 +3383,14 @@ SELECT 2;";
|
||||
assert!(!default.supports_slash_line_block_delimiter);
|
||||
assert!(!default.supports_go_batch_separator);
|
||||
assert!(!default.keeps_sqlserver_module_batch_at_cursor);
|
||||
assert!(!default.preserves_tdsql_proxy_directive);
|
||||
assert!(!default.preserves_tdsql_leading_directives);
|
||||
|
||||
let mysql = SqlDialectProfile::for_database_type(DatabaseType::Mysql);
|
||||
assert!(mysql.supports_hash_line_comments);
|
||||
assert!(mysql.supports_mysql_routine_blocks);
|
||||
assert!(mysql.preserves_tdsql_proxy_directive);
|
||||
assert!(mysql.preserves_tdsql_leading_directives);
|
||||
assert!(SqlDialectProfile::for_database_type(DatabaseType::Doris).supports_hash_line_comments);
|
||||
assert!(!SqlDialectProfile::for_database_type(DatabaseType::Doris).preserves_tdsql_proxy_directive);
|
||||
assert!(!SqlDialectProfile::for_database_type(DatabaseType::Doris).preserves_tdsql_leading_directives);
|
||||
assert!(SqlDialectProfile::for_database_type(DatabaseType::StarRocks).supports_hash_line_comments);
|
||||
assert!(SqlDialectProfile::for_database_type(DatabaseType::ManticoreSearch).supports_hash_line_comments);
|
||||
assert!(SqlDialectProfile::for_database_type(DatabaseType::Goldendb).supports_hash_line_comments);
|
||||
@@ -4292,6 +4291,40 @@ delimiter ;";
|
||||
assert!(split_sql_statements_for_database("/*proxy*/", DatabaseType::Mysql).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_current_statement_preserves_same_line_tdsql_directives_without_an_allowlist() {
|
||||
for directive in ["/*sets:allsets */", "/*master*/", "/*slave:set_1781591902_7*/", "/*future-route:anywhere*/"]
|
||||
{
|
||||
let sql = format!("{directive} SELECT count(*) FROM tenant_table");
|
||||
let cursor = sql[..sql.find("tenant_table").unwrap()].encode_utf16().count();
|
||||
|
||||
assert_eq!(find_statement_at_cursor_for_database(&sql, cursor, DatabaseType::Mysql), sql);
|
||||
assert_eq!(split_sql_statements_for_database(&sql, DatabaseType::Mysql), vec![sql]);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_current_statement_strips_generic_tdsql_style_directive_on_a_separate_line() {
|
||||
let sql = "/*sets:allsets */\nSELECT count(*) FROM tenant_table";
|
||||
let cursor = sql[..sql.find("tenant_table").unwrap()].encode_utf16().count();
|
||||
|
||||
assert_eq!(
|
||||
find_statement_at_cursor_for_database(sql, cursor, DatabaseType::Mysql),
|
||||
"SELECT count(*) FROM tenant_table"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn other_databases_strip_same_line_tdsql_style_directives() {
|
||||
let sql = "/*sets:allsets */ SELECT count(*) FROM tenant_table";
|
||||
let cursor = sql[..sql.find("tenant_table").unwrap()].encode_utf16().count();
|
||||
|
||||
assert_eq!(
|
||||
find_statement_at_cursor_for_database(sql, cursor, DatabaseType::Postgres),
|
||||
"SELECT count(*) FROM tenant_table"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_current_statement_strips_other_leading_block_comments() {
|
||||
for comment in ["/* ordinary */", "/*unknown*/", "/* proxy */", "/*PROXY*/"] {
|
||||
|
||||
Reference in new issue
Block a user