Skip to content

Commit 58953d5

Browse files
committed
fix(syntax): accept documented EXECUTE IMMEDIATE sources and keep DEFINE in DEFINE text
EXECUTE IMMEDIATE takes a :bound variable and a || concatenation of strings and variables, as Snowflake documents. A DEFINE kept as text now says DEFINE rather than CREATE, and SHOW SERVICES reads OF TYPE as a list after LIMIT, where the documented grammar places it.
1 parent 41746b4 commit 58953d5

3 files changed

Lines changed: 75 additions & 34 deletions

File tree

‎crates/sqlquack-syntax-snowflake/src/parser/_helpers/ddl/snowflake_commands.rs‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use sqlquack_syntax::expressions::schema_objects::models::ExecuteObject;
1111
use sqlquack_syntax::expressions::schema_objects::models::ObjectProperty;
1212
use sqlquack_syntax::expressions::statements::models::CreateTask;
1313
use sqlquack_syntax::expressions::statements::models::ExecuteUsingPolicyContext;
14+
use sqlquack_syntax::expressions::statements::models::Raw;
1415
use sqlquack_syntax::expressions::tree::models::Expression;
1516
use sqlquack_syntax::expressions::types::models::Tuple;
1617
use sqlquack_syntax::tokens::models::TokenType;
@@ -29,30 +30,42 @@ impl Parser {
2930
checked
3031
}
3132

