[uRFsgcuC] Backport of 5.x ifNeeded quote fix (#4176)

* [uRFsgcuC] Backport of 5.x ifNeeded quote fix

* [uRFsgcuC] Tests

Author: JoelBergstrand

core-it/src/test/java/apoc/core/it/ExportCsvS3Test.java

@@ -95,7 +95,7 @@ public static void teardown() {
                     + ",,,,,,,,3,4,NEXT_DELIVERY%n");
     private static final String EXPECTED_NEEDED_QUOTES =
             String.format("_id,_labels,age,city,kids,male,name,street,_start,_end,_type%n"
-                    + "0,:User:User1,42,,\"[\"a\",\"b\",\"c\"]\",true,foo,,,,%n"
+                    + "0,:User:User1,42,,\"[\"\"a\"\",\"\"b\"\",\"\"c\"\"]\",true,foo,,,,%n"
                     + "1,:User,42,,,,bar,,,,%n"
                     + "2,:User,12,,,,,,,,%n"
                     + "3,:Address:Address1,,Milano,,,Andrea,\"Via Garibaldi, 7\",,,%n"

core/src/main/java/apoc/export/csv/CsvFormat.java

@@ -101,7 +101,7 @@ public ProgressInfo dump(SubGraph graph, ExportFileManager writer, Reporter repo
     private CSVWriter getCsvWriter(Writer writer, ExportConfig config) {
         CSVWriter out;
         switch (config.isQuotes()) {
-            case ExportConfig.NONE_QUOTES:
+            case ExportConfig.NO_QUOTES:
                 out = new CSVWriter(
                         writer,
                         config.getDelimChar(),
@@ -110,12 +110,12 @@ private CSVWriter getCsvWriter(Writer writer, ExportConfig config) {
                         CSVWriter.DEFAULT_LINE_END);
                 applyQuotesToAll = false;
                 break;
-            case ExportConfig.IF_NEEDED_QUUOTES:
+            case ExportConfig.IF_NEEDED_QUOTES:
                 out = new CSVWriter(
                         writer,
                         config.getDelimChar(),
                         ExportConfig.QUOTECHAR,
-                        '\0', // escape char
+                        CSVWriter.DEFAULT_ESCAPE_CHARACTER,
                         CSVWriter.DEFAULT_LINE_END);
                 applyQuotesToAll = false;
                 break;

core/src/main/java/apoc/export/util/ExportConfig.java

@@ -46,9 +46,9 @@ public NodeConfig(Map<String, String> config) {
     }
 
     public static final char QUOTECHAR = '"';
-    public static final String NONE_QUOTES = "none";
+    public static final String NO_QUOTES = "none";
     public static final String ALWAYS_QUOTES = "always";
-    public static final String IF_NEEDED_QUUOTES = "ifNeeded";
+    public static final String IF_NEEDED_QUOTES = "ifNeeded";
 
     public static final int DEFAULT_BATCH_SIZE = 20000;
     private static final int DEFAULT_UNWIND_BATCH_SIZE = 20;
@@ -196,12 +196,12 @@ private void exportQuotes(Map<String, Object> config) {
         try {
             this.quotes = (String) config.getOrDefault("quotes", DEFAULT_QUOTES);
 
-            if (!quotes.equals(ALWAYS_QUOTES) && !quotes.equals(NONE_QUOTES) && !quotes.equals(IF_NEEDED_QUUOTES)) {
+            if (!quotes.equals(ALWAYS_QUOTES) && !quotes.equals(NO_QUOTES) && !quotes.equals(IF_NEEDED_QUOTES)) {
                 throw new RuntimeException("The string value of the field quote is not valid");
             }
 
         } catch (ClassCastException e) { // backward compatibility
-            this.quotes = toBoolean(config.get("quotes")) ? ALWAYS_QUOTES : NONE_QUOTES;
+            this.quotes = toBoolean(config.get("quotes")) ? ALWAYS_QUOTES : NO_QUOTES;
         }
     }
 

core/src/test/java/apoc/export/csv/ExportCsvTest.java

@@ -91,10 +91,10 @@ public class ExportCsvTest {
                     + "\"Andrea\",\"Milano\",\"Via Garibaldi, 7\",\"[\"\"Address1\"\",\"\"Address\"\"]\"%n"
                     + "\"Bar Sport\",\"\",\"\",\"[\"\"Address\"\"]\"%n"
                     + "\"\",\"\",\"via Benni\",\"[\"\"Address\"\"]\"%n");
-    private static final String EXPECTED_QUERY_QUOTES_NEEDED = String.format(
-            "a.name,a.city,a.street,labels(a)%n" + "Andrea,Milano,\"Via Garibaldi, 7\",\"[\"Address1\",\"Address\"]\"%n"
-                    + "Bar Sport,,,\"[\"Address\"]\"%n"
-                    + ",,via Benni,\"[\"Address\"]\"%n");
+    private static final String EXPECTED_QUERY_QUOTES_NEEDED = String.format("a.name,a.city,a.street,labels(a)%n"
+            + "Andrea,Milano,\"Via Garibaldi, 7\",\"[\"\"Address1\"\",\"\"Address\"\"]\"%n"
+            + "Bar Sport,,,\"[\"\"Address\"\"]\"%n"
+            + ",,via Benni,\"[\"\"Address\"\"]\"%n");
     private static final String EXPECTED = String.format(
             "\"_id\",\"_labels\",\"age\",\"city\",\"kids\",\"male\",\"name\",\"street\",\"_start\",\"_end\",\"_type\"%n"
                     + "\"0\",\":User:User1\",\"42\",\"\",\"[\"\"a\"\",\"\"b\"\",\"\"c\"\"]\",\"true\",\"foo\",\"\",,,%n"
@@ -134,14 +134,24 @@ public class ExportCsvTest {
                     + ",,,,,,,,3,4,NEXT_DELIVERY%n");
     private static final String EXPECTED_NEEDED_QUOTES =
             String.format("_id,_labels,age,city,kids,male,name,street,_start,_end,_type%n"
-                    + "0,:User:User1,42,,\"[\"a\",\"b\",\"c\"]\",true,foo,,,,%n"
+                    + "0,:User:User1,42,,\"[\"\"a\"\",\"\"b\"\",\"\"c\"\"]\",true,foo,,,,%n"
                     + "1,:User,42,,,,bar,,,,%n"
                     + "2,:User,12,,,,,,,,%n"
                     + "3,:Address:Address1,,Milano,,,Andrea,\"Via Garibaldi, 7\",,,%n"
                     + "4,:Address,,,,,Bar Sport,,,,%n"
                     + "5,:Address,,,,,,via Benni,,,%n"
                     + ",,,,,,,,0,1,KNOWS%n"
                     + ",,,,,,,,3,4,NEXT_DELIVERY%n");
+    private static final String EXPECTED_QUOTES_ALWAYS =
+            "\"_id\",\"_labels\",\"age\",\"city\",\"kids\",\"male\",\"name\",\"street\",\"_start\",\"_end\",\"_type\"\n"
+                    + "\"0\",\":User:User1\",\"42\",\"\",\"[\"\"a\"\",\"\"b\"\",\"\"c\"\"]\",\"true\",\"foo\",\"\",,,\n"
+                    + "\"1\",\":User\",\"42\",\"\",\"\",\"\",\"bar\",\"\",,,\n"
+                    + "\"2\",\":User\",\"12\",\"\",\"\",\"\",\"\",\"\",,,\n"
+                    + "\"3\",\":Address:Address1\",\"\",\"Milano\",\"\",\"\",\"Andrea\",\"Via Garibaldi, 7\",,,\n"
+                    + "\"4\",\":Address\",\"\",\"\",\"\",\"\",\"Bar Sport\",\"\",,,\n"
+                    + "\"5\",\":Address\",\"\",\"\",\"\",\"\",\"\",\"via Benni\",,,\n"
+                    + ",,,,,,,,\"0\",\"1\",\"KNOWS\"\n"
+                    + ",,,,,,,,\"3\",\"4\",\"NEXT_DELIVERY\"\n";
 
     private static final File directory = new File("target/import");
 
@@ -367,6 +377,17 @@ public void testExportAllCsvNeededQuotes() {
         assertEquals(EXPECTED_NEEDED_QUOTES, readFile(fileName));
     }
 
+    @Test
+    public void testExportAllCsvAlwaysQuotes() {
+        String fileName = "all.csv";
+        TestUtil.testCall(
+                db,
+                "CALL apoc.export.csv.all($file,{quotes: 'always'})",
+                map("file", fileName),
+                (r) -> assertResults(fileName, r, "database"));
+        assertEquals(EXPECTED_QUOTES_ALWAYS, readFile(fileName));
+    }
+
     @Test
     public void testExportGraphCsv() {
         String fileName = "graph.csv";
@@ -698,6 +719,41 @@ public void testExportWgsPoint() {
         db.executeTransactionally("MATCH (n:Position) DETACH DELETE n");
     }
 
+    @Test
+    public void testGithubIssue4120() {
+        String query = "UNWIND [\"\\\"Jan\\\" Apoc User\", \"\\\"Jan\\\" Apoc\\\"\\\" User\"] AS name RETURN name";
+        String expected = "name\n" + "\"\"\"Jan\"\" Apoc User\"\n" + "\"\"\"Jan\"\" Apoc\"\"\"\" User\"\n";
+        StringBuilder sb = new StringBuilder();
+        testResult(
+                db,
+                "CALL apoc.export.csv.query($query,null,{quotes: 'ifNeeded', stream:true,batchSize:2})",
+                map("query", query),
+                (res) -> {
+                    Map<String, Object> r = res.next();
+                    assertEquals(2L, r.get("batchSize"));
+                    assertEquals(1L, r.get("batches"));
+                    assertEquals(0L, r.get("nodes"));
+                    assertEquals(2L, r.get("rows"));
+                    assertEquals(0L, r.get("relationships"));
+                    assertEquals(2L, r.get("properties"));
+                    assertNull("Should get file", r.get("file"));
+                    assertEquals("csv", r.get("format"));
+                    assertTrue("Should get time greater than 0", ((long) r.get("time")) >= 0);
+                    sb.append(r.get("data"));
+                    r = res.next();
+                    assertEquals(2L, r.get("batchSize"));
+                    assertEquals(2L, r.get("batches"));
+                    assertEquals(0L, r.get("nodes"));
+                    assertEquals(2L, r.get("rows"));
+                    assertEquals(0L, r.get("relationships"));
+                    assertEquals(2L, r.get("properties"));
+                    assertTrue("Should get time greater than 0", ((long) r.get("time")) >= 0);
+                    sb.append(r.get("data"));
+                });
+
+        assertEquals(expected, sb.toString());
+    }
+
     private Consumer<Result> getAndCheckStreamingMetadataQueryMatchAddress(StringBuilder sb) {
         return (res) -> {
             Map<String, Object> r = res.next();