Add support for AllTableColumns in primary expression (#2197)

Author: tomershay

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -3254,12 +3254,8 @@ SelectItem<?> SelectItem() #SelectItem:
     // @fixme: Oracle's SEQUENCE.nextval is parsed as COLUMN with a name part nextval
     // @todo: parse a proper SEQUENCE instead of a COLUMN
     (
-        expression = AllColumns()
-        |
         LOOKAHEAD( 3 ) expression = ConnectByPriorOperator()
         |
-        LOOKAHEAD(AllTableColumns()) expression = AllTableColumns()
-        |
         LOOKAHEAD( 3 ) expression = XorExpression()
         |
         LOOKAHEAD( 3 ) expression = ConcatExpression()
@@ -5303,6 +5299,9 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD(2, {!interrupted}) retval=CastExpression()
 
+        | LOOKAHEAD(AllColumns()) retval=AllColumns()
+
+        | LOOKAHEAD(AllTableColumns()) retval=AllTableColumns()
 
         // support timestamp expressions
         | LOOKAHEAD(2, {!interrupted}) (token=<K_TIME_KEY_EXPR> | token=<K_CURRENT>) { retval = new TimeKeyExpression(token.image); }
@@ -6452,10 +6451,6 @@ Function InternalFunction(boolean escaped):
             )
         ]
         (
-            "*" { expr = new AllColumns(); expressionList = new ExpressionList(expr); }
-            |
-            LOOKAHEAD( AllTableColumns() ) expr=AllTableColumns() { expressionList = new ExpressionList(expr); }
-            |
             LOOKAHEAD(3) [ LOOKAHEAD(2) extraKeywordToken = <K_TABLE> { retval.setExtraKeyword(extraKeywordToken.image); } ]
             expressionList=ExpressionList()
             [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ]

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -5486,6 +5486,12 @@ public void testReservedKeywordsIssue1352() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT fulltext from fulltext.fulltext", true);
     }
 
+    @Test
+    public void testGroupByWithAllTableColumns() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(
+                "select c.post_id, p.* from posts p inner join comments c on c.post_id = p.post_id group by p.post_id, c.post_id, p.*;");
+    }
+
     @Test
     public void testTableSpaceKeyword() throws JSQLParserException {
         // without extra brackets