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.

Sign up for GitHub

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

feat(query): add identifier function from session variable #16264

Merged
merged 10 commits into from
Aug 17, 2024
Merged

feat(query): add identifier function from session variable #16264

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8269e05
feat(query): add identifier function from session variable
sundy-li Aug 16, 2024
d8eeaed
feat(query): add identifier function from session variable
sundy-li Aug 16, 2024
928e766
feat(query): add identifier function from session variable
sundy-li Aug 16, 2024
422ec1b
fix parsing hole and improve error report
andylokandy Aug 16, 2024
96690f7
update
sundy-li Aug 16, 2024
a26f1a1
update
sundy-li Aug 16, 2024
e010978
update
sundy-li Aug 16, 2024
e914c8b
update
sundy-li Aug 17, 2024
ddd785b
Merge branch 'main' into set-variable2
sundy-li Aug 17, 2024
2e85937
update
sundy-li Aug 17, 2024
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
5 changes: 5 additions & 0 deletions src/query/ast/src/ast/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ pub struct Identifier {
pub name: String,
pub quote: Option<char>,
pub is_hole: bool,
pub is_variable: bool,
}

impl Identifier {
Expand All @@ -43,6 +44,7 @@ impl Identifier {
name: name.into(),
quote: None,
is_hole: false,
is_variable: false,
}
}

Expand All @@ -52,6 +54,7 @@ impl Identifier {
name: name.into(),
quote,
is_hole: false,
is_variable: false,
}
}
}
Expand All @@ -60,6 +63,8 @@ impl Display for Identifier {
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
if self.is_hole {
write!(f, "IDENTIFIER(:{})", self.name)
} else if self.is_variable {
write!(f, "IDENTIFIER(${})", self.name)
} else if let Some(quote) = self.quote {
write!(f, "{}", QuotedIdent(&self.name, quote))
} else {
Expand Down
19 changes: 19 additions & 0 deletions src/query/ast/src/parser/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ fn plain_identifier(
name: token.text().to_string(),
quote: None,
is_hole: false,
is_variable: false,
},
)(i)
}
Expand All @@ -153,6 +154,7 @@ fn quoted_identifier(i: Input) -> IResult<Identifier> {
name: ident,
quote: Some(quote),
is_hole: false,
is_variable: false,
}))
} else {
Err(nom::Err::Error(Error::from_error_kind(
Expand All @@ -173,17 +175,34 @@ fn identifier_hole(i: Input) -> IResult<Identifier> {
name,
quote: None,
is_hole: true,
is_variable: false,
},
))(i)
}

fn identifier_variable(i: Input) -> IResult<Identifier> {
map(
rule! {
IDENTIFIER ~ ^"(" ~ ^#variable_ident ~ ^")"
},
|(_, _, t, _)| Identifier {
span: t.span,
name: t.name,
quote: t.quote,
is_hole: false,
is_variable: true,
},
)(i)
}

fn non_reserved_identifier(
is_reserved_keyword: fn(&TokenKind) -> bool,
) -> impl FnMut(Input) -> IResult<Identifier> {
move |i| {
rule!(
#plain_identifier(is_reserved_keyword)
| #quoted_identifier
| #identifier_variable
| #identifier_hole
)(i)
}
Expand Down
1 change: 1 addition & 0 deletions src/query/ast/tests/it/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ fn test_statement() {
r#"SHOW GRANTS OF SHARE t;"#,
r#"UPDATE db1.tb1 set a = a + 1, b = 2 WHERE c > 3;"#,
r#"select $abc + 3"#,
r#"select IDENTIFIER($abc)"#,
r#"SET max_threads = 10;"#,
r#"SET max_threads = 10*2;"#,
r#"SET global (max_threads, max_memory_usage) = (10*2, 10*4);"#,
Expand Down
31 changes: 31 additions & 0 deletions src/query/ast/tests/it/testdata/dialect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ColumnRef {
'"',
),
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -63,6 +64,7 @@ ColumnRef {
'`',
),
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -166,6 +168,7 @@ ColumnRef {
'"',
),
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -194,6 +197,7 @@ ColumnRef {
'"',
),
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -222,6 +226,7 @@ ColumnRef {
'"',
),
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -263,6 +268,7 @@ ColumnRef {
'"',
),
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -321,6 +327,7 @@ ColumnRef {
'`',
),
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -497,6 +504,7 @@ ColumnRef {
name: "a",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand All @@ -521,6 +529,7 @@ FunctionCall {
name: "add",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
ColumnRef {
Expand All @@ -538,6 +547,7 @@ FunctionCall {
name: "a",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand All @@ -557,6 +567,7 @@ FunctionCall {
name: "b",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -587,6 +598,7 @@ FunctionCall {
name: "add",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
FunctionCall {
Expand All @@ -602,6 +614,7 @@ FunctionCall {
name: "sub",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
ColumnRef {
Expand All @@ -619,6 +632,7 @@ FunctionCall {
name: "a",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand All @@ -638,6 +652,7 @@ FunctionCall {
name: "b",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand All @@ -663,6 +678,7 @@ FunctionCall {
name: "e",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -693,6 +709,7 @@ FunctionCall {
name: "add",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
FunctionCall {
Expand All @@ -708,6 +725,7 @@ FunctionCall {
name: "sub",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
ColumnRef {
Expand All @@ -725,6 +743,7 @@ FunctionCall {
name: "a",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand All @@ -744,6 +763,7 @@ FunctionCall {
name: "b",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand All @@ -769,6 +789,7 @@ FunctionCall {
name: "e",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -831,6 +852,7 @@ BinaryOp {
name: "k1",
quote: None,
is_hole: false,
is_variable: false,
},
},
},
Expand All @@ -855,6 +877,7 @@ FunctionCall {
name: "plus",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
Literal {
Expand Down Expand Up @@ -899,6 +922,7 @@ FunctionCall {
name: "add",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
Literal {
Expand Down Expand Up @@ -941,6 +965,7 @@ FunctionCall {
name: "k1",
quote: None,
is_hole: false,
is_variable: false,
},
},
},
Expand Down Expand Up @@ -970,6 +995,7 @@ FunctionCall {
name: "array_map",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
FunctionCall {
Expand All @@ -985,6 +1011,7 @@ FunctionCall {
name: "array_filter",
quote: None,
is_hole: false,
is_variable: false,
},
args: [
Array {
Expand Down Expand Up @@ -1031,6 +1058,7 @@ FunctionCall {
name: "x",
quote: None,
is_hole: false,
is_variable: false,
},
],
expr: BinaryOp {
Expand Down Expand Up @@ -1058,6 +1086,7 @@ FunctionCall {
name: "x",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand Down Expand Up @@ -1097,6 +1126,7 @@ FunctionCall {
name: "x",
quote: None,
is_hole: false,
is_variable: false,
},
],
expr: BinaryOp {
Expand All @@ -1119,6 +1149,7 @@ FunctionCall {
name: "x",
quote: None,
is_hole: false,
is_variable: false,
},
),
},
Expand Down
Loading
Loading