fixes #1009

JSQLParser · Jul 11, 2020 · 71d6523 · 71d6523
1 parent c03733b
commit 71d6523
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.11.1</version>
+            <version>3.16.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -246,6 +246,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M4</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java
@@ -172,8 +172,10 @@ public void visit(InExpression expr) {
         }
         if (expr.getRightExpression() != null) {
             expr.getRightExpression().accept(this);
-        } else {
+        } else if (expr.getRightItemsList() != null) {
             expr.getRightItemsList().accept(this);
+        } else {
+            expr.getMultiExpressionList().accept(this);
         }
     }
 

diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -269,7 +269,13 @@ public void visit(InExpression inExpression) {
         } else if (inExpression.getLeftItemsList() != null) {
             inExpression.getLeftItemsList().accept(this);
         }
-        inExpression.getRightItemsList().accept(this);
+        if (inExpression.getRightExpression() != null) {
+            inExpression.getRightExpression().accept(this);
+        } else if (inExpression.getRightItemsList() != null) {
+            inExpression.getRightItemsList().accept(this);
+        } else {
+            inExpression.getMultiExpressionList().accept(this);
+        }
     }
 
     @Override

diff --git a/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java b/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
@@ -36,9 +36,12 @@
 import java.io.StringReader;
 import java.util.Iterator;
 import java.util.List;
-
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 
 public class TablesNamesFinderTest {
 
@@ -615,4 +618,12 @@ public void testAlterSequence_throwsException() throws JSQLParserException {
         assertThatThrownBy(() -> tablesNamesFinder.getTableList(stmt)).isInstanceOf(UnsupportedOperationException.class)
                 .hasMessage("Finding tables from AlterSequence is not supported");
     }
+
+    @Test
+    public void testNPEIssue1009() throws JSQLParserException {
+        Statement stmt = CCJSqlParserUtil.parse(" SELECT * FROM (SELECT * FROM biz_fund_info WHERE tenant_code = ? AND ((ta_code, manager_code) IN ((?, ?)) OR department_type IN (?)))");
+        TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();    
+
+        assertThat(tablesNamesFinder.getTableList(stmt)).containsExactly("biz_fund_info");
+    }
 }