From c7dbb5aa50480504f28630693803cb47bf7b90a4 Mon Sep 17 00:00:00 2001 From: jonathanlehto Date: Thu, 29 Feb 2024 10:07:57 -0500 Subject: [PATCH 1/3] adding execute_using --- src/ast/mod.rs | 9 ++++++--- src/parser/mod.rs | 11 ++++++++++- tests/sqlparser_postgres.rs | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/ast/mod.rs b/src/ast/mod.rs index a2c28c810e..57808b0908 100644 --- a/src/ast/mod.rs +++ b/src/ast/mod.rs @@ -2158,11 +2158,11 @@ pub enum Statement { /// Note: this is a PostgreSQL-specific statement. Deallocate { name: Ident, prepare: bool }, /// ```sql - /// EXECUTE name [ ( parameter [, ...] ) ] + /// EXECUTE name [ ( parameter [, ...] ) ] [USING ] /// ``` /// /// Note: this is a PostgreSQL-specific statement. - Execute { name: Ident, parameters: Vec }, + Execute { name: Ident, parameters: Vec, using: Vec }, /// ```sql /// PREPARE name [ ( data_type [, ...] ) ] AS statement /// ``` @@ -3574,11 +3574,14 @@ impl fmt::Display for Statement { prepare = if *prepare { "PREPARE " } else { "" }, name = name, ), - Statement::Execute { name, parameters } => { + Statement::Execute { name, parameters, using } => { write!(f, "EXECUTE {name}")?; if !parameters.is_empty() { write!(f, "({})", display_comma_separated(parameters))?; } + if using.len() > 0 { + write!(f, " USING {}", display_comma_separated(using))?; + }; Ok(()) } Statement::Prepare { diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 36ac2fd28c..1fce97f1e2 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -8600,7 +8600,16 @@ impl<'a> Parser<'a> { self.expect_token(&Token::RParen)?; } - Ok(Statement::Execute { name, parameters }) + let mut using = vec![]; + if self.parse_keyword(Keyword::USING) { + using.push(self.parse_expr()?); + + while self.consume_token(&Token::Comma) { + using.push(self.parse_expr()?); + } + }; + + Ok(Statement::Execute { name, parameters, using }) } pub fn parse_prepare(&mut self) -> Result { diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs index 45a3dbed26..9faf614afa 100644 --- a/tests/sqlparser_postgres.rs +++ b/tests/sqlparser_postgres.rs @@ -1420,6 +1420,7 @@ fn parse_execute() { Statement::Execute { name: "a".into(), parameters: vec![], + using: vec![] } ); @@ -1432,6 +1433,28 @@ fn parse_execute() { Expr::Value(number("1")), Expr::Value(Value::SingleQuotedString("t".to_string())) ], + using: vec![] + } + ); + + let stmt = pg_and_generic().verified_stmt("EXECUTE a USING CAST(1337 AS SMALLINT), CAST(7331 AS SMALLINT)"); + assert_eq!( + stmt, + Statement::Execute { + name: "a".into(), + parameters: vec![], + using: vec![ + Expr::Cast { + expr: Box::new(Expr::Value(Value::Number("1337".parse().unwrap(), false))), + data_type: DataType::SmallInt(None), + format: None + }, + Expr::Cast { + expr: Box::new(Expr::Value(Value::Number("7331".parse().unwrap(), false))), + data_type: DataType::SmallInt(None), + format: None + }, + ] } ); } From 37b7542212e649de5b0739ac9255725eb57150e6 Mon Sep 17 00:00:00 2001 From: jonathanlehto Date: Thu, 29 Feb 2024 16:06:17 -0500 Subject: [PATCH 2/3] fixing lint and codestyle --- src/ast/mod.rs | 14 +++++++++++--- src/parser/mod.rs | 6 +++++- tests/sqlparser_postgres.rs | 3 ++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/ast/mod.rs b/src/ast/mod.rs index 57808b0908..dec2a50622 100644 --- a/src/ast/mod.rs +++ b/src/ast/mod.rs @@ -2162,7 +2162,11 @@ pub enum Statement { /// ``` /// /// Note: this is a PostgreSQL-specific statement. - Execute { name: Ident, parameters: Vec, using: Vec }, + Execute { + name: Ident, + parameters: Vec, + using: Vec, + }, /// ```sql /// PREPARE name [ ( data_type [, ...] ) ] AS statement /// ``` @@ -3574,12 +3578,16 @@ impl fmt::Display for Statement { prepare = if *prepare { "PREPARE " } else { "" }, name = name, ), - Statement::Execute { name, parameters, using } => { + Statement::Execute { + name, + parameters, + using, + } => { write!(f, "EXECUTE {name}")?; if !parameters.is_empty() { write!(f, "({})", display_comma_separated(parameters))?; } - if using.len() > 0 { + if !using.is_empty() { write!(f, " USING {}", display_comma_separated(using))?; }; Ok(()) diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 1fce97f1e2..731fd268e8 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -8609,7 +8609,11 @@ impl<'a> Parser<'a> { } }; - Ok(Statement::Execute { name, parameters, using }) + Ok(Statement::Execute { + name, + parameters, + using + }) } pub fn parse_prepare(&mut self) -> Result { diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs index 9faf614afa..ff3e72135a 100644 --- a/tests/sqlparser_postgres.rs +++ b/tests/sqlparser_postgres.rs @@ -1437,7 +1437,8 @@ fn parse_execute() { } ); - let stmt = pg_and_generic().verified_stmt("EXECUTE a USING CAST(1337 AS SMALLINT), CAST(7331 AS SMALLINT)"); + let stmt = pg_and_generic() + .verified_stmt("EXECUTE a USING CAST(1337 AS SMALLINT), CAST(7331 AS SMALLINT)"); assert_eq!( stmt, Statement::Execute { From 1286e0478f3b66d9dd33baa5f971cd4e40d26a8a Mon Sep 17 00:00:00 2001 From: jonathanlehto Date: Thu, 29 Feb 2024 16:07:42 -0500 Subject: [PATCH 3/3] adding comma --- src/parser/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 731fd268e8..5b1f46c1ac 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -8612,7 +8612,7 @@ impl<'a> Parser<'a> { Ok(Statement::Execute { name, parameters, - using + using, }) }