diff --git a/src/parser/mod.rs b/src/parser/mod.rs index f6f0a6cd74..5bdc75c877 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -13391,11 +13391,11 @@ impl<'a> Parser<'a> { // without any whitespace in between let next_token = self.next_token_no_skip().unwrap_or(&EOF_TOKEN).clone(); let ident = match next_token.token { - Token::Word(w) if w.quote_style.is_none() => Ok(w.into_ident(next_token.span)), + Token::Word(w) => Ok(w.into_ident(next_token.span)), Token::Number(w, false) => Ok(Ident::with_span(next_token.span, w)), _ => self.expected("placeholder", next_token), }?; - Ok(Value::Placeholder(format!("{tok}{}", ident.value)) + Ok(Value::Placeholder(format!("{tok}{ident}")) .with_span(Span::new(span.start, ident.span.end))) } unexpected => self.expected( diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index cf1547f1b0..ed98144968 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -21938,45 +21938,36 @@ fn parse_compound_field_access_numeric_display() { } #[test] -fn parse_placeholder_disallows_quoted_ident() { +fn parse_quoted_placeholders_roundtrip() { let dialects = TestedDialects::new(vec![ Box::new(AnsiDialect {}), Box::new(GenericDialect {}), Box::new(SnowflakeDialect {}), Box::new(SQLiteDialect {}), ]); - // Valid placeholders roundtrip - dialects.verified_stmt("SELECT :x"); - - // Quoted identifiers are not valid placeholders - let err = dialects.parse_sql_statements("SELECT :`a`").unwrap_err(); - assert_eq!( - ParserError::ParserError("Expected: placeholder, found: `a`".to_string()), - err - ); - let err = dialects.parse_sql_statements("SELECT :\"a\"").unwrap_err(); - assert_eq!( - ParserError::ParserError("Expected: placeholder, found: \"a\"".to_string()), - err - ); - let err = dialects.parse_sql_statements("SELECT:` a` a").unwrap_err(); + for sql in [ + "SELECT :x", + "SELECT :`a`", + r#"SELECT :"a""#, + "SELECT :` a` AS a", + r#"SELECT :"a b c", :"a""b""#, + ] { + dialects.verified_stmt(sql); + } + let select = dialects.verified_only_select(r#"SELECT :"a b c""#); assert_eq!( - ParserError::ParserError("Expected: placeholder, found: ` a`".to_string()), - err + expr_from_projection(only(&select.projection)), + &Expr::value(Value::Placeholder(r#":"a b c""#.to_string())) ); - let ansi = TestedDialects::new(vec![Box::new(AnsiDialect {})]); - ansi.verified_stmt("SELECT @x"); - let err = ansi.parse_sql_statements("SELECT @`a`").unwrap_err(); - assert_eq!( - ParserError::ParserError("Expected: placeholder, found: `a`".to_string()), - err - ); - let err = ansi.parse_sql_statements("SELECT @\"a\"").unwrap_err(); - assert_eq!( - ParserError::ParserError("Expected: placeholder, found: \"a\"".to_string()), - err - ); + for sql in [ + "SELECT @x", + "SELECT @`a`", + r#"SELECT @"a""#, + r#"SELECT @"a b c""#, + ] { + ansi.verified_stmt(sql); + } } #[test]