fix(query): enable editing multi-table JOIN result sets
This commit is contained in:
16 files changed
+345
-22
No files matched your search
@@ -10323,7 +10323,9 @@ mod tests {
|
||||
// guarded ordinal so composite keys stay aligned.
|
||||
for compat_sql in [postgres_foreign_keys_compat_sql(), postgres_foreign_keys_for_relations_compat_sql()] {
|
||||
assert!(!compat_sql.contains("generate_series(1, array_length"));
|
||||
assert!(compat_sql.contains("JOIN generate_series(1, 32) AS fk(ord) ON fk.ord <= array_length(con.conkey, 1)"));
|
||||
assert!(
|
||||
compat_sql.contains("JOIN generate_series(1, 32) AS fk(ord) ON fk.ord <= array_length(con.conkey, 1)")
|
||||
);
|
||||
assert!(compat_sql.contains("(con.conkey)[fk.ord]"));
|
||||
assert!(compat_sql.contains("(con.confkey)[fk.ord]"));
|
||||
assert!(!compat_sql.contains("LATERAL"));
|
||||
|
||||
@@ -2360,7 +2360,10 @@ mod tests {
|
||||
|
||||
let page_sql = plan.page_sql.expect("pagination plan provides page SQL");
|
||||
assert!(page_sql.to_uppercase().contains("GROUP BY"));
|
||||
assert!(page_sql.contains("ORDER BY 1, 2, 3 LIMIT 500;"), "dedup pagination must be appended after the GROUP BY, got: {page_sql}");
|
||||
assert!(
|
||||
page_sql.contains("ORDER BY 1, 2, 3 LIMIT 500;"),
|
||||
"dedup pagination must be appended after the GROUP BY, got: {page_sql}"
|
||||
);
|
||||
|
||||
let count_sql = plan.count_sql.expect("pagination plan provides count SQL");
|
||||
assert!(count_sql.starts_with("SELECT COUNT(*) AS dbx_total_rows FROM ("));
|
||||
|
||||
@@ -694,7 +694,7 @@ fn is_select_star(body: &str, alias: Option<&str>) -> bool {
|
||||
}
|
||||
|
||||
fn parse_from_sources(body: &str) -> Vec<FromSource> {
|
||||
if body.is_empty() || body.contains('(') || body.contains(')') {
|
||||
if body.is_empty() {
|
||||
return Vec::new();
|
||||
}
|
||||
|
||||
@@ -742,6 +742,9 @@ fn parse_table_source_at(text: &str, start: usize, index: usize) -> Option<(From
|
||||
}
|
||||
let mut end = pos + ident.end;
|
||||
let tail_pos = skip_whitespace(text, end);
|
||||
if text[tail_pos..].starts_with('(') {
|
||||
return None;
|
||||
}
|
||||
let alias = if starts_with_keyword_at(text, tail_pos, "AS") {
|
||||
let alias_ident = read_identifier(text, tail_pos + 2)?;
|
||||
end = alias_ident.end;
|
||||
@@ -1585,3 +1588,25 @@ mod tests {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod joined_predicate_regression {
|
||||
use super::analyze_editable_query_editability;
|
||||
|
||||
#[test]
|
||||
fn parenthesized_join_predicate_preserves_both_sources() {
|
||||
let result = analyze_editable_query_editability("SELECT u.id,u.nickname,p.paper_id,p.paper_name FROM users u JOIN papers p ON (u.id=p.user_id) WHERE u.id=1");
|
||||
assert!(result.editable);
|
||||
assert_eq!(result.analysis.unwrap().sources.unwrap().len(), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn joined_derived_and_function_sources_remain_read_only() {
|
||||
for sql in [
|
||||
"SELECT u.id,p.id FROM users u JOIN (SELECT id FROM papers) p ON u.id=p.id",
|
||||
"SELECT u.id,p.id FROM users u JOIN generate_series(1,2) p ON u.id=p.id",
|
||||
] {
|
||||
assert!(!analyze_editable_query_editability(sql).editable, "{sql}");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user