test: Implement unit tests for IMPORT

Stefan Steinhauser · Stefan Steinhauser · commit 0130d56472ac · 2025-02-07T09:01:42.000+01:00
diff --git a/src/main/java/net/sf/jsqlparser/statement/CloudConnectionDefinition.java b/src/main/java/net/sf/jsqlparser/statement/CloudConnectionDefinition.java
@@ -29,6 +29,7 @@ public String toString() {
 
         sql.append("AT CLOUD ");
         sql.append(storage);
+        sql.append(" ");
         appendConnectionDefinition(sql);
 
         return sql.toString();
diff --git a/src/main/java/net/sf/jsqlparser/statement/ConnectionFileDefinition.java b/src/main/java/net/sf/jsqlparser/statement/ConnectionFileDefinition.java
@@ -46,7 +46,10 @@ public void setFilePaths(List<StringValue> filePaths) {
     public String toString() {
         StringBuilder sql = new StringBuilder();
 
-        sql.append(connectionDefinition);
+        if (connectionDefinition != null) {
+            sql.append(connectionDefinition);
+        }
+
         for (StringValue filePath : filePaths) {
             sql.append(" FILE ").append(filePath);
         }
diff --git a/src/main/java/net/sf/jsqlparser/statement/FBVColumn.java b/src/main/java/net/sf/jsqlparser/statement/FBVColumn.java
@@ -17,10 +17,18 @@ public class FBVColumn {
     private boolean precedesComma;
     private String key;
     private Expression value;
+    private String stringValue;
 
     private FBVColumn(String key, Expression value) {
         this.key = key;
         this.value = value;
+        this.stringValue = null;
+    }
+
+    public FBVColumn(String key, String value) {
+        this.key = key;
+        this.value = null;
+        this.stringValue = value;
     }
 
     public FBVColumn(String key, StringValue value) {
@@ -51,12 +59,22 @@ public Expression getValue() {
         return value;
     }
 
-    public void setValue(StringValue value) {
+    public void setValue(String value) {
+        this.stringValue = value;
+        this.value = null;
+    }
+
+    private void setValue(Expression value) {
         this.value = value;
+        this.stringValue = null;
+    }
+
+    public void setValue(StringValue value) {
+        setValue((Expression) value);
     }
 
     public void setValue(LongValue value) {
-        this.value = value;
+        setValue((Expression) value);
     }
 
     @Override
@@ -69,7 +87,11 @@ public String toString() {
 
         sql.append(key);
         sql.append(" = ");
-        sql.append(value);
+        if (stringValue != null) {
+            sql.append(stringValue);
+        } else {
+            sql.append(value);
+        }
 
         return sql.toString();
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/LikeClause.java b/src/main/java/net/sf/jsqlparser/statement/LikeClause.java
@@ -99,7 +99,10 @@ public void setExcludingComments(Boolean excludingComments) {
     public StringBuilder appendTo(StringBuilder builder) {
         builder.append(" LIKE ");
         builder.append(table);
-        PlainSelect.appendStringListTo(builder, columnsList, true, false);
+        if (columnsList != null) {
+            builder.append(" ");
+            PlainSelect.appendStringListTo(builder, columnsList, true, true);
+        }
 
         if (includingDefaults != null) {
             if (includingDefaults) {
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/FileSource.java b/src/main/java/net/sf/jsqlparser/statement/imprt/FileSource.java
@@ -14,6 +14,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class FileSource extends ImportFromItem implements Serializable {
     private DataSource dataSource;
@@ -98,29 +99,37 @@ public String toString() {
                 sql.append("LOCAL ");
             }
 
-            if (secure) {
+            if (Objects.requireNonNullElse(secure, false)) {
                 sql.append("SECURE ");
             }
         }
 
         sql.append(dataSource);
-        PlainSelect.appendStringListTo(sql, connectionFileDefinitions, false, false);
+        if (connectionFileDefinitions != null) {
+            sql.append(" ");
+            PlainSelect.appendStringListTo(sql, connectionFileDefinitions, false, false);
+        }
 
         if (csvColumns != null) {
+            sql.append(" ");
             PlainSelect.appendStringListTo(sql, csvColumns, true, true);
         } else if (fbvColumns != null) {
+            sql.append(" ");
             PlainSelect.appendStringListTo(sql, fbvColumns, false, true);
         }
 
         if (fileOptions != null) {
+            sql.append(" ");
             PlainSelect.appendStringListTo(sql, fileOptions, false, false);
         }
 
         if (certificateVerification != null) {
+            sql.append(" ");
             sql.append(certificateVerification);
         }
 
         if (errorClause != null) {
+            sql.append(" ");
             sql.append(errorClause);
         }
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/imprt/Import.java b/src/main/java/net/sf/jsqlparser/statement/imprt/Import.java
@@ -71,9 +71,10 @@ public String toString() {
             } else {
                 PlainSelect.appendStringListTo(sql, importColumns, true, true);
             }
+            sql.append(" ");
         }
 
-        sql.append(" FROM ");
+        sql.append("FROM ");
         sql.append(fromItem);
 
         return sql.toString();
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1052,7 +1052,7 @@ LikeClause LikeClause(): {
 } {
     <K_LIKE>
     table = Table() { likeClause.setTable(table); }
-    [ LOOKAHEAD(2) columnsList = ColumnSelectItemsList() { likeClause.setColumnsList(columnsList); }]
+    [ "(" columnsList = ColumnSelectItemsList() ")" { likeClause.setColumnsList(columnsList); }]
 
     [
         LOOKAHEAD(2)
@@ -1196,7 +1196,6 @@ DBMSSource DBMSSource() #DBMSSource: {
 
 FileSource FileSource() #FileSource: {
   FileSource fileSource = new FileSource();
-  ConnectionDefinition connectionDefinition;
   List<ConnectionFileDefinition> connectionFileDefinitions = new ArrayList<ConnectionFileDefinition>();
   List<StringValue> filePaths;
   CertificateVerification certificateVerification;
@@ -1213,10 +1212,11 @@ FileSource FileSource() #FileSource: {
         )
 
         (
-          (
-              LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()
-            | connectionDefinition = CloudConnectionDefinition()
-          )
+          { ConnectionDefinition connectionDefinition = null; }
+          [
+              LOOKAHEAD(2) connectionDefinition = CloudConnectionDefinition()
+            | connectionDefinition = ConnectionDefinition()
+          ]
           <K_FILE> token = <S_CHAR_LITERAL>
           {
             filePaths = new ArrayList<StringValue>();
@@ -1225,6 +1225,7 @@ FileSource FileSource() #FileSource: {
             filePaths.add(stringVal);
           }
           (
+            LOOKAHEAD(2)
             <K_FILE> token = <S_CHAR_LITERAL>
             {
               stringVal = new StringValue(token.image);
@@ -1238,10 +1239,11 @@ FileSource FileSource() #FileSource: {
         (
           LOOKAHEAD(2)
           (
-            (
-                LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()
-              | connectionDefinition = CloudConnectionDefinition()
-            )
+            { connectionDefinition = null; }
+            [
+                LOOKAHEAD(2) connectionDefinition = CloudConnectionDefinition()
+              | connectionDefinition = ConnectionDefinition()
+            ]
             <K_FILE> token = <S_CHAR_LITERAL>
             {
               filePaths = new ArrayList<StringValue>();
@@ -1250,6 +1252,7 @@ FileSource FileSource() #FileSource: {
               filePaths.add(stringVal);
             }
             (
+              LOOKAHEAD(2)
               <K_FILE> token = <S_CHAR_LITERAL>
               {
                 stringVal = new StringValue(token.image);
@@ -1345,7 +1348,7 @@ FileSource FileSource() #FileSource: {
                       token2=<K_LEFT>
                     | token2=<K_RIGHT>
                   )
-                  { fbvColumn = new FBVColumn(token.image, new StringValue(token2.image)); }
+                  { fbvColumn = new FBVColumn(token.image, token2.image); }
               )
               {
                 List<FBVColumn> fbvColumns = new ArrayList<FBVColumn>();
@@ -1373,7 +1376,7 @@ FileSource FileSource() #FileSource: {
                       token2=<K_LEFT>
                     | token2=<K_RIGHT>
                   )
-                  { fbvColumn = new FBVColumn(token.image, new StringValue(token2.image)); }
+                  { fbvColumn = new FBVColumn(token.image, token2.image); }
               )
               {
                 fbvColumn.setPrecedesComma(precedesComma);
@@ -1632,8 +1635,8 @@ CSVFileDestination CSVFileDestination(): {
     (
           <K_CSV>
           (
-              LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()
-            | connectionDefinition = CloudConnectionDefinition()
+              LOOKAHEAD(2) connectionDefinition = CloudConnectionDefinition()
+            | connectionDefinition = ConnectionDefinition()
           )
           { csvFileDestination.setConnectionDefinition(connectionDefinition); }
         | <K_LOCAL> { csvFileDestination.setLocal(true); }
diff --git a/src/test/java/net/sf/jsqlparser/statement/imprt/ImportTest.java b/src/test/java/net/sf/jsqlparser/statement/imprt/ImportTest.java

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`import java.io.Serializable;`
`16`	`16`	`import java.util.List;`
	`17`	`+import java.util.Objects;`
`17`	`18`
`18`	`19`	`public class FileSource extends ImportFromItem implements Serializable {`
`19`	`20`	`private DataSource dataSource;`
`@@ -98,29 +99,37 @@ public String toString() {`
`98`	`99`	`sql.append("LOCAL ");`
`99`	`100`	`}`
`100`	`101`
`101`		`- if (secure) {`
	`102`	`+ if (Objects.requireNonNullElse(secure, false)) {`
`102`	`103`	`sql.append("SECURE ");`
`103`	`104`	`}`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`sql.append(dataSource);`
`107`		`- PlainSelect.appendStringListTo(sql, connectionFileDefinitions, false, false);`
	`108`	`+ if (connectionFileDefinitions != null) {`
	`109`	`+ sql.append(" ");`
	`110`	`+ PlainSelect.appendStringListTo(sql, connectionFileDefinitions, false, false);`
	`111`	`+ }`
`108`	`112`
`109`	`113`	`if (csvColumns != null) {`
	`114`	`+ sql.append(" ");`
`110`	`115`	`PlainSelect.appendStringListTo(sql, csvColumns, true, true);`
`111`	`116`	`} else if (fbvColumns != null) {`
	`117`	`+ sql.append(" ");`
`112`	`118`	`PlainSelect.appendStringListTo(sql, fbvColumns, false, true);`
`113`	`119`	`}`
`114`	`120`
`115`	`121`	`if (fileOptions != null) {`
	`122`	`+ sql.append(" ");`
`116`	`123`	`PlainSelect.appendStringListTo(sql, fileOptions, false, false);`
`117`	`124`	`}`
`118`	`125`
`119`	`126`	`if (certificateVerification != null) {`
	`127`	`+ sql.append(" ");`
`120`	`128`	`sql.append(certificateVerification);`
`121`	`129`	`}`
`122`	`130`
`123`	`131`	`if (errorClause != null) {`
	`132`	`+ sql.append(" ");`
`124`	`133`	`sql.append(errorClause);`
`125`	`134`	`}`
`126`	`135`
Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,10 @@ public String toString() {`
`71`	`71`	`} else {`
`72`	`72`	`PlainSelect.appendStringListTo(sql, importColumns, true, true);`
`73`	`73`	`}`
	`74`	`+ sql.append(" ");`
`74`	`75`	`}`
`75`	`76`
`76`		`- sql.append(" FROM ");`
	`77`	`+ sql.append("FROM ");`
`77`	`78`	`sql.append(fromItem);`
`78`	`79`
`79`	`80`	`return sql.toString();`
Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,7 @@ LikeClause LikeClause(): {`
`1052`	`1052`	`} {`
`1053`	`1053`	`<K_LIKE>`
`1054`	`1054`	`table = Table() { likeClause.setTable(table); }`
`1055`		`- [ LOOKAHEAD(2) columnsList = ColumnSelectItemsList() { likeClause.setColumnsList(columnsList); }]`
	`1055`	`+ [ "(" columnsList = ColumnSelectItemsList() ")" { likeClause.setColumnsList(columnsList); }]`
`1056`	`1056`
`1057`	`1057`	`[`
`1058`	`1058`	`LOOKAHEAD(2)`
`@@ -1196,7 +1196,6 @@ DBMSSource DBMSSource() #DBMSSource: {`
`1196`	`1196`
`1197`	`1197`	`FileSource FileSource() #FileSource: {`
`1198`	`1198`	`FileSource fileSource = new FileSource();`
`1199`		`- ConnectionDefinition connectionDefinition;`
`1200`	`1199`	`List<ConnectionFileDefinition> connectionFileDefinitions = new ArrayList<ConnectionFileDefinition>();`
`1201`	`1200`	`List<StringValue> filePaths;`
`1202`	`1201`	`CertificateVerification certificateVerification;`
`@@ -1213,10 +1212,11 @@ FileSource FileSource() #FileSource: {`
`1213`	`1212`	`)`
`1214`	`1213`
`1215`	`1214`	`(`
`1216`		`- (`
`1217`		`- LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()`
`1218`		`- \| connectionDefinition = CloudConnectionDefinition()`
`1219`		`- )`
	`1215`	`+ { ConnectionDefinition connectionDefinition = null; }`
	`1216`	`+ [`
	`1217`	`+ LOOKAHEAD(2) connectionDefinition = CloudConnectionDefinition()`
	`1218`	`+ \| connectionDefinition = ConnectionDefinition()`
	`1219`	`+ ]`
`1220`	`1220`	`<K_FILE> token = <S_CHAR_LITERAL>`
`1221`	`1221`	`{`
`1222`	`1222`	`filePaths = new ArrayList<StringValue>();`
`@@ -1225,6 +1225,7 @@ FileSource FileSource() #FileSource: {`
`1225`	`1225`	`filePaths.add(stringVal);`
`1226`	`1226`	`}`
`1227`	`1227`	`(`
	`1228`	`+ LOOKAHEAD(2)`
`1228`	`1229`	`<K_FILE> token = <S_CHAR_LITERAL>`
`1229`	`1230`	`{`
`1230`	`1231`	`stringVal = new StringValue(token.image);`
`@@ -1238,10 +1239,11 @@ FileSource FileSource() #FileSource: {`
`1238`	`1239`	`(`
`1239`	`1240`	`LOOKAHEAD(2)`
`1240`	`1241`	`(`
`1241`		`- (`
`1242`		`- LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()`
`1243`		`- \| connectionDefinition = CloudConnectionDefinition()`
`1244`		`- )`
	`1242`	`+ { connectionDefinition = null; }`
	`1243`	`+ [`
	`1244`	`+ LOOKAHEAD(2) connectionDefinition = CloudConnectionDefinition()`
	`1245`	`+ \| connectionDefinition = ConnectionDefinition()`
	`1246`	`+ ]`
`1245`	`1247`	`<K_FILE> token = <S_CHAR_LITERAL>`
`1246`	`1248`	`{`
`1247`	`1249`	`filePaths = new ArrayList<StringValue>();`
`@@ -1250,6 +1252,7 @@ FileSource FileSource() #FileSource: {`
`1250`	`1252`	`filePaths.add(stringVal);`
`1251`	`1253`	`}`
`1252`	`1254`	`(`
	`1255`	`+ LOOKAHEAD(2)`
`1253`	`1256`	`<K_FILE> token = <S_CHAR_LITERAL>`
`1254`	`1257`	`{`
`1255`	`1258`	`stringVal = new StringValue(token.image);`
`@@ -1345,7 +1348,7 @@ FileSource FileSource() #FileSource: {`
`1345`	`1348`	`token2=<K_LEFT>`
`1346`	`1349`	`\| token2=<K_RIGHT>`
`1347`	`1350`	`)`
`1348`		`- { fbvColumn = new FBVColumn(token.image, new StringValue(token2.image)); }`
	`1351`	`+ { fbvColumn = new FBVColumn(token.image, token2.image); }`
`1349`	`1352`	`)`
`1350`	`1353`	`{`
`1351`	`1354`	`List<FBVColumn> fbvColumns = new ArrayList<FBVColumn>();`
`@@ -1373,7 +1376,7 @@ FileSource FileSource() #FileSource: {`
`1373`	`1376`	`token2=<K_LEFT>`
`1374`	`1377`	`\| token2=<K_RIGHT>`
`1375`	`1378`	`)`
`1376`		`- { fbvColumn = new FBVColumn(token.image, new StringValue(token2.image)); }`
	`1379`	`+ { fbvColumn = new FBVColumn(token.image, token2.image); }`
`1377`	`1380`	`)`
`1378`	`1381`	`{`
`1379`	`1382`	`fbvColumn.setPrecedesComma(precedesComma);`
`@@ -1632,8 +1635,8 @@ CSVFileDestination CSVFileDestination(): {`
`1632`	`1635`	`(`
`1633`	`1636`	`<K_CSV>`
`1634`	`1637`	`(`
`1635`		`- LOOKAHEAD(2) connectionDefinition = ConnectionDefinition()`
`1636`		`- \| connectionDefinition = CloudConnectionDefinition()`
	`1638`	`+ LOOKAHEAD(2) connectionDefinition = CloudConnectionDefinition()`
	`1639`	`+ \| connectionDefinition = ConnectionDefinition()`
`1637`	`1640`	`)`
`1638`	`1641`	`{ csvFileDestination.setConnectionDefinition(connectionDefinition); }`
`1639`	`1642`	`\| <K_LOCAL> { csvFileDestination.setLocal(true); }`