Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge composite and compound expr test cases #1615

Merged
merged 1 commit into from
Dec 22, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 30 additions & 29 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12389,8 +12389,8 @@ fn parse_create_table_with_bit_types() {
fn parse_composite_access_expr() {
assert_eq!(
verified_expr("f(a).b"),
Expr::CompositeAccess {
expr: Box::new(Expr::Function(Function {
Expr::CompoundFieldAccess {
root: Box::new(Expr::Function(Function {
name: ObjectName(vec![Ident::new("f")]),
uses_odbc_syntax: false,
parameters: FunctionArguments::None,
Expand All @@ -12406,41 +12406,41 @@ fn parse_composite_access_expr() {
over: None,
within_group: vec![]
})),
key: Ident::new("b")
access_chain: vec![AccessExpr::Dot(Expr::Identifier(Ident::new("b")))]
}
);

// Nested Composite Access
assert_eq!(
verified_expr("f(a).b.c"),
Expr::CompositeAccess {
expr: Box::new(Expr::CompositeAccess {
expr: Box::new(Expr::Function(Function {
name: ObjectName(vec![Ident::new("f")]),
uses_odbc_syntax: false,
parameters: FunctionArguments::None,
args: FunctionArguments::List(FunctionArgumentList {
duplicate_treatment: None,
args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
Expr::Identifier(Ident::new("a"))
))],
clauses: vec![],
}),
null_treatment: None,
filter: None,
over: None,
within_group: vec![]
})),
key: Ident::new("b")
}),
key: Ident::new("c")
Expr::CompoundFieldAccess {
root: Box::new(Expr::Function(Function {
name: ObjectName(vec![Ident::new("f")]),
uses_odbc_syntax: false,
parameters: FunctionArguments::None,
args: FunctionArguments::List(FunctionArgumentList {
duplicate_treatment: None,
args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
Expr::Identifier(Ident::new("a"))
))],
clauses: vec![],
}),
null_treatment: None,
filter: None,
over: None,
within_group: vec![]
})),
access_chain: vec![
AccessExpr::Dot(Expr::Identifier(Ident::new("b"))),
AccessExpr::Dot(Expr::Identifier(Ident::new("c"))),
]
}
);

// Composite Access in Select and Where Clauses
let stmt = verified_only_select("SELECT f(a).b FROM t WHERE f(a).b IS NOT NULL");
let expr = Expr::CompositeAccess {
expr: Box::new(Expr::Function(Function {
let expr = Expr::CompoundFieldAccess {
root: Box::new(Expr::Function(Function {
name: ObjectName(vec![Ident::new("f")]),
uses_odbc_syntax: false,
parameters: FunctionArguments::None,
Expand All @@ -12456,14 +12456,15 @@ fn parse_composite_access_expr() {
over: None,
within_group: vec![],
})),
key: Ident::new("b"),
access_chain: vec![AccessExpr::Dot(Expr::Identifier(Ident::new("b")))],
};

assert_eq!(stmt.projection[0], SelectItem::UnnamedExpr(expr.clone()));
assert_eq!(stmt.selection.unwrap(), Expr::IsNotNull(Box::new(expr)));

// Composite Access with quoted identifier
verified_only_select("SELECT f(a).\"an id\"");
// Compound access with quoted identifier.
all_dialects_where(|d| d.is_delimited_identifier_start('"'))
.verified_only_select("SELECT f(a).\"an id\"");

// Composite Access in struct literal
all_dialects_where(|d| d.supports_struct_literal()).verified_stmt(
Expand Down
Loading