mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-09-04 05:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: dollar-quoted strings support (#772)

Browse source 
* feat: support dollar-quoted strings

* remove comment

* unused code

* removed debugging

* added tests

* fmt

* clippy

* updated tests
This commit is contained in:
Alex Vasilev 2022-12-29 15:52:17 +03:00 • committed by GitHub
parent 0c9ec40082
commit 072ccc0d76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 210 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/parser.rs
View file

@ -778,6 +778,7 @@ impl<'a> Parser<'a> {
Token::Number(_, _)
| Token::SingleQuotedString(_)
| Token::DoubleQuotedString(_)
| Token::DollarQuotedString(_)
| Token::NationalStringLiteral(_)
| Token::HexStringLiteral(_) => {
self.prev_token();
@ -4104,6 +4105,7 @@ impl<'a> Parser<'a> {
},
Token::SingleQuotedString(ref s) => Ok(Value::SingleQuotedString(s.to_string())),
Token::DoubleQuotedString(ref s) => Ok(Value::DoubleQuotedString(s.to_string())),
Token::DollarQuotedString(ref s) => Ok(Value::DollarQuotedString(s.clone())),
Token::NationalStringLiteral(ref s) => Ok(Value::NationalStringLiteral(s.to_string())),
Token::EscapedStringLiteral(ref s) => Ok(Value::EscapedStringLiteral(s.to_string())),
Token::HexStringLiteral(ref s) => Ok(Value::HexStringLiteral(s.to_string())),
@ -4148,24 +4150,9 @@ impl<'a> Parser<'a> {
pub fn parse_function_definition(&mut self) -> Result<FunctionDefinition, ParserError> {
let peek_token = self.peek_token();
match peek_token.token {
Token::DoubleDollarQuoting if dialect_of!(self is PostgreSqlDialect) => {
Token::DollarQuotedString(value) if dialect_of!(self is PostgreSqlDialect) => {
self.next_token();
let mut func_desc = String::new();
loop {
if let Some(next_token) = self.next_token_no_skip() {
match &next_token.token {
Token::DoubleDollarQuoting => break,
Token::EOF => {
return self.expected(
"literal string",
TokenWithLocation::wrap(Token::EOF),
);
}
token => func_desc.push_str(token.to_string().as_str()),
}
}
}
Ok(FunctionDefinition::DoubleDollarDef(func_desc))
Ok(FunctionDefinition::DoubleDollarDef(value.value))
}
_ => Ok(FunctionDefinition::SingleQuotedDef(
self.parse_literal_string()?,
@ -4712,7 +4699,7 @@ impl<'a> Parser<'a> {
}
/// Parse a query expression, i.e. a `SELECT` statement optionally
/// preceeded with some `WITH` CTE declarations and optionally followed
/// preceded with some `WITH` CTE declarations and optionally followed
/// by `ORDER BY`. Unlike some other parse_... methods, this one doesn't
/// expect the initial keyword to be already consumed
pub fn parse_query(&mut self) -> Result<Query, ParserError> {