Merge pull request #609 from rootvector2/none-quote-escape

Escape quote char in printWithEscapes when QuoteMode is NONE

Author: garydgregory

src/main/java/org/apache/commons/csv/CSVFormat.java

@@ -2324,12 +2324,14 @@ private void printWithEscapes(final CharSequence charSeq, final Appendable appen
         final char[] delimArray = getDelimiterCharArray();
         final int delimLength = delimArray.length;
         final char escape = getEscapeChar();
+        final boolean quoteSet = isQuoteCharacterSet();
+        final char quote = quoteSet ? getQuoteCharacter().charValue() : 0;
         while (pos < end) {
             char c = charSeq.charAt(pos);
             final boolean isDelimiterStart = isDelimiter(c, charSeq, pos, delimArray, delimLength);
             final boolean isCr = c == Constants.CR;
             final boolean isLf = c == Constants.LF;
-            if (isCr || isLf || c == escape || isDelimiterStart) {
+            if (isCr || isLf || c == escape || quoteSet && c == quote || isDelimiterStart) {
                 // write out segment up until this char
                 if (pos > start) {
                     appendable.append(charSeq, start, pos);
@@ -2368,6 +2370,8 @@ private void printWithEscapes(final Reader reader, final Appendable appendable)
         final char[] delimArray = getDelimiterCharArray();
         final int delimLength = delimArray.length;
         final char escape = getEscapeChar();
+        final boolean quoteSet = isQuoteCharacterSet();
+        final char quote = quoteSet ? getQuoteCharacter().charValue() : 0;
         final StringBuilder builder = new StringBuilder(IOUtils.DEFAULT_BUFFER_SIZE);
         int c;
         final char[] lookAheadBuffer = new char[delimLength - 1];
@@ -2379,7 +2383,7 @@ private void printWithEscapes(final Reader reader, final Appendable appendable)
             final boolean isDelimiterStart = isDelimiter((char) c, test, pos, delimArray, delimLength);
             final boolean isCr = c == Constants.CR;
             final boolean isLf = c == Constants.LF;
-            if (isCr || isLf || c == escape || isDelimiterStart) {
+            if (isCr || isLf || c == escape || quoteSet && c == quote || isDelimiterStart) {
                 // write out segment up until this char
                 if (pos > start) {
                     append(builder.substring(start, pos), appendable);

src/test/java/org/apache/commons/csv/CSVPrinterTest.java

@@ -423,6 +423,26 @@ void testDelimeterStringQuoteNone() throws IOException {
         }
     }
 
+    @Test
+    void testQuoteCharEscapedWithQuoteModeNone() throws IOException {
+        final CSVFormat format = CSVFormat.DEFAULT.builder().setQuote('"').setEscape('?').setQuoteMode(QuoteMode.NONE).get();
+        final StringWriter sw = new StringWriter();
+        try (CSVPrinter printer = new CSVPrinter(sw, format)) {
+            printer.printRecord("\"abc", "x\"y");
+            printer.printRecord(new StringReader("\"abc"), new StringReader("x\"y"));
+        }
+        assertEquals("?\"abc,x?\"y" + RECORD_SEPARATOR + "?\"abc,x?\"y" + RECORD_SEPARATOR, sw.toString());
+        // The emitted records must read back as the original values.
+        try (CSVParser parser = CSVParser.parse(sw.toString(), format)) {
+            final List<CSVRecord> records = parser.getRecords();
+            assertEquals(2, records.size());
+            for (final CSVRecord record : records) {
+                assertEquals("\"abc", record.get(0));
+                assertEquals("x\"y", record.get(1));
+            }
+        }
+    }
+
     @Test
     void testDelimiterEscaped() throws IOException {
         final StringWriter sw = new StringWriter();