test: Fix EXPORT unit tests

Author: Stefan Steinhauser

src/main/java/net/sf/jsqlparser/statement/CSVColumn.java

@@ -78,7 +78,9 @@ public String toString() {
             if (format != null) {
                 sql.append(" FORMAT = ");
                 sql.append(format);
-            } else {
+            }
+
+            if (delimit != null) {
                 sql.append(" DELIMIT = ");
                 sql.append(delimit);
             }

src/main/java/net/sf/jsqlparser/statement/export/DBMSTableDestinationOption.java

@@ -56,6 +56,7 @@ public String toString() {
 
         sql.append(key);
         if (value != null) {
+            sql.append(" ");
             sql.append(value);
         }
 

src/test/java/net/sf/jsqlparser/statement/export/ExportTest.java

@@ -50,7 +50,8 @@ public void testExportIntoFileCSV(String sqlStr) throws JSQLParserException {
             "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1 DELIMIT = ALWAYS )",
             "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1 DELIMIT = NEVER )",
             "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1 DELIMIT = AUTO )",
-            "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1 FORMAT = 'format', 2 FORMAT = 'format', DELIMIT = ALWAYS )",
+            "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1 FORMAT = 'format', 2 DELIMIT = NEVER )",
+            "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1 FORMAT = 'format', 2 DELIMIT = NEVER, 3 FORMAT = 'format' DELIMIT = ALWAYS )",
             "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1 .. 2 )",
             "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1, 1 .. 2 )",
             "EXPORT schemaName.tableName INTO LOCAL CSV FILE 'file.csv' ( 1, 1 .. 2, 3 )"
@@ -77,11 +78,11 @@ public void testExportIntoFileFBV(String sqlStr) throws JSQLParserException {
             "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( FORMAT = 'format' )",
             "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( ALIGN = LEFT )",
             "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( ALIGN = RIGHT )",
-            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( PADDING = 'padding' )",
+            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( PADDING = '0' )",
 
-            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( SIZE = 1, START = 1 )",
-            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( SIZE = 1 START = 1 )",
-            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( SIZE = 1 START = 1, FORMAT = 'format' )"
+            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( SIZE = 1, PADDING = '0' )",
+            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( SIZE = 1 PADDING = '0' )",
+            "EXPORT schemaName.tableName INTO LOCAL FBV FILE 'file.fbv' ( SIZE = 1 PADDING = '0', FORMAT = 'format' )"
     })
     public void testExportIntoFileFBVCols(String sqlStr) throws JSQLParserException {
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr);