fixes #161 - writing CSV with autoquote enabled should quote strings …

…containing linebreak
d99kris · Mar 31, 2024 · f438d37 · f438d37
1 parent 7e87d8c
commit f438d37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/rapidcsv.h b/src/rapidcsv.h
@@ -2,7 +2,7 @@
  * rapidcsv.h
  *
  * URL:      https://github.com/d99kris/rapidcsv
- * Version:  8.82
+ * Version:  8.83
  *
  * Copyright (C) 2017-2024 Kristofer Berggren
  * All rights reserved.
@@ -1748,7 +1748,8 @@ namespace rapidcsv
         {
           if (mSeparatorParams.mAutoQuote &&
               ((itc->find(mSeparatorParams.mSeparator) != std::string::npos) ||
-               (itc->find(' ') != std::string::npos)))
+               (itc->find(' ') != std::string::npos) ||
+               (itc->find('\n') != std::string::npos)))
           {
             // escape quotes in string
             std::string str = *itc;

diff --git a/tests/test067.cpp b/tests/test067.cpp
@@ -14,6 +14,7 @@ int main()
     "\"a b\"\n"
     "\"\"\"a b\"\"\"\n"
     "\" \"\"a\"\" \"\n"
+    "\"a\nb\"\n"
   ;
 
   std::string csvreadref =
@@ -22,6 +23,7 @@ int main()
     "\"a b\"\n"
     "\"\"\"a b\"\"\"\n"
     "\" \"\"a\"\" \"\n"
+    "\"a\nb\"\n"
   ;
 
   std::string path = unittest::TempPath();
@@ -33,20 +35,21 @@ int main()
     {
       rapidcsv::Document doc(path, rapidcsv::LabelParams(0 /* pColumnNameIdx */, -1 /* pRowNameIdx */),
                              rapidcsv::SeparatorParams(',', false /* pTrim */, rapidcsv::sPlatformHasCR /* pHasCR */,
-                                                       false /* pQuotedLinebreaks */, true /* pAutoQuote */));
+                                                       true /* pQuotedLinebreaks */, true /* pAutoQuote */));
       unittest::ExpectEqual(std::string, doc.GetCell<std::string>("col 1", 0), "");
       unittest::ExpectEqual(std::string, doc.GetCell<std::string>("col 1", 1), " ");
       unittest::ExpectEqual(std::string, doc.GetCell<std::string>("col 1", 2), "a b");
       unittest::ExpectEqual(std::string, doc.GetCell<std::string>("col 1", 3), "\"a b\"");
       unittest::ExpectEqual(std::string, doc.GetCell<std::string>("col 1", 4), " \"a\" ");
+      unittest::ExpectEqual(std::string, doc.GetCell<std::string>("col 1", 5), "a\nb");
     }
 
     // write
     {
       unittest::WriteFile(path, csvreadref);
       rapidcsv::Document doc(path, rapidcsv::LabelParams(0 /* pColumnNameIdx */, -1 /* pRowNameIdx */),
                              rapidcsv::SeparatorParams(',', false /* pTrim */, rapidcsv::sPlatformHasCR /* pHasCR */,
-                                                       false /* pQuotedLinebreaks */, true /* pAutoQuote */));
+                                                       true /* pQuotedLinebreaks */, true /* pAutoQuote */));
 
       doc.Save();
       const std::string& csvread = unittest::ReadFile(path);