fix: Fix issues in IMPORT implementation

Stefan Steinhauser · Stefan Steinhauser · commit 711200d73a67 · 2025-02-04T16:55:04.000+01:00
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -36,6 +36,7 @@
     exports net.sf.jsqlparser.statement.drop;
     exports net.sf.jsqlparser.statement.execute;
     exports net.sf.jsqlparser.statement.grant;
+    exports net.sf.jsqlparser.statement.imprt;
     exports net.sf.jsqlparser.statement.insert;
     exports net.sf.jsqlparser.statement.merge;
     exports net.sf.jsqlparser.statement.refresh;
diff --git a/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java b/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java
@@ -792,6 +792,11 @@ public enum Feature {
      * allows sub selects without parentheses, e.g. `select * from dual where 1 = select 1`
      */
     allowUnparenthesizedSubSelects(false),
+
+    /**
+     * "IMPORT"
+     */
+    imprt,
     ;
 
     private final Object value;
diff --git a/src/main/java/net/sf/jsqlparser/statement/CertificateVerification.java b/src/main/java/net/sf/jsqlparser/statement/CertificateVerification.java
@@ -1,3 +1,12 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2025 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.expression.StringValue;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ConnectionFileDefinition.java b/src/main/java/net/sf/jsqlparser/statement/ConnectionFileDefinition.java
@@ -10,14 +10,17 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.expression.StringValue;
-import net.sf.jsqlparser.statement.select.PlainSelect;
 
 import java.util.List;
 
 public class ConnectionFileDefinition {
     private ConnectionDefinition connectionDefinition;
     private List<StringValue> filePaths;
 
+    public ConnectionFileDefinition(List<StringValue> filePaths) {
+        this(null, filePaths);
+    }
+
     public ConnectionFileDefinition(ConnectionDefinition connectionDefinition, List<StringValue> filePaths) {
         this.connectionDefinition = connectionDefinition;
         this.filePaths = filePaths;
diff --git a/src/main/java/net/sf/jsqlparser/statement/LikeClause.java b/src/main/java/net/sf/jsqlparser/statement/LikeClause.java
@@ -56,6 +56,14 @@ public void setIncludingDefaults(Boolean includingDefaults) {
         this.includingDefaults = includingDefaults;
     }
 
+    public Boolean isExcludingDefaults() {
+        return includingDefaults == null ? null : !includingDefaults;
+    }
+
+    public void setExcludingDefaults(Boolean excludingDefaults) {
+        this.includingDefaults = !excludingDefaults;
+    }
+
     public Boolean isIncludingIdentity() {
         return includingIdentity;
     }
@@ -64,6 +72,14 @@ public void setIncludingIdentity(Boolean includingIdentity) {
         this.includingIdentity = includingIdentity;
     }
 
+    public Boolean isExcludingIdentity() {
+        return includingIdentity == null ? null : !includingIdentity;
+    }
+
+    public void setExcludingIdentity(Boolean excludingIdentity) {
+        this.includingIdentity = !excludingIdentity;
+    }
+
     public Boolean isIncludingComments() {
         return includingComments;
     }
@@ -72,6 +88,14 @@ public void setIncludingComments(Boolean includingComments) {
         this.includingComments = includingComments;
     }
 
+    public Boolean isExcludingComments() {
+        return includingComments == null ? null : !includingComments;
+    }
+
+    public void setExcludingComments(Boolean excludingComments) {
+        this.includingComments = !excludingComments;
+    }
+
     public StringBuilder appendTo(StringBuilder builder) {
         builder.append(" LIKE ");
         builder.append(table);
diff --git a/src/main/java/net/sf/jsqlparser/statement/RejectClause.java b/src/main/java/net/sf/jsqlparser/statement/RejectClause.java
@@ -9,15 +9,17 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.expression.LongValue;
+
 public class RejectClause {
-    private Long limit;
+    private LongValue limit;
     private boolean errors;
 
-    public Long getLimit() {
+    public LongValue getLimit() {
         return limit;
     }
 
-    public void setLimit(Long limit) {
+    public void setLimit(LongValue limit) {
         this.limit = limit;
     }
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java
@@ -28,6 +28,7 @@
 import net.sf.jsqlparser.statement.drop.Drop;
 import net.sf.jsqlparser.statement.execute.Execute;
 import net.sf.jsqlparser.statement.grant.Grant;
+import net.sf.jsqlparser.statement.imprt.Import;
 import net.sf.jsqlparser.statement.insert.Insert;
 import net.sf.jsqlparser.statement.insert.ParenthesedInsert;
 import net.sf.jsqlparser.statement.merge.Merge;
@@ -308,4 +309,9 @@ public <S> T visit(UnsupportedStatement unsupportedStatement, S context) {
     public <S> T visit(RefreshMaterializedViewStatement materializedView, S context) {
         return null;
     }
+
+    @Override
+    public <S> T visit(Import imprt, S context) {
+        return null;
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/DBMSSource.java b/src/main/java/net/sf/jsqlparser/statement/imprt/DBMSSource.java
@@ -16,11 +16,10 @@
 import net.sf.jsqlparser.statement.ConnectionDefinition;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
-import javax.sql.DataSource;
 import java.io.Serializable;
 import java.util.List;
 
-public class DBMSSource implements ImportFromItem, Serializable {
+public class DBMSSource extends ImportFromItem implements Serializable {
     private DataSource dataSource;
     private StringValue jdbcDriverDefinition;
     private ConnectionDefinition connectionDefinition;
@@ -82,22 +81,26 @@ public String toString() {
 
         sql.append(dataSource);
 
-        if(jdbcDriverDefinition != null) {
+        if (jdbcDriverDefinition != null) {
             sql.append(" DRIVER = ").append(jdbcDriverDefinition);
         }
 
         sql.append(" ");
         sql.append(connectionDefinition);
 
-        if(table != null) {
+        if (table != null) {
             sql.append(" TABLE ").append(table);
             PlainSelect.appendStringListTo(sql, columns, true, true);
         } else if (statements != null) {
-            for(StringValue statement : statements) {
+            for (StringValue statement : statements) {
                 sql.append(" STATEMENT ").append(statement);
             }
         }
 
+        if (errorClause != null) {
+            sql.append(errorClause);
+        }
+
         return sql.toString();
     }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/FileSource.java b/src/main/java/net/sf/jsqlparser/statement/imprt/FileSource.java
@@ -9,16 +9,14 @@
  */
 package net.sf.jsqlparser.statement.imprt;
 
-import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.statement.*;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 import java.io.Serializable;
 import java.util.List;
 
-public class FileSource implements ImportFromItem, Serializable {
+public class FileSource extends ImportFromItem implements Serializable {
     private DataSource dataSource;
-    private ConnectionDefinition connectionDefinition;
     private List<ConnectionFileDefinition> connectionFileDefinitions;
     private Boolean local;
     private Boolean secure;
@@ -27,6 +25,70 @@ public class FileSource implements ImportFromItem, Serializable {
     private List<FileOption> fileOptions;
     private CertificateVerification certificateVerification;
 
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public List<ConnectionFileDefinition> getConnectionFileDefinitions() {
+        return connectionFileDefinitions;
+    }
+
+    public void setConnectionFileDefinitions(List<ConnectionFileDefinition> connectionFileDefinitions) {
+        this.connectionFileDefinitions = connectionFileDefinitions;
+    }
+
+    public Boolean isLocal() {
+        return local;
+    }
+
+    public void setLocal(Boolean local) {
+        this.local = local;
+    }
+
+    public Boolean isSecure() {
+        return secure;
+    }
+
+    public void setSecure(Boolean secure) {
+        this.secure = secure;
+    }
+
+    public List<CSVColumn> getCSVColumns() {
+        return csvColumns;
+    }
+
+    public void setCSVColumns(List<CSVColumn> csvColumns) {
+        this.csvColumns = csvColumns;
+    }
+
+    public List<FBVColumn> getFBVColumns() {
+        return fbvColumns;
+    }
+
+    public void setFBVColumns(List<FBVColumn> fbvColumns) {
+        this.fbvColumns = fbvColumns;
+    }
+
+    public List<FileOption> getFileOptions() {
+        return fileOptions;
+    }
+
+    public void setFileOptions(List<FileOption> fileOptions) {
+        this.fileOptions = fileOptions;
+    }
+
+    public CertificateVerification getCertificateVerification() {
+        return certificateVerification;
+    }
+
+    public void setCertificateVerification(CertificateVerification certificateVerification) {
+        this.certificateVerification = certificateVerification;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder();
@@ -54,10 +116,14 @@ public String toString() {
             PlainSelect.appendStringListTo(sql, fileOptions, false, false);
         }
 
-        if(certificateVerification != null) {
+        if (certificateVerification != null) {
             sql.append(certificateVerification);
         }
 
+        if (errorClause != null) {
+            sql.append(errorClause);
+        }
+
         return sql.toString();
     }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/Import.java b/src/main/java/net/sf/jsqlparser/statement/imprt/Import.java
@@ -19,20 +19,52 @@
 import java.util.List;
 
 public class Import implements Statement {
-    private Table intoTable;
-    private ExpressionList<Column> columnList;
+    private Table table;
+    private ExpressionList<Column> columns;
     private List<ImportColumn> importColumns;
     private ImportFromItem fromItem;
 
+    public Table getTable() {
+        return table;
+    }
+
+    public void setTable(Table table) {
+        this.table = table;
+    }
+
+    public ExpressionList<Column> getColumns() {
+        return columns;
+    }
+
+    public void setColumns(ExpressionList<Column> columns) {
+        this.columns = columns;
+    }
+
+    public List<ImportColumn> getImportColumns() {
+        return importColumns;
+    }
+
+    public void setImportColumns(List<ImportColumn> importColumns) {
+        this.importColumns = importColumns;
+    }
+
+    public ImportFromItem getFromItem() {
+        return fromItem;
+    }
+
+    public void setFromItem(ImportFromItem fromItem) {
+        this.fromItem = fromItem;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder();
         sql.append("IMPORT ");
-        if (intoTable != null || importColumns != null) {
+        if (table != null || importColumns != null) {
             sql.append("INTO ");
-            if (intoTable != null) {
-                sql.append(intoTable);
-                PlainSelect.appendStringListTo(sql, columnList, true, true);
+            if (table != null) {
+                sql.append(table);
+                PlainSelect.appendStringListTo(sql, columns, true, true);
             } else {
                 PlainSelect.appendStringListTo(sql, importColumns, true, true);
             }
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/ImportFromItem.java b/src/main/java/net/sf/jsqlparser/statement/imprt/ImportFromItem.java
@@ -9,5 +9,16 @@
  */
 package net.sf.jsqlparser.statement.imprt;
 
-public interface ImportFromItem {
+import net.sf.jsqlparser.statement.ErrorClause;
+
+public abstract class ImportFromItem {
+    protected ErrorClause errorClause;
+
+    public ErrorClause getErrorClause() {
+        return errorClause;
+    }
+
+    public void setErrorClause(ErrorClause errorClause) {
+        this.errorClause = errorClause;
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/ScriptSource.java b/src/main/java/net/sf/jsqlparser/statement/imprt/ScriptSource.java
@@ -16,7 +16,7 @@
 import java.io.Serializable;
 import java.util.List;
 
-public class ScriptSource implements ImportFromItem, Serializable {
+public class ScriptSource extends ImportFromItem implements Serializable {
     private Table script;
     private ConnectionDefinition connectionDefinition;
     private List<String> properties;
@@ -78,6 +78,10 @@ public String toString() {
             }
         }
 
+        if (errorClause != null) {
+            sql.append(errorClause);
+        }
+
         return sql.toString();
     }
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -157,6 +157,7 @@
 import net.sf.jsqlparser.statement.drop.Drop;
 import net.sf.jsqlparser.statement.execute.Execute;
 import net.sf.jsqlparser.statement.grant.Grant;
+import net.sf.jsqlparser.statement.imprt.Import;
 import net.sf.jsqlparser.statement.insert.Insert;
 import net.sf.jsqlparser.statement.insert.ParenthesedInsert;
 import net.sf.jsqlparser.statement.merge.Merge;
@@ -1821,4 +1822,10 @@ public <S> Void visit(GeometryDistance geometryDistance, S context) {
         return null;
     }
 
+    @Override
+    public <S> Void visit(Import imprt, S context) {
+        throwUnsupported(imprt);
+        return null;
+    }
+
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/StatementValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/StatementValidator.java
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
