diff --git a/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/SqlWriter.java b/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/SqlWriter.java index 4d6ff713..18a9c1be 100644 --- a/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/SqlWriter.java +++ b/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/SqlWriter.java @@ -15,13 +15,15 @@ public class SqlWriter implements UnstructuredWriter { private String quoteChar; private String lineSeparator; private String tableName; + private String nullFormat; private StringBuilder insertPrefix; - public SqlWriter(Writer writer, String quoteChar, String tableName, String lineSeparator, List columnNames) { + public SqlWriter(Writer writer, String quoteChar, String tableName, String lineSeparator, List columnNames, String nullFormat) { this.sqlWriter = writer; this.quoteChar = quoteChar; this.lineSeparator = lineSeparator; - this.tableName = tableName; + this.tableName = quoteChar + tableName + quoteChar; + this.nullFormat = nullFormat; buildInsertPrefix(columnNames); } @@ -33,7 +35,12 @@ public class SqlWriter implements UnstructuredWriter { } StringBuilder sqlPatten = new StringBuilder(4096).append(insertPrefix); - sqlPatten.append(splitedRows.stream().map(e -> "'" + DataXCsvWriter.replace(e, "'", "''") + "'").collect(Collectors.joining(","))); + sqlPatten.append(splitedRows.stream().map(e -> { + if (nullFormat.equals(e)) { + return "NULL"; + } + return "'" + DataXCsvWriter.replace(e, "'", "''") + "'"; + }).collect(Collectors.joining(","))); sqlPatten.append(");").append(lineSeparator); this.sqlWriter.write(sqlPatten.toString()); } diff --git a/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/UnstructuredStorageWriterUtil.java b/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/UnstructuredStorageWriterUtil.java index 4ce6461c..e74e5698 100755 --- a/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/UnstructuredStorageWriterUtil.java +++ b/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/UnstructuredStorageWriterUtil.java @@ -283,7 +283,8 @@ public class UnstructuredStorageWriterUtil { String lineSeparator = config.getString(Key.LINE_DELIMITER, IOUtils.LINE_SEPARATOR); List headers = config.getList(Key.HEADER, String.class); Preconditions.checkArgument(CollectionUtils.isNotEmpty(headers), "column names are empty"); - unstructuredWriter = new SqlWriter(writer, quoteChar, tableName, lineSeparator, headers); + String nullFormat = config.getString(Key.NULL_FORMAT, Constant.DEFAULT_NULL_FORMAT); + unstructuredWriter = new SqlWriter(writer, quoteChar, tableName, lineSeparator, headers, nullFormat); } return unstructuredWriter;