SGA-3801 Simplified concat logic, refactor names, moved test to common

Author: etgarperets

src/dialect/mod.rs

@@ -478,7 +478,7 @@ pub trait Dialect: Debug + Any {
 
     // Does the Dialect support concatenating of string literal
     // Example: SELECT 'Hello ' "world" => SELECT 'Hello world'
-    fn supports_concat_quoted_identifiers(&self) -> bool {
+    fn supports_string_literal_concatenation(&self) -> bool {
         false
     }
 

src/dialect/mysql.rs

@@ -71,8 +71,8 @@ impl Dialect for MySqlDialect {
         true
     }
 
-    // see <https://dev.mysql.com/doc/refman/8.4/en/string-functions.html#:~:text=mysql%3E%20SELECT%20%27My%27%20%27S%27%20%27QL%27%3B%0A%20%20%20%20%20%20%20%20%2D%3E%20%27MySQL%27>
-    fn supports_concat_quoted_identifiers(&self) -> bool {
+    /// see <https://dev.mysql.com/doc/refman/8.4/en/string-functions.html#function_concat>
+    fn supports_string_literal_concatenation(&self) -> bool {
         true
     }
 

src/parser/mod.rs

@@ -9808,18 +9808,12 @@ impl<'a> Parser<'a> {
             // bigdecimal feature is enabled, and is otherwise a no-op
             // (i.e., it returns the input string).
             Token::Number(n, l) => ok_value(Value::Number(Self::parse(n, span.start)?, l)),
-            Token::SingleQuotedString(ref s) => {
-                if self.dialect.supports_concat_quoted_identifiers() {
-                    return ok_value(Value::SingleQuotedString(self.combine_quoted(next_token)));
-                }
-                ok_value(Value::SingleQuotedString(s.to_string()))
-            }
-            Token::DoubleQuotedString(ref s) => {
-                if self.dialect.supports_concat_quoted_identifiers() {
-                    return ok_value(Value::DoubleQuotedString(self.combine_quoted(next_token)));
-                }
-                ok_value(Value::DoubleQuotedString(s.to_string()))
-            }
+            Token::SingleQuotedString(ref s) => ok_value(Value::SingleQuotedString(
+                self.maybe_concat_string_literal(s.to_string()),
+            )),
+            Token::DoubleQuotedString(ref s) => ok_value(Value::DoubleQuotedString(
+                self.maybe_concat_string_literal(s.to_string()),
+            )),
             Token::TripleSingleQuotedString(ref s) => {
                 ok_value(Value::TripleSingleQuotedString(s.to_string()))
             }
@@ -9889,33 +9883,16 @@ impl<'a> Parser<'a> {
         }
     }
 
-    fn is_quoted_string(&self, token: &Token) -> bool {
-        matches!(
-            token,
-            Token::SingleQuotedString(_) | Token::DoubleQuotedString(_)
-        )
-    }
-
-    fn get_quoted_string(&self, token: &Token) -> String {
-        match token {
-            Token::SingleQuotedString(s) => s.clone(),
-            Token::DoubleQuotedString(s) => s.clone(),
-            _ => String::new(),
-        }
-    }
-
-    fn combine_quoted(&mut self, token: TokenWithSpan) -> String {
-        let mut combined_string = self.get_quoted_string(&token.token);
-        loop {
-            let next_token = self.next_token();
-            if !self.is_quoted_string(&next_token.token) {
-                self.prev_token();
-                break;
+    fn maybe_concat_string_literal(&mut self, mut str: String) -> String {
+        if self.dialect.supports_string_literal_concatenation() {
+            while let Token::SingleQuotedString(ref s) | Token::DoubleQuotedString(ref s) =
+                self.peek_token_ref().token
+            {
+                str.push_str(s.clone().as_str());
+                self.advance_token();
             }
-            let s = self.get_quoted_string(&next_token.token);
-            combined_string.push_str(&s);
         }
-        combined_string
+        str
     }
 
     /// Parse an unsigned numeric literal

tests/sqlparser_common.rs

@@ -17027,3 +17027,13 @@ fn test_parse_semantic_view_table_factor() {
         _ => panic!("Expected Query statement"),
     }
 }
+
+#[test]
+fn parse_adjacent_string_literal_concatenation() {
+    let sql = r#"SELECT 'M' "y" 'S' "q" 'l'"#;
+    let dialects = all_dialects_where(|d| d.supports_string_literal_concatenation());
+    dialects.one_statement_parses_to(sql, r"SELECT 'MySql'");
+
+    let sql = "SELECT * FROM t WHERE col = 'Hello' \n ' ' \t 'World!'";
+    dialects.one_statement_parses_to(sql, r"SELECT * FROM t WHERE col = 'Hello World!'");
+}

tests/sqlparser_mysql.rs

@@ -4247,12 +4247,3 @@ fn test_create_index_options() {
         "CREATE INDEX idx_name ON t(c1, c2) USING BTREE LOCK = EXCLUSIVE ALGORITHM = DEFAULT",
     );
 }
-
-#[test]
-fn parse_adjacent_string_literal_concatenation() {
-    let sql = r#"SELECT 'M' "y" 'S' "q" 'l'"#;
-    mysql().one_statement_parses_to(sql, r"SELECT 'MySql'");
-
-    let sql = "SELECT * FROM t WHERE col = 'Hello' \n ' ' \t 'World!'";
-    mysql().one_statement_parses_to(sql, r"SELECT * FROM t WHERE col = 'Hello World!'");
-}