Redshift/PostgreSQL: Parse optional aliases for wildcard select items

Author: yoavcloud

src/dialect/mod.rs

@@ -1556,10 +1556,9 @@ pub trait Dialect: Debug + Any {
     ///
     /// Example:
     /// ```sql
+    /// SELECT t.* alias FROM t
     /// SELECT t.* AS alias FROM t
     /// ```
-    ///
-    /// [Redshift](https://docs.aws.amazon.com/redshift/latest/dg/r_SELECT_list.html)
     fn supports_select_wildcard_with_alias(&self) -> bool {
         false
     }

src/dialect/postgresql.rs

@@ -307,6 +307,10 @@ impl Dialect for PostgreSqlDialect {
         true
     }
 
+    fn supports_select_wildcard_with_alias(&self) -> bool {
+        true
+    }
+
     fn supports_comma_separated_trim(&self) -> bool {
         true
     }

src/parser/mod.rs

@@ -18448,11 +18448,7 @@ impl<'a> Parser<'a> {
         };
 
         let opt_alias = if self.dialect.supports_select_wildcard_with_alias() {
-            if self.parse_keyword(Keyword::AS) {
-                Some(self.parse_identifier()?)
-            } else {
-                None
-            }
+            self.maybe_parse_select_item_alias()?
         } else {
             None
         };

tests/sqlparser_common.rs

@@ -1295,16 +1295,29 @@ fn parse_select_wildcard_with_alias() {
     dialects
         .parse_sql_statements("SELECT t.* AS all_cols FROM t")
         .unwrap();
+    dialects.one_statement_parses_to(
+        "SELECT t.* all_cols FROM t",
+        "SELECT t.* AS all_cols FROM t",
+    );
+    dialects.one_statement_parses_to(
+        "SELECT t.* all_cols, other_col FROM t",
+        "SELECT t.* AS all_cols, other_col FROM t",
+    );
 
     // unqualified wildcard with alias
     dialects
         .parse_sql_statements("SELECT * AS all_cols FROM t")
         .unwrap();
+    dialects.one_statement_parses_to("SELECT * all_cols FROM t", "SELECT * AS all_cols FROM t");
 
     // mixed: regular column + qualified wildcard with alias
     dialects
         .parse_sql_statements("SELECT a.id, b.* AS b_cols FROM a JOIN b ON (a.id = b.a_id)")
         .unwrap();
+    dialects.one_statement_parses_to(
+        "SELECT a.id, b.* b_cols FROM a JOIN b ON (a.id = b.a_id)",
+        "SELECT a.id, b.* AS b_cols FROM a JOIN b ON (a.id = b.a_id)",
+    );
 }
 
 #[test]