Issue1500 - Circular References in AllColumns and AllTableColumns (#1501)

* Adjust Gradle to JUnit 5

Parallel Test execution
Gradle Caching
Explicitly request for latest JavaCC 7.0.10

* Do not mark SpeedTest for concurrent execution

* Remove unused imports

* Adjust Gradle to JUnit 5

Parallel Test execution
Gradle Caching
Explicitly request for latest JavaCC 7.0.10

* Do not mark SpeedTest for concurrent execution

* Remove unused imports

* Remove circular reference revealed by issue #1500

* Add test for Issue 1500 Circular reference for All Columns Expression

* Fix Test case

* Add Test for AllTableColumn due to similar circular reference

* Remove similar circular reference from AllTableColumn

* Update dependencies

* Adjust Jacoco Missed Lines count

Author: manticore-projects

build.gradle

@@ -29,19 +29,19 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'commons-io:commons-io:2.6'
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    testImplementation 'org.assertj:assertj-core:3.16.1'
-    testImplementation 'org.apache.commons:commons-lang3:3.10'
-    testImplementation 'com.h2database:h2:1.4.200'
+    testImplementation 'commons-io:commons-io:2.11.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:4.3.1'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.apache.commons:commons-lang3:3.12.0'
+    testImplementation 'com.h2database:h2:2.1.210'
 
     // for JaCoCo Reports
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
-    testImplementation 'org.mockito:mockito-junit-jupiter:4.1.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:4.3.1'
 
     // enforce latest version of JavaCC
     javacc 'net.java.dev.javacc:javacc:7.0.10'
@@ -115,7 +115,7 @@ jacocoTestCoverageVerification {
             limit {
                 counter = 'LINE'
                 value = 'MISSEDCOUNT'
-                maximum = 5500
+                maximum = 5513
                 }
             excludes = [
                     'net.sf.jsqlparser.util.validation.*',

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

@@ -492,12 +492,10 @@ public void visit(UnPivot unpivot) {
 
     @Override
     public void visit(AllColumns allColumns) {
-        allColumns.accept((ExpressionVisitor) this);
     }
 
     @Override
     public void visit(AllTableColumns allTableColumns) {
-        allTableColumns.accept((ExpressionVisitor) this);
     }
 
     @Override

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

@@ -1020,9 +1020,12 @@ public void testDistinctTop2() {
     public void testDistinctWithFollowingBrackets() throws JSQLParserException {
         Select select = (Select) assertSqlCanBeParsedAndDeparsed("SELECT DISTINCT (phone), name FROM admin_user");
         PlainSelect selectBody = (PlainSelect) select.getSelectBody();
+        Distinct distinct = selectBody.getDistinct();
+
         assertThat(selectBody.getDistinct())
                 .isNotNull()
-                .hasFieldOrPropertyWithValue("getOnSelectItems", null);
+                .hasFieldOrPropertyWithValue("onSelectItems", null);
+
         assertThat(selectBody.getSelectItems().get(0).toString())
                 .isEqualTo("(phone)");
     }

src/test/java/net/sf/jsqlparser/util/deparser/StatementDeParserTest.java

@@ -23,11 +23,7 @@
 import net.sf.jsqlparser.statement.execute.Execute;
 import net.sf.jsqlparser.statement.insert.Insert;
 import net.sf.jsqlparser.statement.replace.Replace;
-import net.sf.jsqlparser.statement.select.OrderByElement;
-import net.sf.jsqlparser.statement.select.Select;
-import net.sf.jsqlparser.statement.select.SelectBody;
-import net.sf.jsqlparser.statement.select.SubSelect;
-import net.sf.jsqlparser.statement.select.WithItem;
+import net.sf.jsqlparser.statement.select.*;
 import net.sf.jsqlparser.statement.update.Update;
 import net.sf.jsqlparser.statement.update.UpdateSet;
 import net.sf.jsqlparser.statement.upsert.Upsert;
@@ -370,4 +366,19 @@ public void shouldUseProvidedDeparsersWhenDeParsingIfThenStatement() throws JSQL
         statementDeParser.deParse(ifElseStatement);
     }
 
+    @Test
+    public void testIssue1500AllColumns() throws JSQLParserException {
+        String sqlStr = "select count(*) from some_table";
+        Select select = (Select) CCJSqlParserUtil.parse(sqlStr);
+        PlainSelect selectBody = (PlainSelect) select.getSelectBody();
+        selectBody.accept(new SelectDeParser());
+    }
+
+    @Test
+    public void testIssue1500AllTableColumns() throws JSQLParserException {
+        String sqlStr = "select count(a.*) from some_table a";
+        Select select = (Select) CCJSqlParserUtil.parse(sqlStr);
+        PlainSelect selectBody = (PlainSelect) select.getSelectBody();
+        selectBody.accept(new SelectDeParser());
+    }
 }