Merge pull request #25 from cajuncoding/feature/enhance_property_handling_with_ignor_and_conversions

Feature/enhance property handling with ignor and conversions

Author: cajuncoding

DotNetFramework.SqlBulkHelpers/DotNetFramework.SqlBulkHelpers-Deprecated.csproj

@@ -32,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

DotNetFramework.SqlBulkHelpers/SqlBulkHelpers/Database/SqlBulkHelpersDBSchemaModels.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SqlBulkHelpers
 {
@@ -51,18 +49,20 @@ public override string ToString()
 
     public class SqlBulkHelpersColumnDefinition
     {
-        public SqlBulkHelpersColumnDefinition(String columnName, int ordinalPosition, String dataType, bool isIdentityColumn)
+        public SqlBulkHelpersColumnDefinition(String columnName, int ordinalPosition, String dataType, bool isIdentityColumn, bool isComputedColumn)
         {
             this.ColumnName = columnName;
             this.OrdinalPosition = ordinalPosition;
             this.DataType = dataType;
             this.IsIdentityColumn = isIdentityColumn;
+            this.IsComputedColumn = isComputedColumn;
         }
 
         public String ColumnName { get; private set; }
         public int OrdinalPosition { get; private set; }
         public String DataType { get; private set; }
         public bool IsIdentityColumn { get; private set; }
+        public bool IsComputedColumn { get; private set; }
 
         public override string ToString()
         {

DotNetFramework.SqlBulkHelpers/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
 </packages>

NetStandard.SqlBulkHelpers/Attributes/SqlBulkConvertToJsonAttribute.cs

@@ -0,0 +1,20 @@
+using SqlBulkHelpers.Interfaces;
+using System;
+using System.Text.Json;
+
+namespace SqlBulkHelpers
+{
+    /// <summary>
+    /// Dynamically convert any property that is annotated with this attribute to JSON String before storing in the Database.
+    /// Provides and example and helpful utility using hte ISqlBulkHelperPropertyConverter<TProp, TConverted> interface!
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
+    public class SqlBulkConvertToJsonAttribute : Attribute, ISqlBulkHelpersPropertyTransformer
+    {
+        object ISqlBulkHelpersPropertyTransformer.TransformPropValue(object propValue)
+            => JsonSerializer.Serialize(
+                propValue, 
+                SqlBulkHelpersConfig.DefaultConfig.SqlBulkJsonConverterSerializerOptions ?? new JsonSerializerOptions()
+            );
+    }
+}

NetStandard.SqlBulkHelpers/Attributes/SqlBulkIgnoreAttribute.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SqlBulkHelpers
+{
+    [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
+    public class SqlBulkIgnoreAttribute : Attribute
+    {
+    }
+}

NetStandard.SqlBulkHelpers/Attributes/SqlBulkMatchQualifierAttribute.cs

@@ -5,8 +5,5 @@ namespace SqlBulkHelpers
     [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
     public class SqlBulkMatchQualifierAttribute : Attribute
     {
-        public SqlBulkMatchQualifierAttribute()
-        {
-        }
     }
 }

NetStandard.SqlBulkHelpers/CustomExtensions/ReflectionExtensions.cs

@@ -8,25 +8,25 @@ namespace SqlBulkHelpers.SqlBulkHelpers.CustomExtensions
 {
     internal static class ReflectionExtensions
     {
-        public static IEnumerable<Attribute> FindAttributes(this Type type, params string[] attributeNames)
+        public static IList<Attribute> FindAttributesByName(this Type type, params string[] attributeNames)
         {
             if (type == null)
                 return null;
 
             var attributes = type.GetCustomAttributes(true).OfType<Attribute>();
-            return FindAttributes(attributes, attributeNames);
+            return FindAttributesByName(attributes, attributeNames);
         }
 
-        public static IEnumerable<Attribute> FindAttributes(this PropertyInfo propInfo, params string[] attributeNames)
+        public static IList<Attribute> FindAttributesByName(this PropertyInfo propInfo, params string[] attributeNames)
         {
             if (propInfo == null)
                 return null;
 
             var attributes = propInfo.GetCustomAttributes(true).OfType<Attribute>();
-            return FindAttributes(attributes, attributeNames);
+            return FindAttributesByName(attributes, attributeNames);
         }
 
-        public static IEnumerable<Attribute> FindAttributes(this IEnumerable<Attribute> attributes, params string[] attributeNamesToFind)
+        public static IList<Attribute> FindAttributesByName(this IEnumerable<Attribute> attributes, params string[] attributeNamesToFind)
         {
 
             if (attributeNamesToFind.IsNullOrEmpty())

NetStandard.SqlBulkHelpers/CustomExtensions/RepoDbDynamicCustomExtensions.cs

@@ -0,0 +1,83 @@
+using Fasterflect;
+using SqlBulkHelpers.Interfaces;
+using SqlBulkHelpers.SqlBulkHelpers.CustomExtensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace SqlBulkHelpers.CustomExtensions
+{
+    internal static class RepoDbDynamicCustomExtensions
+    {
+        public static ISqlBulkHelpersPropertyTransformer FindRepoDbPropertyHandler(this PropertyInfo propInfo)
+        {
+            if (propInfo == null)
+                return null;
+
+            // 2) Detect RepoDb's [PropertyHandler(typeof(...))] by name (no RepoDb reference required)
+            var repoDbAttr = propInfo
+                .FindAttributesByName(RepoDbNames.PropertyHandlerAttributeName)
+                .FirstOrDefault();
+
+            if (repoDbAttr == null)
+                return null;
+
+            // 3) Extract the handler type from the attribute  with last ditch effort fallback if name/property differs
+            var repoDbHandlerType = repoDbAttr.GetPropertyValue(RepoDbNames.PropertyHandlerTypePropertyName) as Type
+                ?? repoDbAttr.GetType().Properties().FirstOrDefault(p => p.CanRead && p.PropertyType == TypeCache.Type)?.GetValue(repoDbAttr) as Type;
+
+            if (repoDbHandlerType == null)
+                return null;
+
+            // 4) Locate the 'Set' method: TInput Set(TResult input, PropertyHandlerSetOptions options);
+            var repoDbHandlerSetMethod = repoDbHandlerType
+                .Methods()
+                .FirstOrDefault(m =>
+                    m.Name.Equals(RepoDbNames.PropertyHandlerSetMethodName, StringComparison.OrdinalIgnoreCase)
+                    && !m.IsGenericMethodDefinition
+                    && m.Parameters() is IList<ParameterInfo> methodParams
+                    && methodParams.Count == 2 //Must have exactly 2 params (per RepoDb Interface) and validate the Name of the second param below...
+                    && methodParams[0].ParameterType.IsAssignableFrom(propInfo.PropertyType) //Input Type (to be converted) must match the current Property Type we are processing!
+                    && methodParams[1].ParameterType is Type methodType
+                    //The Set method is used to write value to the DB!
+                    && (methodType.FullName ?? methodType.Name).IndexOf(RepoDbNames.PropertyHandlerSetOptionsClassName, StringComparison.OrdinalIgnoreCase) >= 0
+                );
+
+            if (repoDbHandlerSetMethod == null)
+                return null;
+
+            try
+            {
+                // 5) Create an instance of the PropertyHandler class (as only the Type is reference in the Attribute)
+                object propertyHandlerInstance = repoDbHandlerType.CreateInstance(); // Fasterflect; falls back to Activator if needed
+
+                // 6) Create high‑performance Fasterflect invoker (delegate)
+                var repoDbPropHandlerGetMethodInvoker = repoDbHandlerSetMethod.DelegateForCallMethod(); // returns Fasterflect.MethodInvoker
+
+                // For safety, ensure the first arg (TInput) matches/accepts the property type
+                //NOTE: We already know we have 2 parameters above!
+                var parameters = repoDbHandlerSetMethod.Parameters();
+                var optionsParamType = parameters[1].ParameterType;
+
+                // Options: null for class, default(T) for struct which is returned when we try to create an instance...
+                object optionsArg = optionsParamType.IsValueType
+                    ? optionsParamType.CreateInstance()
+                    : null;
+
+                // 8) Return a converter wrapper Interfaced Func<object, object> to encapsulate the call to the Invoker
+                //      of the Get mehod of the PropertyHandler
+                return new SqlBulkLambdaPropertyConverter(valueObj =>
+                {
+                    if (valueObj is null) return null;
+                    return repoDbPropHandlerGetMethodInvoker.Invoke(propertyHandlerInstance, valueObj, optionsArg);
+                });
+            }
+            catch
+            {
+                return null; // could not construct; ignore optional feature
+            }
+        }
+    }
+}

NetStandard.SqlBulkHelpers/CustomExtensions/SqlBulkHelpersCustomExtensions.cs

@@ -107,7 +107,7 @@ public static string MakeTableNameUnique(this string tableNameToMakeUnique, int
             if (string.IsNullOrWhiteSpace(tableNameToMakeUnique))
                 throw new ArgumentNullException(nameof(tableNameToMakeUnique));
 
-            var uniqueTokenSuffix = string.Concat("_", IdGenerator.NewId(uniqueTokenLength));
+            var uniqueTokenSuffix = string.Concat("_", TokenIdGenerator.NewTokenId(uniqueTokenLength));
             var uniqueName = string.Concat(tableNameToMakeUnique, uniqueTokenSuffix);
 
             if (uniqueName.Length > MaxTableNameLength)

NetStandard.SqlBulkHelpers/CustomExtensions/StringExtensions.cs

@@ -12,6 +12,9 @@ public static string TruncateToLength(this string str, int length)
         public static string ReplaceCaseInsensitive(this string str, string oldValue, string @newValue)
             => Replace(str, oldValue, @newValue, StringComparison.OrdinalIgnoreCase);
 
+        public static string AsString(this object obj)
+             => obj == null || obj is string ? (string)obj : obj.ToString();
+
         /// <summary>
         /// Returns a new string in which all occurrences of a specified string in the current instance are replaced with another 
         /// specified string according the type of search to use for the specified string.