data merge fix

loresoft · Dec 5, 2022 · 6aa819b · 6aa819b
1 parent 9c213af
commit 6aa819b
Show file tree

Hide file tree

Showing 34 changed files with 74 additions and 228 deletions.
diff --git a/src/FluentCommand.SqlServer/Bulk/DataBulkCopyMapping.cs b/src/FluentCommand.SqlServer/Bulk/DataBulkCopyMapping.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Linq.Expressions;
 using System.Reflection;
 
@@ -110,4 +109,4 @@ private string ExtractColumnName<TValue>(Expression<Func<TEntity, TValue>> sourc
 
         return property.Name;
     }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Bulk/IDataBulkCopy.cs b/src/FluentCommand.SqlServer/Bulk/IDataBulkCopy.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Data;
 
 using Microsoft.Data.SqlClient;

diff --git a/src/FluentCommand.SqlServer/Import/FieldDefinition.cs b/src/FluentCommand.SqlServer/Import/FieldDefinition.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -120,11 +117,11 @@ public FieldDefinition()
     /// Converts to string.
     /// </summary>
     /// <returns>
-    /// A <see cref="System.String" /> that represents this instance.
+    /// A <see cref="string" /> that represents this instance.
     /// </returns>
     public override string ToString()
     {
         return $"Display: {DisplayName}, Name: {Name}, DataType: {DataType?.Name}";
     }
 
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/FieldDefinitionBuilder.cs b/src/FluentCommand.SqlServer/Import/FieldDefinitionBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -217,11 +214,11 @@ public FieldDefinitionBuilder Expressions(IEnumerable<string> values)
     /// <returns>
     /// Fluent builder for <see cref="FieldDefinition" />
     /// </returns>
-    public FieldDefinitionBuilder Translator<T>() 
+    public FieldDefinitionBuilder Translator<T>()
         where T : IFieldTranslator
     {
         _fieldDefinition.Translator = typeof(T);
         return this;
     }
 
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/IFieldTranslator.cs b/src/FluentCommand.SqlServer/Import/IFieldTranslator.cs
@@ -1,5 +1,3 @@
-using System.Threading.Tasks;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -13,4 +11,4 @@ public interface IFieldTranslator
     /// <param name="original">The original value.</param>
     /// <returns>The translated value</returns>
     Task<object> Translate(string original);
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/IImportProcessor.cs b/src/FluentCommand.SqlServer/Import/IImportProcessor.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Data;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -20,4 +15,4 @@ public interface IImportProcessor
     /// <returns>The results of the import</returns>
     /// <exception cref="ArgumentNullException"><paramref name="importData" /> or <paramref name="importDefinition" /> is null</exception>
     Task<ImportResult> ImportAsync(ImportDefinition importDefinition, ImportData importData, string username, CancellationToken cancellationToken = default);
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/IImportValidator.cs b/src/FluentCommand.SqlServer/Import/IImportValidator.cs
@@ -1,5 +1,4 @@
-using System.Data;
-using System.Threading.Tasks;
+using System.Data;
 
 namespace FluentCommand.Import;
 

diff --git a/src/FluentCommand.SqlServer/Import/ImportData.cs b/src/FluentCommand.SqlServer/Import/ImportData.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -38,4 +36,4 @@ public class ImportData
     ///   <c>true</c> if data has a header row; otherwise, <c>false</c>.
     /// </value>
     public bool HasHeader { get; set; } = true;
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/ImportDefinition.cs b/src/FluentCommand.SqlServer/Import/ImportDefinition.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -25,7 +22,7 @@ public ImportDefinition()
     /// The name of the import.
     /// </value>
     public string Name { get; set; }
-    
+
     /// <summary>
     /// Gets or sets the target table to merge the uploaded data into.
     /// </summary>
@@ -93,4 +90,4 @@ public static ImportDefinition Build(Action<ImportDefinitionBuilder> builder)
         return importDefinition;
     }
 
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/ImportDefinitionBuilder.cs b/src/FluentCommand.SqlServer/Import/ImportDefinitionBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -17,10 +14,7 @@ public class ImportDefinitionBuilder
     /// <exception cref="ArgumentNullException">importDefinition</exception>
     public ImportDefinitionBuilder(ImportDefinition importDefinition)
     {
-        if (importDefinition == null)
-            throw new ArgumentNullException(nameof(importDefinition));
-
-        _importDefinition = importDefinition;
+        _importDefinition = importDefinition ?? throw new ArgumentNullException(nameof(importDefinition));
     }
 
 
@@ -174,4 +168,4 @@ public ImportDefinitionBuilder Validator<T>()
         _importDefinition.Validator = typeof(T);
         return this;
     }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/ImportFactory.cs b/src/FluentCommand.SqlServer/Import/ImportFactory.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace FluentCommand.Import;
 
 /// <summary>