32-
fn check_execute_immediate_parts(&mut self) -> Result<()> {
33-
self.skip();
34-
let from = self.match_token(TokenType::From);
35-
if from {
36-
if !self.check(TokenType::String) && !self.is_stage_path() {
37-
return Err(self.parse_error("Expected a stage path or a string"));
38-
}
39-
self.parse_location_value()?;
40-
} else if self.check(TokenType::Dollar) {
33+
/// One part of the text EXECUTE IMMEDIATE runs: a string, a `$session` or `:bound` variable, or a variable's name.
34+
fn check_execute_operand(&mut self) -> Result<()> {
35+
if self.check(TokenType::Dollar) || self.check(TokenType::Colon) {
4136
let end = self.peek().span.end;
4237
self.skip();
4338
if !self.is_identifier_token() || self.peek().span.start != end {
44-
return Err(self.parse_error("Expected a session variable's name"));
39+
return Err(self.parse_error("Expected a variable's name"));
4540
}
4641
self.skip();
47-
} else if self.check(TokenType::String)
42+
return Ok(());
43+
}
44+
if self.check(TokenType::String)
4845
|| self.check(TokenType::DollarString)
4946
|| (self.is_identifier_token()
5047
&& !self.is_snowflake_reserved_keyword()
5148
&& !self.peek_text().starts_with('@'))
5249
{
5350
self.skip();
51+
return Ok(());
52+
}
53+
Err(self.parse_error("Expected the statement to execute"))
54+
}
55+
56+
fn check_execute_immediate_parts(&mut self) -> Result<()> {
57+
self.skip();
58+
let from = self.match_token(TokenType::From);
59+
if from {
60+
if !self.check(TokenType::String) && !self.is_stage_path() {
61+
return Err(self.parse_error("Expected a stage path or a string"));
62+
}
63+
self.parse_location_value()?;
5464
} else {
55-
return Err(self.parse_error("Expected the statement to execute"));
65+
self.check_execute_operand()?;
66+
while self.match_token(TokenType::DPipe) {
67+
self.check_execute_operand()?;
68+
}
5669
}
5770
if self.match_token(TokenType::Using) {
5871
self.expect_token(TokenType::LParen)?;
@@ -481,8 +494,11 @@ impl Parser {
481494
.any(|words| self.check_text_seq(words));
482495
self.current = start;
483496
let definition = self.parse_create()?;
484-
if opaque_kind && matches!(definition, Expression::Raw(_)) {
485-
return Ok(definition);
497+
if let (true, Expression::Raw(raw)) = (opaque_kind, &definition) {
498+
let text = raw.sql.strip_prefix("CREATE").unwrap_or(&raw.sql);
499+
return Ok(Expression::Raw(Raw {
500+
sql: format!("DEFINE{text}"),
501+
}));
486502
}
487503
if matches!(&definition, Expression::CreateObject(create) if matches!(create.kind.as_str(), "FILE FORMAT") && create.modifier.is_some())
488504
{

‎crates/sqlquack-syntax-snowflake/src/parser/_helpers/ddl/snowflake_show.rs‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ impl Parser {
4848
show.target = target;
4949
show.terse = terse;
5050
show.history = self.match_identifier("HISTORY");
51-
if matches!(kind.as_str(), "SERVICES") {
52-
show = self.parse_show_services_filters(show)?;
51+
if matches!(kind.as_str(), "SERVICES") && self.match_text_seq(&["EXCLUDE", "JOBS"]) {
52+
show.this.push_str(" EXCLUDE JOBS");
5353
}
5454
if matches!(kind.as_str(), "OPENFLOW DATA PLANE INTEGRATIONS") {
5555
return Ok(Some(Expression::Show(Box::new(show))));
@@ -130,22 +130,7 @@ impl Parser {
130130
Ok(Some(Expression::Show(Box::new(show))))
131131
}
132132

133-
/// `[ EXCLUDE JOBS ] [ OF TYPE <type> ]` after SHOW SERVICES, kept in the kind as written.
134-
fn parse_show_services_filters(&mut self, mut show: Show) -> Result<Show> {
135-
if self.match_text_seq(&["EXCLUDE", "JOBS"]) {
136-
show.this.push_str(" EXCLUDE JOBS");
137-
}
138-
if self.match_text_seq(&["OF", "TYPE"]) {
139-
if !(self.is_identifier_token() || self.check_keyword()) {
140-
return Err(self.parse_error("Expected a service type after OF TYPE"));
141-
}
142-
let service_type = self.advance_text()?.to_ascii_uppercase();
143-
show.this = format!("{} OF TYPE {service_type}", show.this);
144-
}
145-
Ok(show)
146-
}
147-
148-
/// `[ STARTS WITH '<prefix>' ]`, then ROOT ONLY for tasks, then `[ LIMIT <rows> [ FROM '<name>' ] ]`.
133+
/// `[ STARTS WITH '<prefix>' ]`, then ROOT ONLY for tasks, then `[ LIMIT <rows> [ FROM '<name>' ] ]`, then a service list's `OF TYPE <type> [ , ... ]`.
149134
fn parse_show_starts_and_limit(&mut self, kind: &str, mut show: Show) -> Result<Show> {
150135
if self.match_identifier("STARTS") {
151136
self.expect_token(TokenType::With)?;
@@ -167,6 +152,20 @@ impl Parser {
167152
show.from = Some(self.parse_show_string("FROM")?);
168153
}
169154
}
155+
if matches!(kind, "SERVICES") && self.match_text_seq(&["OF", "TYPE"]) {
156+
show.this.push_str(" OF TYPE ");
157+
loop {
158+
if !(self.is_identifier_token() || self.check_keyword()) {
159+
return Err(self.parse_error("Expected a service type after OF TYPE"));
160+
}
161+
show.this
162+
.push_str(&self.advance_text()?.to_ascii_uppercase());
163+
if !self.match_token(TokenType::Comma) {
164+
break;
165+
}
166+
show.this.push_str(", ");
167+
}
168+
}
170169
Ok(show)
171170
}
172171

‎crates/sqlquack-syntax-snowflake/tests/parser/test_snowflake_receipted_objects.rs‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,21 @@ fn given_a_snowflake_ai_function_when_parsing_then_recorded_verdicts_hold() {
150150
#[test]
151151
fn given_a_snowflake_execute_immediate_when_parsing_then_recorded_verdicts_hold() {
152152
let test_cases = [
153+
SnowflakeVerdictTestCase {
154+
description: "a bound variable is a source, as Snowflake documents",
155+
sql: "BEGIN EXECUTE IMMEDIATE :q USING ( v1 ) ; END ;",
156+
expected_kind: Some("scripting_block"),
157+
},
158+
SnowflakeVerdictTestCase {
159+
description: "a source may concatenate strings and variables, as Snowflake documents",
160+
sql: "EXECUTE IMMEDIATE v2 || ',(80)' || ',(84)' ;",
161+
expected_kind: Some("command"),
162+
},
163+
SnowflakeVerdictTestCase {
164+
description: "a concatenation needs its right operand",
165+
sql: "EXECUTE IMMEDIATE v2 || ;",
166+
expected_kind: None,
167+
},
153168
SnowflakeVerdictTestCase {
154169
description: "a session variable with bind variables (recorded semantic error)",
155170
sql: "EXECUTE IMMEDIATE $v1 USING ( v1 , v1 ) ;",
@@ -408,6 +423,11 @@ fn given_a_snowflake_show_services_when_parsing_then_recorded_verdicts_hold() {
408423
sql: "SHOW SERVICES EXCLUDE JOBS LIKE 'm' IN COMPUTE POOL v1 STARTS WITH 'm' LIMIT 1 FROM 'm' ;",
409424
expected_kind: Some("show"),
410425
},
426+
SnowflakeVerdictTestCase {
427+
description: "OF TYPE comes last, after the documented clauses",
428+
sql: "SHOW SERVICES LIKE 'm' IN COMPUTE POOL v1 OF TYPE USER ;",
429+
expected_kind: Some("show"),
430+
},
411431
SnowflakeVerdictTestCase {
412432
description: "OF TYPE needs a type (recorded errno 1003)",
413433
sql: "SHOW SERVICES OF TYPE ;",
@@ -623,6 +643,12 @@ fn given_a_snowflake_external_agent_or_filtered_show_when_parsing_then_the_tree_
623643
pointer: "/0/raw/sql",
624644
expected_value: json!("CREATE EXTERNAL AGENT v1 WITH VERSION v1"),
625645
},
646+
StatementTestCase {
647+
description: "a DEFINE kept as text says DEFINE",
648+
sql: "DEFINE CODE BUNDLE v1 . v1 . v1 FROM 'asset://a1/' ;",
649+
pointer: "/0/raw/sql",
650+
expected_value: json!("DEFINE CODE BUNDLE v1 . v1 . v1 FROM 'asset://a1/'"),
651+
},
626652
StatementTestCase {
627653
description: "SHOW TASKS keeps ROOT ONLY in its kind",
628654
sql: "SHOW TASKS STARTS WITH 'm' ROOT ONLY ;",
@@ -631,9 +657,9 @@ fn given_a_snowflake_external_agent_or_filtered_show_when_parsing_then_the_tree_
631657
},
632658
StatementTestCase {
633659
description: "SHOW SERVICES keeps its filters in its kind",
634-
sql: "SHOW SERVICES EXCLUDE JOBS OF TYPE USER IN COMPUTE POOL v1 ;",
660+
sql: "SHOW SERVICES EXCLUDE JOBS IN COMPUTE POOL v1 LIMIT 1 OF TYPE USER , JOB ;",
635661
pointer: "/0/show/this",
636-
expected_value: json!("SERVICES EXCLUDE JOBS OF TYPE USER"),
662+
expected_value: json!("SERVICES EXCLUDE JOBS OF TYPE USER, JOB"),
637663
},
638664
];
639665
for test_case in test_cases {

0 commit comments

Comments
 (0)