fix(grid): support MySQL string-quoted editable aliases

Closes #6059
This commit is contained in:
t8y2 committed 2026-08-13 03:51:17 +00:00
1 parent 982778128e
commit 3acaf6f16a
3 files changed
+163 -8

No files matched your search

+93 -2
View File
@@ -373,7 +373,7 @@ fn parse_expression_alias(column: &str) -> Option<ExpressionAlias> {
continue;
}
let alias_text = after_as.trim();
let alias = read_identifier(alias_text, 0)?;
let alias = read_select_alias(alias_text)?;
if alias.end != alias_text.len() {
continue;
}
@@ -383,6 +383,21 @@ fn parse_expression_alias(column: &str) -> Option<ExpressionAlias> {
}
return Some(ExpressionAlias { expression, result_name: alias.value });
}
for (index, _) in trimmed_end.match_indices('\'') {
if !previous_char(trimmed_end, index).is_some_and(char::is_whitespace) {
continue;
}
let alias = read_select_alias(&trimmed_end[index..])?;
if alias.end != trimmed_end.len() - index {
continue;
}
let expression = trimmed_end[..index].trim().to_string();
if expression.is_empty() {
return None;
}
return Some(ExpressionAlias { expression, result_name: alias.value });
}
None
}
@@ -392,13 +407,36 @@ fn parse_column_alias(rest: &str) -> Option<Option<String>> {
return Some(None);
}
let alias_text = strip_leading_as(trimmed).unwrap_or(trimmed).trim();
let alias = read_identifier(alias_text, 0)?;
let alias = read_select_alias(alias_text)?;
if alias.end != alias_text.len() {
return None;
}
Some(Some(alias.value))
}
fn read_select_alias(text: &str) -> Option<Identifier> {
let pos = skip_whitespace(text, 0);
if !text[pos..].starts_with('\'') {
return read_identifier(text, pos);
}
let mut value = String::new();
let mut chars = text[pos + 1..].char_indices().peekable();
while let Some((offset, ch)) = chars.next() {
if ch != '\'' {
value.push(ch);
continue;
}
if chars.peek().is_some_and(|(_, next)| *next == '\'') {
chars.next();
value.push('\'');
continue;
}
return Some(Identifier { value, quoted: true, end: pos + 1 + offset + ch.len_utf8() });
}
None
}
fn strip_leading_as(text: &str) -> Option<&str> {
let prefix = text.get(..2)?;
if !prefix.eq_ignore_ascii_case("AS") {
@@ -1175,6 +1213,59 @@ mod tests {
);
}
#[test]
fn accepts_mysql_string_quoted_column_aliases() {
for (sql, result_name) in [
("SELECT id, report_type '计划类型' FROM biz_work_log", "计划类型"),
("SELECT id, report_type AS '计划类型' FROM biz_work_log", "计划类型"),
("SELECT id, report_type '计划''类型' FROM biz_work_log", "计划'类型"),
("SELECT id, report_type AS '计划''类型' FROM biz_work_log", "计划'类型"),
] {
let result = analyze_editable_query_editability(sql);
assert!(result.editable, "{sql}: {:?}", result.reason);
assert_eq!(
result.analysis.unwrap().columns,
vec![
column(Some("id"), false, None, None, "id", "id"),
column(Some("report_type"), false, None, None, result_name, "report_type"),
],
"{sql}"
);
}
}
#[test]
fn keeps_string_literals_computed_and_rejects_malformed_string_aliases() {
for sql in [
"SELECT id, report_type '计划类型 FROM biz_work_log",
"SELECT id, report_type '计划类型' trailing FROM biz_work_log",
] {
let result = analyze_editable_query_editability(sql);
assert!(!result.editable, "{sql}");
}
for sql in
["SELECT id, 'constant' '固定值' FROM biz_work_log", "SELECT id, 'constant' AS '固定值' FROM biz_work_log"]
{
let computed = analyze_editable_query_editability(sql);
assert!(computed.editable, "{sql}");
assert_eq!(
computed.analysis.unwrap().columns[1],
column(None, false, None, None, "固定值", "'constant'"),
"{sql}"
);
}
for sql in [
"SELECT id, report_type AS 计划类型 FROM biz_work_log",
"SELECT id, report_type AS `计划类型` FROM biz_work_log",
"SELECT id, report_type AS \"计划类型\" FROM biz_work_log",
] {
assert!(analyze_editable_query_editability(sql).editable, "{sql}");
}
}
#[test]
fn serializes_reason_values_like_frontend_union() {
let json = serde_json::to_value(not_editable(QueryEditabilityReason::SetOperation)).unwrap();