diff --git a/src/FluentCommand.SqlServer/Import/ImportFieldMapping.cs b/src/FluentCommand.SqlServer/Import/ImportFieldMapping.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -23,10 +21,7 @@ public ImportFieldMapping(FieldDefinition fieldDefinition) : this(fieldDefinitio
     /// <exception cref="ArgumentNullException">definition is null</exception>
     public ImportFieldMapping(FieldDefinition fieldDefinition, FieldMap fieldMap)
     {
-        if (fieldDefinition == null)
-            throw new ArgumentNullException(nameof(fieldDefinition));
-
-        Definition = fieldDefinition;
+        Definition = fieldDefinition ?? throw new ArgumentNullException(nameof(fieldDefinition));
         FieldMap = fieldMap;
     }
 
@@ -45,4 +40,4 @@ public ImportFieldMapping(FieldDefinition fieldDefinition, FieldMap fieldMap)
     /// The field mapping.
     /// </value>
     public FieldMap FieldMap { get; }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/ImportProcessContext.cs b/src/FluentCommand.SqlServer/Import/ImportProcessContext.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -128,4 +124,4 @@ private List<ImportFieldMapping> GetMappedFields()
 
         return list;
     }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Import/ImportProcessor.cs b/src/FluentCommand.SqlServer/Import/ImportProcessor.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 using FluentCommand.Extensions;
 using FluentCommand.Merge;

diff --git a/src/FluentCommand.SqlServer/Import/ImportResult.cs b/src/FluentCommand.SqlServer/Import/ImportResult.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace FluentCommand.Import;
 
 /// <summary>
@@ -31,4 +28,4 @@ public class ImportResult
     /// The list of errors.
     /// </value>
     public IReadOnlyCollection<Exception> Errors { get; set; }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Merge/DataMerge.cs b/src/FluentCommand.SqlServer/Merge/DataMerge.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Data;
 using System.Data.Common;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 using FluentCommand.Extensions;
 
@@ -555,7 +550,7 @@ await executeFactory(mergeCommand, cancellationToken)
         }
         finally
         {
-            _dataSession.ReleaseConnection();
+            await _dataSession.ReleaseConnectionAsync();
         }
     }
 

diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeColumn.cs b/src/FluentCommand.SqlServer/Merge/DataMergeColumn.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentCommand.Merge;
 
 /// <summary>
@@ -80,4 +78,4 @@ public DataMergeColumn()
     /// <c>true</c> if the column is ignored; otherwise, <c>false</c>.
     /// </value>
     public bool IsIgnored { get; set; }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeColumnMapping.cs b/src/FluentCommand.SqlServer/Merge/DataMergeColumnMapping.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentCommand.Merge;
 
 /// <summary>
@@ -118,4 +116,4 @@ public IDataColumnMapping Ignore(bool value = true)
         MergeColumn.IsIgnored = value;
         return this;
     }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeDefinition.cs b/src/FluentCommand.SqlServer/Merge/DataMergeDefinition.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 using FluentCommand.Extensions;
 
@@ -122,7 +119,7 @@ public static void AutoMap<TEntity>(DataMergeDefinition mergeDefinition)
         var entityType = typeof(TEntity);
         var properties = TypeDescriptor.GetProperties(entityType);
 
-        
+
         var tableAttribute = Attribute.GetCustomAttribute(entityType, typeof(TableAttribute)) as TableAttribute;
         if (tableAttribute != null)
         {

diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeExtensions.cs b/src/FluentCommand.SqlServer/Merge/DataMergeExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentCommand.Merge;
 
 /// <summary>

diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeGenerator.cs b/src/FluentCommand.SqlServer/Merge/DataMergeGenerator.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Text;
 
 using FluentCommand.Extensions;

diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeMapping.cs b/src/FluentCommand.SqlServer/Merge/DataMergeMapping.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Linq.Expressions;
 using System.Reflection;
 
@@ -112,4 +111,4 @@ public IDataColumnMapping Column(string sourceColumn)
 
         return columnMapping;
     }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeMode.cs b/src/FluentCommand.SqlServer/Merge/DataMergeMode.cs
@@ -1,4 +1,4 @@
-namespace FluentCommand.Merge;
+namespace FluentCommand.Merge;
 
 /// <summary>
 /// How the data should be merged into the table
@@ -17,4 +17,4 @@ public enum DataMergeMode
     /// Generate a SqlServer merge statement to execute.
     /// </summary>
     SqlStatement
-}
+}
diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeOutputColumn.cs b/src/FluentCommand.SqlServer/Merge/DataMergeOutputColumn.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentCommand.Merge;
 
 /// <summary>
@@ -14,15 +12,15 @@ public class DataMergeOutputColumn
     /// The name of the column.
     /// </value>
     public string Name { get; set; }
-    
+
     /// <summary>
     /// Gets or sets the current value of the column.
     /// </summary>
     /// <value>
     /// The current value of the column.
     /// </value>
     public object Current { get; set; }
-    
+
     /// <summary>
     /// Gets or sets the original value of the column.
     /// </summary>
@@ -38,4 +36,4 @@ public class DataMergeOutputColumn
     /// The column value type.
     /// </value>
     public Type Type { get; set; }
-}
+}
diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeOutputRow.cs b/src/FluentCommand.SqlServer/Merge/DataMergeOutputRow.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace FluentCommand.Merge;
 
 /// <summary>
@@ -48,4 +44,4 @@ public DataMergeOutputRow()
             return Columns.FirstOrDefault(c => c.Name == columnName);
         }
     }
-}
+}