Enriching OracleParameterInfo with flag for PII data and Fix OracleDecimal to System.Decimal conversion overflow handling

build.ps1

@@ -11,4 +11,4 @@ if ($connectionstring)
 dotnet restore .\src\Dapper.Oracle.sln
 dotnet build .\src\Dapper.Oracle.sln
 dotnet test .\src\Dapper.Oracle.sln
-dotnet pack .\src\Dapper.Oracle.sln -p:PackageVersion=2.0.4
+dotnet pack .\src\Dapper.Oracle.sln -p:PackageVersion=2.1.0

src/Dapper.Oracle.StrongName/Dapper.Oracle.StrongName.csproj

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\common.targets" />
     <PropertyGroup>
         <IsTestProject>false</IsTestProject>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
@@ -13,10 +13,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Dapper.StrongName" Version="2.0.123" />
+        <PackageReference Include="Dapper.StrongName" Version="2.1.72" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.300" />
     </ItemGroup>
-</Project>
+</Project>

src/Dapper.Oracle/Dapper.Oracle.csproj

@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\common.targets" />
     <PropertyGroup>
         <IsTestProject>false</IsTestProject>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
     </PropertyGroup>
 
 	<PropertyGroup>
 		<PackageReleaseNotes>
-Version 2.0.4:
- - Updated to use .net 7.0.
- - Dependency switched to most recent version of Dapper: 2.0.123.
- - Dependencies updated also for test project.
-		</PackageReleaseNotes>
+      Version 2.1.0:
+      - Updated to use .net 10.0.
+      - Dependency switched to most recent version of Dapper: 2.1.72.
+      - Dependencies updated also for test project.
+      - Fix OracleDecimal to System.Decimal conversion overflow handling
+      - Enriching OracleParameterInfo with flag for PII data
+    </PackageReleaseNotes>
 		<!--<PackageReadmeFile>..\..\README.MD</PackageReadmeFile>-->
 	</PropertyGroup>
 
 	<ItemGroup>
-        <PackageReference Include="Dapper" Version="2.0.123" />
+        <PackageReference Include="Dapper" Version="2.1.72" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.300" />
     </ItemGroup>
-</Project>
+</Project>

src/Dapper.Oracle/OracleDynamicParameters.cs

@@ -1,4 +1,4 @@
-//// Based on Gist found here: https://gist.github.com/vijaysg/3096151
+//// Based on Gist found here: https://gist.github.com/vijaysg/3096151
 
 using System;
 using System.Collections;
@@ -109,6 +109,7 @@ public void AddDynamicParams(dynamic param)
         /// <param name="sourceColumn"></param>
         /// <param name="sourceVersion"></param>
         /// <param name="collectionType"></param>
+        /// <param name="maskValueWhenLogging">a flag that this param contains sensitive data and it must be masked in case of logging values</param>
         public void Add(
             string name,
             object value = null,
@@ -121,7 +122,8 @@ public void Add(
             string sourceColumn = null,
             DataRowVersion? sourceVersion = null,
             OracleMappingCollectionType? collectionType = null,
-            int[] arrayBindSize = null)
+            int[] arrayBindSize = null,
+            bool maskValueWhenLogging = false)
         {
             Parameters[Clean(name)] = new OracleParameterInfo()
             {
@@ -136,7 +138,8 @@ public void Add(
                 SourceColumn = sourceColumn,
                 SourceVersion = sourceVersion ?? DataRowVersion.Current,
                 CollectionType = collectionType ?? OracleMappingCollectionType.None,
-                ArrayBindSize = arrayBindSize
+                ArrayBindSize = arrayBindSize,
+                MaskValueWhenLogging = maskValueWhenLogging
             };
         }
 
@@ -167,7 +170,7 @@ public T Get<T>(string name)
                 }
                 return default(T);
             }
-            
+
             return OracleValueConverter.Convert<T>(val);
         }
 
@@ -239,10 +242,10 @@ protected virtual void AddParameters(IDbCommand command, SqlMapper.Identity iden
                 }
 
                 OracleMethodHelper.SetOracleParameters(p, param);
-                
+
                 p.Direction = param.ParameterDirection;
-                
-                var val = param.Value;                
+
+                var val = param.Value;
 
                 if (val != null && OracleTypeMapper.HasTypeHandler(val.GetType(), out var handler))
                 {
@@ -251,7 +254,7 @@ protected virtual void AddParameters(IDbCommand command, SqlMapper.Identity iden
                 else
                 {
                     p.Value = val ?? DBNull.Value;
-                    
+
                     var s = val as string;
                     if (s?.Length <= 4000)
                     {
@@ -262,8 +265,8 @@ protected virtual void AddParameters(IDbCommand command, SqlMapper.Identity iden
                     {
                         p.Size = param.Size.Value;
                     }
-                }                
-                               
+                }
+
                 if (add)
                 {
                     command.Parameters.Add(p);
@@ -320,6 +323,8 @@ public class OracleParameterInfo
             public OracleParameterMappingStatus Status { get; set; }
 
             public IDbDataParameter AttachedParam { get; set; }
+
+            public bool MaskValueWhenLogging { get; set; }
         }
 
         /// <summary>
@@ -328,4 +333,4 @@ public class OracleParameterInfo
         /// <returns></returns>
         public IEnumerator GetEnumerator() => Parameters.GetEnumerator();
     }
-}
+}

src/Dapper.Oracle/OracleValueConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data.Common;

src/Tests.Dapper.Oracle/IntegrationTests/DatabaseFixture.cs

@@ -35,10 +35,9 @@ public void Dispose()
 
         public async Task InitializeAsync()
         {
+            // Prefer DA_OR_CONNECTION (CI / local Oracle). Do not overwrite it — a hardcoded default used to break env-based runs.
             var connectionString = Environment.GetEnvironmentVariable("DA_OR_CONNECTION");
 
-            connectionString = "Data Source=localhost/dips;User Id=system;Password=oracle";
-
             if (string.IsNullOrEmpty(connectionString))
             {
                 var si = new ProcessStartInfo("powershell", @".\LocalOracleDockerDb.ps1");
@@ -100,4 +99,4 @@ private static string GetBootstrapFolder()
 
         }
     }       
-}
+}

src/Tests.Dapper.Oracle/OracleValueConverterTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using Dapper.Oracle;
 using FluentAssertions;

src/Tests.Dapper.Oracle/Tests.Dapper.Oracle.csproj

@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.targets" />
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <!-- Integration tests need a live Oracle (see DatabaseFixture). Default: skip them; run all with: dotnet test -p:RunIntegrationTests=true -->
+    <RunIntegrationTests Condition="'$(RunIntegrationTests)' == ''">false</RunIntegrationTests>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(RunIntegrationTests)' != 'true'">
+    <VSTestTestCaseFilter>Category!=Integration&amp;Category!=IntegrationTest</VSTestTestCaseFilter>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.100" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.26.200" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.console" Version="2.9.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -36,7 +41,7 @@
     <EmbeddedResource Include="IntegrationTests\Schema.sql" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.300" />
   </ItemGroup>
 
-</Project>
+</Project>