feat: Simplify grammar

manticore-projects · Jun 10, 2025 · Feb 3, 2025 · Feb 3, 2025 · Feb 4, 2025 · Feb 4, 2025
commit 7437a75438887cfbdeaa7f17f3d4237983b2a8b0
diff --git a/src/main/java/net/sf/jsqlparser/statement/CSVFileDestination.java b/src/main/java/net/sf/jsqlparser/statement/CSVFileDestination.java
@@ -15,7 +15,7 @@ public class CSVFileDestination implements ErrorDestination {
     private ConnectionDefinition connectionDefinition;
     private boolean local;
     private boolean secure;
-    private StringValue filePath;
+    private StringValue file;
 
     public ConnectionDefinition getConnectionDefinition() {
         return connectionDefinition;
@@ -41,12 +41,12 @@ public void setSecure(boolean secure) {
         this.secure = secure;
     }
 
-    public StringValue getFilePath() {
-        return filePath;
+    public StringValue getFile() {
+        return file;
     }
 
-    public void setFilePath(StringValue filePath) {
-        this.filePath = filePath;
+    public void setFile(StringValue file) {
+        this.file = file;
     }
 
     @Override
@@ -68,7 +68,7 @@ public String toString() {
         }
 
         sql.append(" FILE ");
-        sql.append(filePath);
+        sql.append(file);
 
         return sql.toString();
     }

diff --git a/src/main/java/net/sf/jsqlparser/statement/DBMSType.java b/src/main/java/net/sf/jsqlparser/statement/DBMSType.java
@@ -0,0 +1,40 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 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;
+
+public enum DBMSType implements SourceDestinationType {
+    EXA,
+    ORA,
+    JDBC;
+
+    private StringValue jdbcDriverDefinition;
+
+    public StringValue getJDBCDriverDefinition() {
+        return jdbcDriverDefinition;
+    }
+
+    public void setJDBCDriverDefinition(StringValue jdbcDriverDefinition) {
+        this.jdbcDriverDefinition = jdbcDriverDefinition;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sql = new StringBuilder();
+
+        sql.append(super.toString());
+        if (jdbcDriverDefinition != null) {
+            sql.append(" DRIVER = ").append(jdbcDriverDefinition);
+        }
+
+        return sql.toString();
+    }
+}
diff --git a/src/main/java/net/sf/jsqlparser/statement/FileType.java b/src/main/java/net/sf/jsqlparser/statement/FileType.java
@@ -0,0 +1,15 @@
+/*-
+ * #%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;
+
+public enum FileType implements SourceDestinationType {
+    CSV,
+    FBV
+}
diff --git a/...lparser/statement/imprt/ScriptSource.java → ...er/statement/ScriptSourceDestination.java b/...lparser/statement/imprt/ScriptSource.java → ...er/statement/ScriptSourceDestination.java
@@ -7,16 +7,16 @@
  * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
  * #L%
  */
-package net.sf.jsqlparser.statement.imprt;
+package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.ConnectionDefinition;
+import net.sf.jsqlparser.statement.imprt.ImportFromItem;
 
 import java.io.Serializable;
 import java.util.List;
 
-public class ScriptSource extends ImportFromItem implements Serializable {
+public class ScriptSourceDestination extends ImportFromItem implements Serializable {
     private Table script;
     private ConnectionDefinition connectionDefinition;
     private List<String> properties;

diff --git a/...sqlparser/statement/imprt/DataSource.java → ...rser/statement/SourceDestinationType.java b/...sqlparser/statement/imprt/DataSource.java → ...rser/statement/SourceDestinationType.java
@@ -7,13 +7,7 @@
  * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
  * #L%
  */
-package net.sf.jsqlparser.statement.imprt;
+package net.sf.jsqlparser.statement;
 
-public enum DataSource {
-    EXA,
-    ORA,
-    JDBC,
-    CSV,
-    FBV,
-    SCRIPT
+public interface SourceDestinationType {
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/DBMSSource.java b/src/main/java/net/sf/jsqlparser/statement/imprt/DBMSSource.java
@@ -14,33 +14,25 @@
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.ConnectionDefinition;
+import net.sf.jsqlparser.statement.SourceDestinationType;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 import java.io.Serializable;
 import java.util.List;
 
 public class DBMSSource extends ImportFromItem implements Serializable {
-    private DataSource dataSource;
-    private StringValue jdbcDriverDefinition;
+    private SourceDestinationType sourceType;
     private ConnectionDefinition connectionDefinition;
     private Table table;
     private ExpressionList<Column> columns;
     private List<StringValue> statements;
 
-    public DataSource getDataSource() {
-        return dataSource;
+    public SourceDestinationType getSourceType() {
+        return sourceType;
     }
 
-    public void setDataSource(DataSource dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    public StringValue getJdbcDriverDefinition() {
-        return jdbcDriverDefinition;
-    }
-
-    public void setJdbcDriverDefinition(StringValue jdbcDriverDefinition) {
-        this.jdbcDriverDefinition = jdbcDriverDefinition;
+    public void setSourceType(SourceDestinationType sourceType) {
+        this.sourceType = sourceType;
     }
 
     public ConnectionDefinition getConnectionDefinition() {
@@ -79,11 +71,7 @@ public void setStatements(List<StringValue> statements) {
     public String toString() {
         StringBuilder sql = new StringBuilder();
 
-        sql.append(dataSource);
-
-        if (jdbcDriverDefinition != null) {
-            sql.append(" DRIVER = ").append(jdbcDriverDefinition);
-        }
+        sql.append(sourceType);
 
         sql.append(" ");
         sql.append(connectionDefinition);

diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/FileSource.java b/src/main/java/net/sf/jsqlparser/statement/imprt/FileSource.java
@@ -17,7 +17,7 @@
 import java.util.Objects;
 
 public class FileSource extends ImportFromItem implements Serializable {
-    private DataSource dataSource;
+    private SourceDestinationType sourceType;
     private List<ConnectionFileDefinition> connectionFileDefinitions;
     private Boolean local;
     private Boolean secure;
@@ -26,12 +26,12 @@ public class FileSource extends ImportFromItem implements Serializable {
     private List<FileOption> fileOptions;
     private CertificateVerification certificateVerification;
 
-    public DataSource getDataSource() {
-        return dataSource;
+    public SourceDestinationType getSourceType() {
+        return sourceType;
     }
 
-    public void setDataSource(DataSource dataSource) {
-        this.dataSource = dataSource;
+    public void setSourceType(SourceDestinationType sourceType) {
+        this.sourceType = sourceType;
     }
 
     public List<ConnectionFileDefinition> getConnectionFileDefinitions() {
@@ -104,7 +104,7 @@ public String toString() {
             }
         }
 
-        sql.append(dataSource);
+        sql.append(sourceType);
         if (connectionFileDefinitions != null) {
             sql.append(" ");
             PlainSelect.appendStringListTo(sql, connectionFileDefinitions, false, false);