Added new parameter ForceQuotesAroundValues

Author: RikuVirtanen

Frends.Csv.Tests/Tests.cs

@@ -215,39 +215,50 @@ public void TestWriteFromListTable()
                 new List<object>() {100, "Dilantin", "Melanie", date}
             };
 
-            var result = Csv.Create(new CreateInput() { InputType = CreateInputType.List, Delimiter = ";", Data = data, Headers = headers}, new CreateOption() { CultureInfo = "fi-FI" });
-            Assert.AreEqual(result.Csv,
+            var result = Csv.Create(new CreateInput() { InputType = CreateInputType.List, Delimiter = ";", Data = data, Headers = headers}, new CreateOption() { CultureInfo = "fi-FI", ForceQuotesAroundValues = false });
+            Assert.AreEqual(
 @"Dosage;Drug;Patient;Date
 25;Indocin;David;1.1.2000 0.00.00
 50;Enebrel;Sam;1.1.2000 0.00.00
 10;Hydralazine;Christoff;1.1.2000 0.00.00
 21;""Combiv;ent"";Janet;1.1.2000 0.00.00
 100;Dilantin;Melanie;1.1.2000 0.00.00
-");
+", result.Csv);
         }
 
         [Test]
         public void TestWriteFromJson()
         {
             var json = @"[{""cool"":""nice"", ""what"": ""no""}, {""cool"":""not"", ""what"": ""yes""}, {""cool"":""maybe"", ""what"": ""never""}]";
             var result = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json}, new CreateOption());
-            Assert.AreEqual(result.Csv,
+            Assert.AreEqual(
 @"cool;what
 nice;no
 not;yes
 maybe;never
-");
+", result.Csv);
         }
 
         [Test]
         public void TestNullInputValue()
         {
             var json = @"[{""ShouldStayNull"":""null"", ""ShouldBeReplaced"": null}]";
             var result = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json }, new CreateOption() { ReplaceNullsWith = "replacedvalue" });
-            Assert.AreEqual(result.Csv,
+            Assert.AreEqual(
 @"ShouldStayNull;ShouldBeReplaced
 null;replacedvalue
-");
+", result.Csv);
+        }
+
+        [Test]
+        public void TestInputValueWithForceQuotes()
+        {
+            var json = @"[{""ShouldStayNull"":""null"", ""ShouldBeReplaced"": null}]";
+            var result = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json }, new CreateOption() { ForceQuotesAroundValues = true });
+            Assert.AreEqual(
+@"""ShouldStayNull"";""ShouldBeReplaced""
+""null"";""""
+", result.Csv);
         }
 
         [Test]
@@ -257,24 +268,17 @@ public void TestNoQuotesOption()
 ""foo"" : "" Normally I would have quotes "",
 ""bar"" : ""I would not""
 }]";
-            var result2 = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json }, new CreateOption() { NeverAddQuotesAroundValues = false });
-            Assert.AreEqual(result2.Csv,
+            var result2 = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json }, new CreateOption() { ForceQuotesAroundValues = false, NeverAddQuotesAroundValues = false });
+            Assert.AreEqual(
                 @"foo;bar
 "" Normally I would have quotes "";I would not
-");
+", result2.Csv);
 
             var result1 = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json }, new CreateOption() { NeverAddQuotesAroundValues = true });
-            Assert.AreEqual(result1.Csv,
+            Assert.AreEqual(
                 @"foo;bar
  Normally I would have quotes ;I would not
-");
-
-
-      
-
-
-
-
+", result1.Csv);
         }
 
         [Test]
@@ -285,10 +289,10 @@ public void TestDatetimeValue()
 ""string"" : ""foo""
 }]";
             var result = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json }, new CreateOption() { });
-            Assert.AreEqual(result.Csv,
+            Assert.AreEqual(
 @"datetime;string
 2018-11-22T10:30:55;foo
-");
+", result.Csv);
         }
 
         [Test]
@@ -300,10 +304,10 @@ public void TestDecimalValues()
 ""baz"" : 0.000000000000000000000000000000000000000000000000000000001
 }]";
             var result = Csv.Create(new CreateInput() { InputType = CreateInputType.Json, Delimiter = ";", Json = json }, new CreateOption() { });
-            Assert.AreEqual(result.Csv,
+            Assert.AreEqual(
  @"foo;bar;baz
 0.1;1.00;0.000000000000000000000000000000000000000000000000000000001
-");
+", result.Csv);
         }
 
         [Test]
@@ -328,10 +332,10 @@ public void ParseAndWriteShouldUseSeparateCultures()
 
             var result = Csv.Create(new CreateInput() { InputType = CreateInputType.List, Delimiter = ";", Data = parseResult.Data, Headers = parseResult.Headers }, new CreateOption() { CultureInfo = "fi-FI" });
 
-            Assert.AreEqual(result.Csv, 
+            Assert.AreEqual( 
                 @"First;Second;Number;Date
 Foo;"" bar"";100;1.1.2000 0.00.00
-");
+", result.Csv);
         }
 
         [Test]

Frends.Csv/Csv.cs

@@ -154,13 +154,19 @@ public static CreateResult Create([PropertyTab] CreateInput input, [PropertyTab]
                 HasHeaderRecord = option.IncludeHeaderRow
             };
 
+            if (option.ForceQuotesAroundValues)
+            {
+                config.ShouldQuote = (field) => true;
+            }
+            
             if (option.NeverAddQuotesAroundValues)
             {
                 config.Mode = CsvMode.NoEscape;
                 // if IgnoreQuotes is true, seems like ShouldQuote function has to return false in all cases
                 // if IgnoreQuotes is false ShouldQuote can't have any implementation otherwise it will overwrite IgnoreQuotes statement ( might turn it on again)
-                config.ShouldQuote = (field) => (!option.NeverAddQuotesAroundValues);
+                config.ShouldQuote = (field) => false;
             }
+
             var csv = string.Empty;
 
             switch (input.InputType)

Frends.Csv/Definitions.cs

@@ -65,13 +65,19 @@ public class CreateOption
         /// If set true csv's fields are never put in quotes
         /// </summary>
         [DefaultValue("false")]
-        public bool NeverAddQuotesAroundValues { get; set; }
+        public bool NeverAddQuotesAroundValues { get; set; } = false;
 
         /// <summary>
         /// Input's null values will be replaced with this value
         /// </summary>
         [DisplayFormat(DataFormatString = "Text")]
         public string ReplaceNullsWith { get; set; }
+
+        /// <summary>
+        /// Force quotes to all values
+        /// </summary>
+        [DefaultValue("false")]
+        public bool ForceQuotesAroundValues { get; set; } = false;
     }
 
     public class CreateResult
@@ -163,6 +169,7 @@ public class ParseOption
         /// </summary>
         [DefaultValue("false")]
         public bool TreatMissingFieldsAsNulls { get; set; } = false;
+
         /// <summary>
         /// A flag to let the reader know if reference should be ignored.
         /// </summary>
@@ -175,6 +182,8 @@ public class ParseOption
         [DefaultValue("false")]
         public bool IgnoreQuotes { get; set; } = false;
 
+
+
     }
 
     public class ParseResult

Frends.Csv/Frends.Csv.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-    <Version>1.0.1</Version>
+    <Version>1.0.0</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Company>HiQ Finland</Company>
     <Authors>HiQ Finland</Authors>

README.md

@@ -112,6 +112,7 @@ NOTE: Be sure to merge the latest from "upstream" before making a pull request!
 | CultureInfo          | string               | The culture info to write the file with, e.g. for decimal separators. InvariantCulture will be used by default. See list of cultures [here](https://msdn.microsoft.com/en-us/library/ee825488(v=cs.20).aspx); use the Language Culture Name. <br> NOTE: Due to an issue with the CsvHelpers library, all CSV tasks will use the culture info setting of the first CSV task in the process; you cannot use different cultures for reading and parsing CSV files in the same process. |  
 | NeverAddQuotesAroundValues | bool           | If set true csv's fields are never put in quotes |  
 | ReplaceNullsWith     | string               | Input's null values will be replaced with this value |  
+| ForceQuotesAroundValues | bool              | Force quotes around all values       |
 
 #### Result