From 0ee8758a24e6b9cebeacfcd510a63310fb736a25 Mon Sep 17 00:00:00 2001
From: Andrea Cattaneo <a.cattaneo@bitagora.it>
Date: Wed, 28 Feb 2024 09:38:15 +0100
Subject: [PATCH] bump System.Data.SqlClient and code refactor

---
 ACUtils.SqlDb.Utils/ACUtils.SqlDb.Utils.csproj |  6 +++---
 ACUtils.SqlDb.Utils/DBModel.cs                 | 15 ++++++++++-----
 ACUtils.SqlDb/ACUtils.SqlDb.csproj             |  6 +++---
 ACUtils.SqlDbExt/ACUtils.SqlDbExt.csproj       |  6 +++---
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ACUtils.SqlDb.Utils/ACUtils.SqlDb.Utils.csproj b/ACUtils.SqlDb.Utils/ACUtils.SqlDb.Utils.csproj
index 2449e96..e8928be 100644
--- a/ACUtils.SqlDb.Utils/ACUtils.SqlDb.Utils.csproj
+++ b/ACUtils.SqlDb.Utils/ACUtils.SqlDb.Utils.csproj
@@ -4,8 +4,8 @@
     <Authors>Andrea Cattaneo</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>1.0.0.148</Version>
-    <PackageVersion>1.0.0.148</PackageVersion>
+    <Version>1.0.0.149</Version>
+    <PackageVersion>1.0.0.149</PackageVersion>
     <Description>Utilities per gestione DataTable</Description>
     <NeutralLanguage>it</NeutralLanguage>
     <IncludeSymbols>true</IncludeSymbols>
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ACUtils.StringUtils\ACUtils.StringUtils.csproj" />
diff --git a/ACUtils.SqlDb.Utils/DBModel.cs b/ACUtils.SqlDb.Utils/DBModel.cs
index 22ce1ab..5003565 100644
--- a/ACUtils.SqlDb.Utils/DBModel.cs
+++ b/ACUtils.SqlDb.Utils/DBModel.cs
@@ -118,7 +118,7 @@ public Q GetValueByDbAttribute<Q>(string field)
         {
             return GetValueBy<Q>(field, property => GetDbAttribute(property.Name)?.DbField);
         }
-        
+
         public object this[string fieldName]
         {
             get
@@ -174,7 +174,8 @@ public virtual void idrate(IDataRecord dataRecord)
                     var coltype = dataRecord.GetFieldType(i);
                     var colvalue = dataRecord[i];
                     setValue(property.Name, colvalue, coltype);
-                }else
+                }
+                else
                 {
                     var attr = GetDbAttribute(property.Name);
                     if (attr?.DbField == null) continue;
@@ -292,14 +293,18 @@ public bool HasDbField(string field)
 
         public IDbFieldAttribute GetDbAttribute(string propertyName)
         {
-            var propr = GetType().GetProperty(propertyName);
-            var attrs = propr.GetCustomAttributes(typeof(IDbFieldAttribute), true);
-            return attrs.LastOrDefault() as IDbFieldAttribute;
+            var type = GetType();
+            return GetDbAttribute(type, propertyName);
         }
 
         public static IDbFieldAttribute GetDbAttribute<T>(string propertyName)
         {
             var type = typeof(T);
+            return GetDbAttribute(type, propertyName);
+        }
+
+        public static IDbFieldAttribute GetDbAttribute(Type type, string propertyName)
+        {
             var propr = type.GetProperty(propertyName);
             var attrs = propr?.GetCustomAttributes(typeof(IDbFieldAttribute), true);
             return attrs?.LastOrDefault() as IDbFieldAttribute;
diff --git a/ACUtils.SqlDb/ACUtils.SqlDb.csproj b/ACUtils.SqlDb/ACUtils.SqlDb.csproj
index 79e0234..d600f9b 100644
--- a/ACUtils.SqlDb/ACUtils.SqlDb.csproj
+++ b/ACUtils.SqlDb/ACUtils.SqlDb.csproj
@@ -5,8 +5,8 @@
     <Authors>Andrea Cattaneo</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>1.0.0.155</Version>
-    <PackageVersion>1.0.0.155</PackageVersion>
+    <Version>1.0.0.156</Version>
+    <PackageVersion>1.0.0.156</PackageVersion>
     <Description>Utility per interrogazione database MSSQL</Description>
     <NeutralLanguage>it</NeutralLanguage>
     <IncludeSymbols>true</IncludeSymbols>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ACUtils.SqlDbExt/ACUtils.SqlDbExt.csproj b/ACUtils.SqlDbExt/ACUtils.SqlDbExt.csproj
index bcd2163..d149565 100644
--- a/ACUtils.SqlDbExt/ACUtils.SqlDbExt.csproj
+++ b/ACUtils.SqlDbExt/ACUtils.SqlDbExt.csproj
@@ -5,8 +5,8 @@
     <Authors>Andrea Cattaneo</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>1.0.0.143</Version>
-    <PackageVersion>1.0.0.143</PackageVersion>
+    <Version>1.0.0.144</Version>
+    <PackageVersion>1.0.0.144</PackageVersion>
     <Description>Utility per interrogazione database MSSQL</Description>
     <NeutralLanguage>it</NeutralLanguage>
     <IncludeSymbols>true</IncludeSymbols>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageReference Include="CsvHelper" Version="15.0.5" />
   </ItemGroup>