feat: Allow IMPORT as FromItem in SELECT

Stefan Steinhauser · Stefan Steinhauser · commit 0c9b80e9fbdf · 2025-02-05T15:36:47.000+01:00
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/Import.java b/src/main/java/net/sf/jsqlparser/statement/imprt/Import.java
@@ -9,20 +9,23 @@
  */
 package net.sf.jsqlparser.statement.imprt;
 
+import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
-import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.*;
 
 import java.util.List;
 
-public class Import implements Statement {
+public class Import extends ASTNodeAccessImpl implements FromItem, Statement {
     private Table table;
     private ExpressionList<Column> columns;
     private List<ImportColumn> importColumns;
     private ImportFromItem fromItem;
+    private Alias alias;
 
     public Table getTable() {
         return table;
@@ -80,4 +83,35 @@ public String toString() {
     public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
         return statementVisitor.visit(this, context);
     }
+
+    @Override
+    public <T, S> T accept(FromItemVisitor<T> fromItemVisitor, S context) {
+        return fromItemVisitor.visit(this, context);
+    }
+
+    @Override
+    public Alias getAlias() {
+        return alias;
+    }
+
+    @Override
+    public void setAlias(Alias alias) {
+        this.alias = alias;
+    }
+
+    @Override
+    public Pivot getPivot() {
+        return null;
+    }
+
+    @Override
+    public void setPivot(Pivot pivot) {}
+
+    @Override
+    public UnPivot getUnPivot() {
+        return null;
+    }
+
+    @Override
+    public void setUnPivot(UnPivot unpivot) {}
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.select;
 
 import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.imprt.Import;
 
 public interface FromItemVisitor<T> {
 
@@ -66,4 +67,10 @@ default void visit(SetOperationList setOperationList) {
     default void visit(TableStatement tableStatement) {
         this.visit(tableStatement, null);
     }
+
+    <S> T visit(Import imprt, S context);
+
+    default void visit(Import imprt) {
+        this.visit(imprt, null);
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.select;
 
 import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.imprt.Import;
 
 @SuppressWarnings({"PMD.UncommentedEmptyMethodBody"})
 public class FromItemVisitorAdapter<T> implements FromItemVisitor<T> {
@@ -67,4 +68,10 @@ public <S> T visit(TableStatement tableStatement, S context) {
 
         return null;
     }
+
+    @Override
+    public <S> T visit(Import imprt, S context) {
+
+        return null;
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -1828,4 +1828,9 @@ public <S> Void visit(Import imprt, S context) {
         return null;
     }
 
+    @Override
+    public void visit(Import imprt) {
+        StatementVisitor.super.visit(imprt);
+    }
+
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -18,6 +18,7 @@
 import net.sf.jsqlparser.expression.WindowDefinition;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.imprt.Import;
 import net.sf.jsqlparser.statement.select.Distinct;
 import net.sf.jsqlparser.statement.select.Fetch;
 import net.sf.jsqlparser.statement.select.First;
@@ -755,6 +756,12 @@ public <S> StringBuilder visit(Values values, S context) {
         return buffer;
     }
 
+    @Override
+    public <S> StringBuilder visit(Import imprt, S context) {
+        buffer.append(imprt.toString());
+        return buffer;
+    }
+
     @Override
     public void visit(Values values) {
         SelectVisitor.super.visit(values);
@@ -812,6 +819,8 @@ public void visit(ParenthesedFromItem fromItem) {
         visit(fromItem, null);
     }
 
+    public void visit(Import imprt) { visit(imprt, null); }
+
 
     private void deparseOptimizeFor(OptimizeFor optimizeFor) {
         buffer.append(" OPTIMIZE FOR ");
diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java
@@ -16,6 +16,7 @@
 import net.sf.jsqlparser.expression.SQLServerHints;
 import net.sf.jsqlparser.parser.feature.Feature;
 import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.imprt.Import;
 import net.sf.jsqlparser.statement.select.ExceptOp;
 import net.sf.jsqlparser.statement.select.Fetch;
 import net.sf.jsqlparser.statement.select.ForMode;
@@ -359,6 +360,12 @@ public <S> Void visit(Values values, S context) {
         return null;
     }
 
+    @Override
+    public <S> Void visit(Import imprt, S context) {
+        // TODO: not yet implemented
+        return null;
+    }
+
     @Override
     public void validate(SelectItem<?> statement) {
         statement.accept(this, null);
@@ -420,4 +427,8 @@ public void visit(Values values) {
         visit(values, null);
     }
 
+    public void visit(Import imprt) {
+        visit(imprt, null);
+    }
+
 }
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1142,7 +1142,7 @@ ImportFromItem ImportFromItem(): {
               importFromItem = DBMSSource()
             | importFromItem = FileSource()
           )
-          [errorClause = ErrorClause() { importFromItem.setErrorClause(errorClause); }]
+          [ LOOKAHEAD(2) errorClause = ErrorClause() { importFromItem.setErrorClause(errorClause); } ]
         | importFromItem = ScriptSource()
     )
     {
@@ -1236,6 +1236,7 @@ FileSource FileSource() #FileSource: {
         { connectionFileDefinitions.add(new ConnectionFileDefinition(connectionDefinition, filePaths)); }
 
         (
+          LOOKAHEAD(2)
           (
             (
                 LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()
@@ -1384,12 +1385,14 @@ FileSource FileSource() #FileSource: {
   ]
 
   [
+    LOOKAHEAD(2)
     {
         List<FileOption> fileOptions = new ArrayList<FileOption>();
         fileSource.setFileOptions(fileOptions);
         FileOption fileOption;
     }
     (
+        LOOKAHEAD(2)
         (
             (
                 token=<K_TRIM>
@@ -1423,7 +1426,7 @@ FileSource FileSource() #FileSource: {
     )+
   ]
 
-  [ certificateVerification = CertificateVerification() { fileSource.setCertificateVerification(certificateVerification); } ]
+  [ LOOKAHEAD(2) certificateVerification = CertificateVerification() { fileSource.setCertificateVerification(certificateVerification); } ]
 
   {
     return fileSource;
@@ -1441,8 +1444,9 @@ CertificateVerification CertificateVerification(): {
           )
           <K_CERTIFICATE>
           [
-              <K_PUBLIC> <K_KEY>
-              token = <S_CHAR_LITERAL> { certificateVerification.setPublicKey(new StringValue(token.image)); }
+            LOOKAHEAD(2)
+            <K_PUBLIC> <K_KEY>
+            token = <S_CHAR_LITERAL> { certificateVerification.setPublicKey(new StringValue(token.image)); }
           ]
         | <K_PUBLIC> <K_KEY>
           token = <S_CHAR_LITERAL> { certificateVerification.setPublicKey(new StringValue(token.image)); }
@@ -1464,7 +1468,7 @@ ScriptSource ScriptSource(): {
     <K_SCRIPT>
     script = Table() { scriptSource.setScript(script); }
 
-    [ connectionDefinition = ConnectionDefinition() { scriptSource.setConnectionDefinition(connectionDefinition); } ]
+    [ LOOKAHEAD(2) connectionDefinition = ConnectionDefinition() { scriptSource.setConnectionDefinition(connectionDefinition); } ]
 
     [   
         LOOKAHEAD(2)
@@ -1523,9 +1527,9 @@ ConnectionDefinition ConnectionDefinition(): {
     | token=<S_CHAR_LITERAL> { connectionDefinition.setConnectionDefinition(new StringValue(token.image)); }
   )
 
-  [ userIdentification = UserIdentification() { connectionDefinition.setUserIdentification(userIdentification); } ]
+  [ LOOKAHEAD(2) userIdentification = UserIdentification() { connectionDefinition.setUserIdentification(userIdentification); } ]
 
-  [ certificateVerification = CertificateVerification() { connectionDefinition.setCertificateVerification(certificateVerification); } ]
+  [ LOOKAHEAD(2) certificateVerification = CertificateVerification() { connectionDefinition.setCertificateVerification(certificateVerification); } ]
 
   {
       return connectionDefinition;
@@ -1582,7 +1586,7 @@ ErrorClause ErrorClause(): {
               | <K_TRUNCATE> { errorClause.setTruncate(true); }
             )
         ]
-        [ rejectClause = RejectClause() { errorClause.setRejectClause(rejectClause); } ]
+        [ LOOKAHEAD(2) rejectClause = RejectClause() { errorClause.setRejectClause(rejectClause); } ]
       | rejectClause = RejectClause() { errorClause.setRejectClause(rejectClause); }
   )
   
@@ -3232,7 +3236,7 @@ PlainSelect PlainSelect() #PlainSelect:
     selectItems=SelectItemsList()
 
     [ LOOKAHEAD(2) intoTables = IntoClause() { plainSelect.setIntoTables(intoTables); } ]
-    [ LOOKAHEAD(2) <K_FROM> fromItem=FromItem()
+    [ LOOKAHEAD(2) <K_FROM> (fromItem=FromItem() | fromItem=Import())
         [ LOOKAHEAD(2) lateralViews=LateralViews() ]
         [ LOOKAHEAD(2) joins=JoinsList() ]
     ]

Original file line number	Diff line number	Diff line change
`@@ -1828,4 +1828,9 @@ public <S> Void visit(Import imprt, S context) {`
`1828`	`1828`	`return null;`
`1829`	`1829`	`}`
`1830`	`1830`
	`1831`	`+ @Override`
	`1832`	`+ public void visit(Import imprt) {`
	`1833`	`+ StatementVisitor.super.visit(imprt);`
	`1834`	`+ }`
	`1835`	`+`
`1831`	`1836`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1142,7 +1142,7 @@ ImportFromItem ImportFromItem(): {`
`1142`	`1142`	`importFromItem = DBMSSource()`
`1143`	`1143`	`\| importFromItem = FileSource()`
`1144`	`1144`	`)`
`1145`		`- [errorClause = ErrorClause() { importFromItem.setErrorClause(errorClause); }]`
	`1145`	`+ [ LOOKAHEAD(2) errorClause = ErrorClause() { importFromItem.setErrorClause(errorClause); } ]`
`1146`	`1146`	`\| importFromItem = ScriptSource()`
`1147`	`1147`	`)`
`1148`	`1148`	`{`
`@@ -1236,6 +1236,7 @@ FileSource FileSource() #FileSource: {`
`1236`	`1236`	`{ connectionFileDefinitions.add(new ConnectionFileDefinition(connectionDefinition, filePaths)); }`
`1237`	`1237`
`1238`	`1238`	`(`
	`1239`	`+ LOOKAHEAD(2)`
`1239`	`1240`	`(`
`1240`	`1241`	`(`
`1241`	`1242`	`LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()`
`@@ -1384,12 +1385,14 @@ FileSource FileSource() #FileSource: {`
`1384`	`1385`	`]`
`1385`	`1386`
`1386`	`1387`	`[`
	`1388`	`+ LOOKAHEAD(2)`
`1387`	`1389`	`{`
`1388`	`1390`	`List<FileOption> fileOptions = new ArrayList<FileOption>();`
`1389`	`1391`	`fileSource.setFileOptions(fileOptions);`
`1390`	`1392`	`FileOption fileOption;`
`1391`	`1393`	`}`
`1392`	`1394`	`(`
	`1395`	`+ LOOKAHEAD(2)`
`1393`	`1396`	`(`
`1394`	`1397`	`(`
`1395`	`1398`	`token=<K_TRIM>`
`@@ -1423,7 +1426,7 @@ FileSource FileSource() #FileSource: {`
`1423`	`1426`	`)+`
`1424`	`1427`	`]`
`1425`	`1428`
`1426`		`- [ certificateVerification = CertificateVerification() { fileSource.setCertificateVerification(certificateVerification); } ]`
	`1429`	`+ [ LOOKAHEAD(2) certificateVerification = CertificateVerification() { fileSource.setCertificateVerification(certificateVerification); } ]`
`1427`	`1430`
`1428`	`1431`	`{`
`1429`	`1432`	`return fileSource;`
`@@ -1441,8 +1444,9 @@ CertificateVerification CertificateVerification(): {`
`1441`	`1444`	`)`
`1442`	`1445`	`<K_CERTIFICATE>`
`1443`	`1446`	`[`
`1444`		`- <K_PUBLIC> <K_KEY>`
`1445`		`- token = <S_CHAR_LITERAL> { certificateVerification.setPublicKey(new StringValue(token.image)); }`
	`1447`	`+ LOOKAHEAD(2)`
	`1448`	`+ <K_PUBLIC> <K_KEY>`
	`1449`	`+ token = <S_CHAR_LITERAL> { certificateVerification.setPublicKey(new StringValue(token.image)); }`
`1446`	`1450`	`]`
`1447`	`1451`	`\| <K_PUBLIC> <K_KEY>`
`1448`	`1452`	`token = <S_CHAR_LITERAL> { certificateVerification.setPublicKey(new StringValue(token.image)); }`
`@@ -1464,7 +1468,7 @@ ScriptSource ScriptSource(): {`
`1464`	`1468`	`<K_SCRIPT>`
`1465`	`1469`	`script = Table() { scriptSource.setScript(script); }`
`1466`	`1470`
`1467`		`- [ connectionDefinition = ConnectionDefinition() { scriptSource.setConnectionDefinition(connectionDefinition); } ]`
	`1471`	`+ [ LOOKAHEAD(2) connectionDefinition = ConnectionDefinition() { scriptSource.setConnectionDefinition(connectionDefinition); } ]`
`1468`	`1472`
`1469`	`1473`	`[`
`1470`	`1474`	`LOOKAHEAD(2)`
`@@ -1523,9 +1527,9 @@ ConnectionDefinition ConnectionDefinition(): {`
`1523`	`1527`	`\| token=<S_CHAR_LITERAL> { connectionDefinition.setConnectionDefinition(new StringValue(token.image)); }`
`1524`	`1528`	`)`
`1525`	`1529`
`1526`		`- [ userIdentification = UserIdentification() { connectionDefinition.setUserIdentification(userIdentification); } ]`
	`1530`	`+ [ LOOKAHEAD(2) userIdentification = UserIdentification() { connectionDefinition.setUserIdentification(userIdentification); } ]`
`1527`	`1531`
`1528`		`- [ certificateVerification = CertificateVerification() { connectionDefinition.setCertificateVerification(certificateVerification); } ]`
	`1532`	`+ [ LOOKAHEAD(2) certificateVerification = CertificateVerification() { connectionDefinition.setCertificateVerification(certificateVerification); } ]`
`1529`	`1533`
`1530`	`1534`	`{`
`1531`	`1535`	`return connectionDefinition;`
`@@ -1582,7 +1586,7 @@ ErrorClause ErrorClause(): {`
`1582`	`1586`	`\| <K_TRUNCATE> { errorClause.setTruncate(true); }`
`1583`	`1587`	`)`
`1584`	`1588`	`]`
`1585`		`- [ rejectClause = RejectClause() { errorClause.setRejectClause(rejectClause); } ]`
	`1589`	`+ [ LOOKAHEAD(2) rejectClause = RejectClause() { errorClause.setRejectClause(rejectClause); } ]`
`1586`	`1590`	`\| rejectClause = RejectClause() { errorClause.setRejectClause(rejectClause); }`
`1587`	`1591`	`)`
`1588`	`1592`
`@@ -3232,7 +3236,7 @@ PlainSelect PlainSelect() #PlainSelect:`
`3232`	`3236`	`selectItems=SelectItemsList()`
`3233`	`3237`
`3234`	`3238`	`[ LOOKAHEAD(2) intoTables = IntoClause() { plainSelect.setIntoTables(intoTables); } ]`
`3235`		`- [ LOOKAHEAD(2) <K_FROM> fromItem=FromItem()`
	`3239`	`+ [ LOOKAHEAD(2) <K_FROM> (fromItem=FromItem() \| fromItem=Import())`
`3236`	`3240`	`[ LOOKAHEAD(2) lateralViews=LateralViews() ]`
`3237`	`3241`	`[ LOOKAHEAD(2) joins=JoinsList() ]`
`3238`	`3242`	`]`