From 2dd2024235605e8c2c4c5fa2c847fd872354a11e Mon Sep 17 00:00:00 2001 From: Eugene Yaroshenko Date: Fri, 26 Apr 2019 14:56:00 +0300 Subject: [PATCH 1/3] Add prepare literal --- examples/parse_select_prepare.rs | 17 +++++++++++++++++ src/dialect/ansi_sql.rs | 4 ++++ src/dialect/generic_sql.rs | 4 ++++ src/dialect/mod.rs | 3 +++ src/dialect/postgresql.rs | 4 ++++ src/sqlparser.rs | 4 ++++ src/sqltokenizer.rs | 21 ++++++++++++++++++++- 7 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 examples/parse_select_prepare.rs diff --git a/examples/parse_select_prepare.rs b/examples/parse_select_prepare.rs new file mode 100644 index 0000000000..64bd6acb20 --- /dev/null +++ b/examples/parse_select_prepare.rs @@ -0,0 +1,17 @@ +extern crate sqlparser; + +use sqlparser::dialect::PostgreSqlDialect; +use sqlparser::sqlparser::*; + +fn main() { + + let sql = "INSERT INTO users \ + (id, type) \ + VALUES \ + ($1, $2)"; + let dialect = PostgreSqlDialect {}; + + let ast = Parser::parse_sql(&dialect, sql.to_string()).unwrap(); + + println!("AST: {:?}", ast); +} diff --git a/src/dialect/ansi_sql.rs b/src/dialect/ansi_sql.rs index 4026cf61cb..ad29ee05bb 100644 --- a/src/dialect/ansi_sql.rs +++ b/src/dialect/ansi_sql.rs @@ -13,4 +13,8 @@ impl Dialect for AnsiSqlDialect { || (ch >= '0' && ch <= '9') || ch == '_' } + + fn is_identifier_start_prepare(&self, ch: char) -> bool { + (ch == ':' || ch == '$') + } } diff --git a/src/dialect/generic_sql.rs b/src/dialect/generic_sql.rs index 54275d69f5..73d35cc9fc 100644 --- a/src/dialect/generic_sql.rs +++ b/src/dialect/generic_sql.rs @@ -13,4 +13,8 @@ impl Dialect for GenericSqlDialect { || ch == '@' || ch == '_' } + + fn is_identifier_start_prepare(&self, ch: char) -> bool { + (ch == ':' || ch == '$') + } } diff --git a/src/dialect/mod.rs b/src/dialect/mod.rs index 95ecf7924c..db01522556 100644 --- a/src/dialect/mod.rs +++ b/src/dialect/mod.rs @@ -20,4 +20,7 @@ pub trait Dialect { fn is_identifier_start(&self, ch: char) -> bool; /// Determine if a character is a valid unquoted identifier character fn is_identifier_part(&self, ch: char) -> bool; + /// Determine whether the character is a valid starting character for the identifier + /// without quotes in the prepared query + fn is_identifier_start_prepare(&self, ch: char) -> bool; } diff --git a/src/dialect/postgresql.rs b/src/dialect/postgresql.rs index 2b64c1f0ac..14bf43d6db 100644 --- a/src/dialect/postgresql.rs +++ b/src/dialect/postgresql.rs @@ -14,4 +14,8 @@ impl Dialect for PostgreSqlDialect { || ch == '@' || ch == '_' } + + fn is_identifier_start_prepare(&self, ch: char) -> bool { + (ch == ':' || ch == '$') + } } diff --git a/src/sqlparser.rs b/src/sqlparser.rs index 624805a141..d5fd54d249 100644 --- a/src/sqlparser.rs +++ b/src/sqlparser.rs @@ -228,6 +228,10 @@ impl Parser { self.expect_token(&Token::RParen)?; Ok(expr) } + Token::Prepare(p) + => { + Ok(ASTNode::SQLValue(Value::SingleQuotedString(p.to_string()))) + } _ => parser_err!(format!( "Did not expect {:?} at the beginning of an expression", t diff --git a/src/sqltokenizer.rs b/src/sqltokenizer.rs index 83105736ce..36adf8ce80 100644 --- a/src/sqltokenizer.rs +++ b/src/sqltokenizer.rs @@ -87,6 +87,8 @@ pub enum Token { LBrace, /// Right brace `}` RBrace, + /// Prepare literal `$`,`:` + Prepare(String), } impl ToString for Token { @@ -122,6 +124,7 @@ impl ToString for Token { Token::Ampersand => "&".to_string(), Token::LBrace => "{".to_string(), Token::RBrace => "}".to_string(), + Token::Prepare(ref p) => p.to_string(), } } } @@ -206,6 +209,17 @@ impl ToString for Whitespace { } } +#[derive(Debug, Clone, PartialEq)] +pub struct Prepare(String); + +impl ToString for Prepare { + fn to_string(&self) -> String { + match self { + Prepare(s) => format!("{}", s), + } + } +} + /// Tokenizer error #[derive(Debug, PartialEq)] pub struct TokenizerError(String); @@ -241,7 +255,7 @@ impl<'a> Tokenizer<'a> { self.line += 1; self.col = 1; } - + Token::Prepare(p) => self.col += p.len() as u64, Token::Whitespace(Whitespace::Tab) => self.col += 4, Token::SQLWord(w) if w.quote_style == None => self.col += w.value.len() as u64, Token::SQLWord(w) if w.quote_style != None => self.col += w.value.len() as u64 + 2, @@ -293,6 +307,11 @@ impl<'a> Tokenizer<'a> { let s = self.tokenize_word(ch, chars); Ok(Some(Token::make_word(&s, None))) } + ch if self.dialect.is_identifier_start_prepare(ch) => { + chars.next(); // consume the first char + let s = self.tokenize_word(ch, chars); + Ok(Some(Token::Prepare(s))) + } // string '\'' => { let s = self.tokenize_single_quoted_string(chars); From dec2440efccbde5788767aec4f1145b5323d001c Mon Sep 17 00:00:00 2001 From: Eugene Yaroshenko Date: Fri, 26 Apr 2019 19:00:57 +0300 Subject: [PATCH 2/3] Remove literal : --- src/dialect/postgresql.rs | 2 +- src/sqltokenizer.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialect/postgresql.rs b/src/dialect/postgresql.rs index 14bf43d6db..7a41228ffe 100644 --- a/src/dialect/postgresql.rs +++ b/src/dialect/postgresql.rs @@ -16,6 +16,6 @@ impl Dialect for PostgreSqlDialect { } fn is_identifier_start_prepare(&self, ch: char) -> bool { - (ch == ':' || ch == '$') + ch == '$' } } diff --git a/src/sqltokenizer.rs b/src/sqltokenizer.rs index 36adf8ce80..b597a0172f 100644 --- a/src/sqltokenizer.rs +++ b/src/sqltokenizer.rs @@ -87,7 +87,7 @@ pub enum Token { LBrace, /// Right brace `}` RBrace, - /// Prepare literal `$`,`:` + /// Prepare literal `$` Prepare(String), } From e87e72161a291dbc87ddf5befdaa8c869ff8df94 Mon Sep 17 00:00:00 2001 From: Eugene Yaroshenko Date: Fri, 26 Apr 2019 19:01:31 +0300 Subject: [PATCH 3/3] Remove literal : --- src/dialect/ansi_sql.rs | 2 +- src/dialect/generic_sql.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialect/ansi_sql.rs b/src/dialect/ansi_sql.rs index ad29ee05bb..3ae0a2aa44 100644 --- a/src/dialect/ansi_sql.rs +++ b/src/dialect/ansi_sql.rs @@ -15,6 +15,6 @@ impl Dialect for AnsiSqlDialect { } fn is_identifier_start_prepare(&self, ch: char) -> bool { - (ch == ':' || ch == '$') + ch == '$' } } diff --git a/src/dialect/generic_sql.rs b/src/dialect/generic_sql.rs index 73d35cc9fc..89884e3271 100644 --- a/src/dialect/generic_sql.rs +++ b/src/dialect/generic_sql.rs @@ -15,6 +15,6 @@ impl Dialect for GenericSqlDialect { } fn is_identifier_start_prepare(&self, ch: char) -> bool { - (ch == ':' || ch == '$') + ch == '$' } }