SGA-11409 Added requested changes from pr request and fixed conflicts and codestyle issues

Author: etgarperets

src/dialect/mysql.rs

@@ -51,7 +51,9 @@ impl Dialect for MySqlDialect {
     }
 
     fn is_identifier_part(&self, ch: char) -> bool {
-        self.is_identifier_start(ch) || ch.is_ascii_digit() || !ch.is_ascii()
+        self.is_identifier_start(ch) || ch.is_ascii_digit() ||
+        // MySQL implements Unicode characters in identifiers.
+        !ch.is_ascii()
     }
 
     fn is_delimited_identifier_start(&self, ch: char) -> bool {

src/dialect/postgresql.rs

@@ -72,7 +72,9 @@ impl Dialect for PostgreSqlDialect {
     }
 
     fn is_identifier_part(&self, ch: char) -> bool {
-        ch.is_alphabetic() || ch.is_ascii_digit() || ch == '$' || ch == '_'  || !ch.is_ascii()
+        ch.is_alphabetic() || ch.is_ascii_digit() || ch == '$' || ch == '_'  ||
+        // PostgreSQL implements Unicode characters in identifiers.
+        !ch.is_ascii()
     }
 
     fn supports_unicode_string_literal(&self) -> bool {

src/dialect/redshift.rs

@@ -88,7 +88,7 @@ impl Dialect for RedshiftSqlDialect {
     fn is_identifier_part(&self, ch: char) -> bool {
         // Extends Postgres dialect with sharp and UTF-8 multibyte chars
         // https://docs.aws.amazon.com/redshift/latest/dg/r_names.html
-        PostgreSqlDialect {}.is_identifier_part(ch) || ch == '#' 
+        PostgreSqlDialect {}.is_identifier_part(ch) || ch == '#'
     }
 
     /// redshift has `CONVERT(type, value)` instead of `CONVERT(value, type)`

tests/sqlparser_common.rs

@@ -16133,10 +16133,14 @@ SELECT * FROM tbl2
     assert_eq!(stmts.len(), 2);
     assert!(stmts.iter().all(|s| matches!(s, Statement::Query { .. })));
 }
-    #[test] 
-    fn test_unicode_support() {
-        let unicode_sql = r#"SELECT phoneǤЖשचᎯ⻩☯♜🦄⚛🀄ᚠ⌛🌀 tbl FROM customers"#;
-        let dialects_supporting_unicode = TestedDialects::new(vec![Box::new(MySqlDialect {}), Box::new(RedshiftSqlDialect {}), Box::new(PostgreSqlDialect {})]);
-        let _ = dialects_supporting_unicode.parse_sql_statements(unicode_sql).unwrap();
-    }
 
+#[test]
+fn test_identifier_unicode_support() {
+    let sql = r#"SELECT phoneǤЖשचᎯ⻩☯♜🦄⚛🀄ᚠ⌛🌀 AS tbl FROM customers"#;
+    let dialects = TestedDialects::new(vec![
+        Box::new(MySqlDialect {}),
+        Box::new(RedshiftSqlDialect {}),
+        Box::new(PostgreSqlDialect {}),
+    ]);
+    let _ = dialects.verified_stmt(sql);
+}