Fixes #175 corrects handling of quoting null strings in csv export

DaxStudio · Apr 23, 2019 · c9b134f · c9b134f
1 parent 09da752
commit c9b134f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyCopyright("Copyright © DAX Studio 2016")] 
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion(    "2.8.4.119")]
-[assembly: AssemblyFileVersion("2.8.4.119")]
+[assembly: AssemblyVersion(    "2.8.5.120")]
+[assembly: AssemblyFileVersion("2.8.5.120")]
 
 
diff --git a/src/DaxStudio.UI/ResultsTargets/ResultsTargetTextFile.cs b/src/DaxStudio.UI/ResultsTargets/ResultsTargetTextFile.cs
@@ -124,9 +124,13 @@ public Task OutputResultsAsync(IQueryRunner runner)
                                                 for (int iCol = 0; iCol < reader.FieldCount; iCol++)
                                                 {
                                                     var fieldValue = reader[iCol];
+                                                    
                                                     // quote all string fields
                                                     if (reader.GetFieldType(iCol) == typeof(string))
-                                                        csvWriter.WriteField(fieldValue.ToString(), true);
+                                                        if (reader.IsDBNull(iCol))
+                                                            csvWriter.WriteField("", true);
+                                                        else
+                                                            csvWriter.WriteField(fieldValue.ToString(), true);
                                                     else
                                                         csvWriter.WriteField(fieldValue);
                                                 }

diff --git a/src/DaxStudio.UI/ViewModels/ExportDataDialogViewModel.cs b/src/DaxStudio.UI/ViewModels/ExportDataDialogViewModel.cs
@@ -295,7 +295,7 @@ private void EnsureSQLTableExists(SqlConnection conn, string sqlTableName, Adomd
                 {
                     colName = regEx.Groups[1].Value;
                 }
-
+                colName.Replace('|', '_');
                 var sqlType = ConvertDotNetToSQLType(row);
 
                 strColumns.AppendLine($",[{colName}] {sqlType} NULL");