fix: csv import

Kirdock · Aug 3, 2021 · 85e1d92 · 85e1d92
1 parent a85ef42
commit 85e1d92
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/DataTableConverter/Assisstant/DatabaseHelper.cs b/DataTableConverter/Assisstant/DatabaseHelper.cs
@@ -486,16 +486,19 @@ internal SQLiteCommand InsertDuplicateCommand(string[] headers, string tableName
             return command;
         }
 
-        internal SQLiteCommand InsertRow(IEnumerable<string> eHeaders, object[] values, string tableName, SQLiteCommand cmd = null)
+        internal SQLiteCommand InsertRow(IEnumerable<string> eHeaders, object[] values, string tableName, SQLiteCommand command = null)
         {
             string[] headers = eHeaders.ToArray();
             if (headers.Length > values.Length)
             {
                 headers = headers.Take(values.Length).ToArray();
-                cmd = null;
+                command = null;
+            }
+            if(command?.Parameters.Count != values.Length)
+            {
+                command = null;
             }
 
-            SQLiteCommand command = cmd;
             if (command == null)
             {
                 string headerString = GetHeaderString(headers);

diff --git a/DataTableConverter/Assisstant/ImportHelper.cs b/DataTableConverter/Assisstant/ImportHelper.cs
@@ -212,14 +212,25 @@ internal void OpenText(string tableName, string path, List<string> separators, i
                     var indexItem = newHeaders.Select((item, index) => new { item, index });
                     for (int i = 0; i < newHeaders.Count; ++i)
                     {
-                        var duplicates = indexItem.Where(element => element.index != i && element.item.Equals(newHeaders[i], StringComparison.OrdinalIgnoreCase)).ToArray();
+                        var duplicates = indexItem.Where(element => element.item == string.Empty || element.index != i && element.item.Equals(newHeaders[i], StringComparison.OrdinalIgnoreCase)).ToArray();
                         for(int y = 0; y < duplicates.Length; ++y)
                         {
                             int counter = y + 2;
                             string newValue;
+                            string item = duplicates[y].item; ;
+                            string header;
+                            if(item == string.Empty)
+                            {
+                                header = "Spalte";
+                                counter--;
+                            }
+                            else
+                            {
+                                header = item;
+                            }
                             do
                             {
-                                newValue = duplicates[y].item + counter;
+                                newValue = header + counter;
                                 ++counter;
                             } while (newHeaders.Contains(newValue));
 

diff --git a/DataTableConverter/Properties/AssemblyInfo.cs b/DataTableConverter/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.7.0")]