fix: try working around UnsupportedStatement issue

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

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

@@ -719,7 +719,7 @@ Statement Statement() #Statement:
                 ( <ST_SEMICOLON> | <EOF> )
             )
             |
-            LOOKAHEAD( { getAsBoolean(Feature.allowUnsupportedStatements) } ) stm = UnsupportedStatement()
+            LOOKAHEAD( { stm==null && getAsBoolean(Feature.allowUnsupportedStatements) } ) stm = UnsupportedStatement()
          } catch (ParseException ex) {
             if ( getAsBoolean(Feature.allowUnsupportedStatements) ) {
                 stm = new UnsupportedStatement( stm.toString(), error_skipto(ST_SEMICOLON) );

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

@@ -5814,4 +5814,22 @@ public void testIssue1833() throws JSQLParserException {
         String stmt = "SELECT age, name, gender FROM user_info INTO TEMP user_temp WITH NO LOG";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
+
+    @Test
+    void testGroupByWithHaving() throws JSQLParserException {
+        String sqlStr = "-- GROUP BY\n"
+                        + "SELECT  a\n"
+                        + "        , b\n"
+                        + "        , c\n"
+                        + "        , Sum( d )\n"
+                        + "FROM t\n"
+                        + "GROUP BY    a\n"
+                        + "            , b\n"
+                        + "            , c\n"
+                        + "HAVING Sum( d ) > 0\n"
+                        + "    AND Count( * ) > 1\n"
+                        + ";";
+        Statement stmt = assertSqlCanBeParsedAndDeparsed(sqlStr);
+        Assertions.assertInstanceOf(Select.class, stmt);
+    }
 }