fix: Fix SourceDestinationType implementations

manticore-projects · Jun 10, 2025 · Feb 3, 2025 · Feb 3, 2025 · Feb 4, 2025 · Feb 4, 2025
commit 223143a3b07929335ac0fbe1d7094c605a65bc06
diff --git a/src/main/java/net/sf/jsqlparser/statement/DBMSType.java b/src/main/java/net/sf/jsqlparser/statement/DBMSType.java
@@ -11,13 +11,27 @@
 
 import net.sf.jsqlparser.expression.StringValue;
 
-public enum DBMSType implements SourceDestinationType {
-    EXA,
-    ORA,
-    JDBC;
-
+public class DBMSType implements SourceDestinationType {
+    private final Kind dbmsType;
     private StringValue jdbcDriverDefinition;
 
+    public DBMSType(String dbmsType) {
+        this(dbmsType, null);
+    }
+
+    public DBMSType(String dbmsType, String jdbcDriverDefinition) {
+        this.dbmsType = Kind.valueOf(dbmsType.toUpperCase());
+        if (jdbcDriverDefinition != null) {
+            this.jdbcDriverDefinition = new StringValue(jdbcDriverDefinition);
+        }
+    }
+
+    private enum Kind {
+        EXA,
+        ORA,
+        JDBC
+    }
+
     public StringValue getJDBCDriverDefinition() {
         return jdbcDriverDefinition;
     }
@@ -30,7 +44,7 @@ public void setJDBCDriverDefinition(StringValue jdbcDriverDefinition) {
     public String toString() {
         StringBuilder sql = new StringBuilder();
 
-        sql.append(super.toString());
+        sql.append(dbmsType);
         if (jdbcDriverDefinition != null) {
             sql.append(" DRIVER = ").append(jdbcDriverDefinition);
         }

diff --git a/src/main/java/net/sf/jsqlparser/statement/FileType.java b/src/main/java/net/sf/jsqlparser/statement/FileType.java
@@ -9,7 +9,20 @@
  */
 package net.sf.jsqlparser.statement;
 
-public enum FileType implements SourceDestinationType {
-    CSV,
-    FBV
+public class FileType implements SourceDestinationType {
+    private final Kind fileType;
+
+    public FileType(String fileType) {
+        this.fileType = Kind.valueOf(fileType.toUpperCase());
+    }
+
+    private enum Kind {
+        CSV,
+        FBV
+    }
+
+    @Override
+    public String toString() {
+        return fileType.toString();
+    }
 }
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1419,7 +1419,6 @@ DBMSSource DBMSSource() #DBMSSource: {
     Table table;
     ExpressionList<Column> columns;
     List<StringValue> statements;
-    Token token;
 } {
     dbmsType = DBMSType() { dbmsSource.setSourceType(dbmsType); }
 
@@ -1437,26 +1436,28 @@ DBMSSource DBMSSource() #DBMSSource: {
 
 DBMSType DBMSType(): {
     DBMSType dbmsType;
+    Token tk1;
+    Token tk2 = null;
 } {
     (
-        <K_EXA> { dbmsType = DBMSType.EXA; }
-      | <K_ORA> { dbmsType = DBMSType.ORA; }
-      | <K_JDBC> { dbmsType = DBMSType.JDBC; }
-        [<K_DRIVER> "=" token = <S_CHAR_LITERAL> { dbmsType.setJDBCDriverDefinition(new StringValue(token.image)); }]
-    )
-
+        tk1=<K_EXA>
+      | tk1=<K_ORA>
+      | tk1=<K_JDBC>
+        [<K_DRIVER> "=" tk2=<S_CHAR_LITERAL>]
+    ) { dbmsType = new DBMSType(tk1.image, tk2 == null ? null : tk2.image); }
     {
         return dbmsType;
     }
 }
 
 FileType FileType(): {
     FileType fileType;
+    Token tk;
 } {
     (
-        <K_CSV> { fileType = FileType.CSV; }
-      | <K_FBV> { fileType = FileType.FBV; }
-    )
+        tk=<K_CSV>
+      | tk=<K_FBV>
+    ) { fileType = new FileType(tk.image); }
     {
         return fileType;
     }