#3662 Table names are identified from the FROM statements only

Author: ymarcon

Diff for: opal-sql/src/main/java/org/obiba/opal/sql/SQLExtractor.java

@@ -13,11 +13,15 @@
 import com.google.common.collect.Sets;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Set;
 
 public class SQLExtractor {
 
+  private static final Logger log = LoggerFactory.getLogger(SQLExtractor.class);
+
   public static Set<String> extractTables(String sql) throws SQLParserException {
     try {
       Set<String> tables = Sets.newLinkedHashSet();
@@ -67,9 +71,12 @@ public Void visitUpdate_stmt(SQLParser.Update_stmtContext ctx) {
 
         @Override
         public Void visitTable_name(SQLParser.Table_nameContext ctx) {
-          tables.add(ctx.getText());
+          log.info("table {} from context {}", ctx.getText(), ctx.getParent().getClass().getSimpleName());
+          if (ctx.getParent() instanceof SQLParser.Table_or_subqueryContext)
+            tables.add(ctx.getText());
           return super.visitTable_name(ctx);
         }
+
       });
 
       return tables;

Diff for: opal-sql/src/main/test/org/obiba/opal/sql/SQLExtractorTest.java

@@ -21,6 +21,7 @@ public class SQLExtractorTest {
   @Test
   public void testExtractTables() throws SQLParserException {
     doExtractTables("select * from CNSIM1", "CNSIM1");
+    doExtractTables("select tab.LAB_GLUC from CNSIM1 as tab", "CNSIM1");
     doExtractTables("select * from CNSIM1 union all select * from CNSIM2", "CNSIM1 | CNSIM2");
     doExtractTables("select count(LAB_HDL) as hdl_count, avg(LAB_HDL) as hdl_avg, GENDER as gender " +
         "from (select * from CNSIM1 union all select * from CNSIM2) " +