Merge pull request #197 from ngvtien/master

ngvtien · web-flow · commit 997af4ca7d64 · 2021-02-10T19:12:27.000+10:30
Addressing Issues #196, #192 and #205
diff --git a/build/common.props b/build/common.props
@@ -1,15 +1,15 @@
 <Project>
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;net46;netstandard2.0</TargetFrameworks>
-    <VersionPrefix>0.19.1</VersionPrefix>
+    <VersionPrefix>0.19.2</VersionPrefix>
     <AssemblyVersion>0.11.0.0</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <Authors>dataaction</Authors>
     <PackageTags>Sybase ASE Adaptive SAP AseClient DbProvider</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/DataAction/AdoNetCore.AseClient</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageReleaseNotes>Refer to GitHub - https://github.com/DataAction/AdoNetCore.AseClient/releases/tag/0.19.1</PackageReleaseNotes>
+    <PackageReleaseNotes>Refer to GitHub - https://github.com/DataAction/AdoNetCore.AseClient/releases/tag/0.19.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/DataAction/AdoNetCore.AseClient</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
diff --git a/src/AdoNetCore.AseClient/AseCommandBuilder.cs b/src/AdoNetCore.AseClient/AseCommandBuilder.cs
@@ -224,12 +224,15 @@ private static DataTable GetSchemaTableWithKeyInfo(DbCommand sourceCommand)
                     if (dataTable != null)
                     {
                         // If there is no primary key on the table, then throw MissingPrimaryKeyException.
-                        var isKeyColumn = dataTable.Columns["IsKey"];
+                        var isKeyColumn = dataTable.Columns[SchemaTableColumn.IsKey];
+                        var isUniqueColumn = dataTable.Columns[SchemaTableColumn.IsUnique];
+
                         var hasKey = false;
 
                         foreach (DataRow columnDescriptorRow in dataTable.Rows)
                         {
-                            hasKey |= (bool)columnDescriptorRow[isKeyColumn];
+                            hasKey |= (bool)columnDescriptorRow[isKeyColumn] ||
+                                      (bool)columnDescriptorRow[isUniqueColumn];
 
                             if (hasKey)
                             {
diff --git a/src/AdoNetCore.AseClient/AseConnection.cs b/src/AdoNetCore.AseClient/AseConnection.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Data;
 using System.Data.Common;
+using System.Net.Security;
 using AdoNetCore.AseClient.Interface;
 using AdoNetCore.AseClient.Internal;
 
@@ -274,7 +275,7 @@ public override void Open()
             {
                 var parameters = ConnectionParameters.Parse(_connectionString);
 
-                _internal = _connectionPoolManager.Reserve(_connectionString, parameters, _eventNotifier);
+                _internal = _connectionPoolManager.Reserve(_connectionString, parameters, _eventNotifier, UserCertificateValidationCallback);
 
                 InternalConnectionTimeout = parameters.LoginTimeout;
             }
@@ -543,7 +544,10 @@ public bool NamedParameters
 #if ENABLE_CLONEABLE_INTERFACE
         public object Clone()
         {
-            return new AseConnection(_connectionString, _connectionPoolManager);
+            return new AseConnection(_connectionString, _connectionPoolManager)
+            {
+                UserCertificateValidationCallback = UserCertificateValidationCallback,
+            };
         }
 #endif
 
@@ -621,6 +625,12 @@ public AseTransaction Transaction
                 return _transaction;
             }
         }
+
+        /// <summary>
+        /// Allow consumer to override the default certificate validation
+        /// </summary>
+        public RemoteCertificateValidationCallback UserCertificateValidationCallback { get; set; }
+
     }
 
     /// <summary>
diff --git a/src/AdoNetCore.AseClient/AseParameterCollection.cs b/src/AdoNetCore.AseClient/AseParameterCollection.cs
@@ -263,10 +263,10 @@ public AseParameter Add(string parameterName, AseDbType dbType, int size, Parame
         /// <returns>A new <see cref="AseParameter" /> object.</returns>
         public AseParameter Add(AseParameter parameter)
         {
-            if (parameter != null)
-            {
-                _parameters.Add(parameter);
-            }
+            if (parameter == null) throw new ArgumentNullException(nameof(parameter));
+            if (Contains(parameter)) throw new ArgumentException($"parameter name '{parameter.ParameterName}' is already in the collection");
+
+            _parameters.Add(parameter);
             return parameter;
         }
 
@@ -379,6 +379,7 @@ public override int Add(object value)
         {
             if (value is AseParameter p)
             {
+                if (Contains(p)) throw new ArgumentException($"Parameter name: '{p.ParameterName}' is already registered", nameof(value));
                 return ((IList)_parameters).Add(p);
             }
             return -1;
@@ -438,15 +439,23 @@ public override int IndexOf(object value)
         /// Returns -1 when the object does not exist in the <see cref="AseParameterCollection" />.</returns>
         public int IndexOf(AseParameter value)
         {
-            if (value != null)
+            if (value == null) return -1;
+            for (var i = 0; i < _parameters.Count; i++)
             {
-                for (var i = 0; i < _parameters.Count; i++)
+                if (string.IsNullOrWhiteSpace(value.ParameterName))
                 {
                     if (value == _parameters[i])
                     {
                         return i;
                     }
                 }
+                else
+                {
+                    if (value == _parameters[i] || value.ParameterName == _parameters[i].ParameterName)
+                    {
+                        return i;
+                    }
+                }
             }
 
             return -1;
@@ -459,6 +468,7 @@ public int IndexOf(AseParameter value)
         /// <param name="parameter">The <see cref="AseParameter" /> object to add to the collection.</param>
         public override void Insert(int index, object parameter)
         {
+            if (Contains(parameter)) throw new ArgumentException($"parameter name '{parameter}' is already in the collection");
             ((IList)_parameters).Insert(index, parameter);
         }
 
@@ -469,6 +479,7 @@ public override void Insert(int index, object parameter)
         /// <param name="parameter">The <see cref="AseParameter" /> object to add to the collection.</param>
         public void Insert(int index, AseParameter parameter)
         {
+            if (Contains(parameter)) throw new ArgumentException($"parameter name '{parameter.ParameterName}' is already in the collection");
             ((IList)_parameters).Insert(index, parameter);
         }
 
@@ -521,10 +532,7 @@ public override void RemoveAt(int index)
         /// <param name="index">The starting index of the array.</param>
         public override void CopyTo(Array array, int index)
         {
-            if (array != null)
-            {
-                ((IList)_parameters).CopyTo(array, index);
-            }
+            ((IList)_parameters).CopyTo(array, index);
         }
 
         /// <summary>
diff --git a/src/AdoNetCore.AseClient/Interface/IConnectionPoolManager.cs b/src/AdoNetCore.AseClient/Interface/IConnectionPoolManager.cs
@@ -1,8 +1,10 @@
+using System.Net.Security;
+
 namespace AdoNetCore.AseClient.Interface
 {
     internal interface IConnectionPoolManager
     {
-        IInternalConnection Reserve(string connectionString, IConnectionParameters parameters, IInfoMessageEventNotifier eventNotifier);
+        IInternalConnection Reserve(string connectionString, IConnectionParameters parameters, IInfoMessageEventNotifier eventNotifier, RemoteCertificateValidationCallback userCertificateValidationCallback = null);
         void Release(string connectionString, IInternalConnection connection);
         void ClearPool(string connectionString);
         void ClearPools();
diff --git a/src/AdoNetCore.AseClient/Internal/ConnectionPoolManager.cs b/src/AdoNetCore.AseClient/Internal/ConnectionPoolManager.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Net.Security;
 using AdoNetCore.AseClient.Interface;
 
 namespace AdoNetCore.AseClient.Internal
@@ -14,14 +15,14 @@ internal sealed class ConnectionPoolManager : IConnectionPoolManager, IEnumerabl
 
         private static readonly ConcurrentDictionary<string, IConnectionPool> Pools = new ConcurrentDictionary<string, IConnectionPool>(StringComparer.OrdinalIgnoreCase);
 
-        public IInternalConnection Reserve(string connectionString, IConnectionParameters parameters, IInfoMessageEventNotifier eventNotifier)
+        public IInternalConnection Reserve(string connectionString, IConnectionParameters parameters, IInfoMessageEventNotifier eventNotifier, RemoteCertificateValidationCallback userCertificateValidationCallback = null)
         {
             return Pools.GetOrAdd(connectionString, _ =>
             {
 #if ENABLE_ARRAY_POOL
-                var internalConnectionFactory = new InternalConnectionFactory(parameters, BufferPool);
+                var internalConnectionFactory = new InternalConnectionFactory(parameters, BufferPool, userCertificateValidationCallback);
 #else
-                var internalConnectionFactory = new InternalConnectionFactory(parameters);
+                var internalConnectionFactory = new InternalConnectionFactory(parameters, userCertificateValidationCallback);
 #endif
 
                 return new ConnectionPool(parameters, internalConnectionFactory);
diff --git a/src/AdoNetCore.AseClient/Internal/FormatItem.cs b/src/AdoNetCore.AseClient/Internal/FormatItem.cs
@@ -64,50 +64,60 @@ public string ParameterName
         /// </summary>
         public SerializationType SerializationType { get; set; }
 
-        public static FormatItem CreateForParameter(AseParameter parameter, DbEnvironment env, CommandType commandType)
+        public static FormatItem CreateForParameter(AseParameter parameter, DbEnvironment env, AseCommand command)
         {
             parameter.AseDbType = TypeMap.InferType(parameter);
 
             var dbType = parameter.DbType;
-
             var length = TypeMap.GetFormatLength(dbType, parameter, env.Encoding);
 
-            var format = new FormatItem
+            var format = command.FormatItem;
+            var parameterName = parameter.ParameterName ?? command.Parameters.IndexOf(parameter).ToString();
+            if (!(command.FormatItem != null && command.FormatItem.ParameterName == parameterName &&
+                  command.FormatItem.AseDbType == parameter.AseDbType))
             {
-                AseDbType = parameter.AseDbType,
-                ParameterName = parameter.ParameterName,
-                IsOutput = parameter.IsOutput,
-                IsNullable = parameter.IsNullable,
-                Length = length,
-                DataType = TypeMap.GetTdsDataType(dbType, parameter.SendableValue, length, parameter.ParameterName),
-                UserType = TypeMap.GetUserType(dbType, parameter.SendableValue, length)
-            };
+                format = new FormatItem
+                {
+                    AseDbType = parameter.AseDbType,
+                    ParameterName = parameter.ParameterName,
+                    IsOutput = parameter.IsOutput,
+                    IsNullable = parameter.IsNullable,
+                    Length = length,
+                    DataType = TypeMap.GetTdsDataType(dbType, parameter.SendableValue, length, parameter.ParameterName),
+                    UserType = TypeMap.GetUserType(dbType, parameter.SendableValue, length)
+                };
 
-            //fixup the FormatItem's BlobType for strings and byte arrays
-            if (format.DataType == TdsDataType.TDS_BLOB)
-            {
-                switch (parameter.DbType)
+                //fixup the FormatItem's BlobType for strings and byte arrays
+                if (format.DataType == TdsDataType.TDS_BLOB)
                 {
-                    case DbType.AnsiString:
-                        format.BlobType = BlobType.BLOB_LONGCHAR;
-                        break;
-                    case DbType.String:
-                        format.BlobType = BlobType.BLOB_UNICHAR;
-                        // This is far less than ideal but at the time of addressing this issue whereby if the
-                        // BlobType is a BLOB_UNICHAR then the UserType would need to be 36 when it
-                        // is a stored proc otherwise it would need to be zero (0).
-                        //
-                        // In the future, we'd need to overhaul how TDS_BLOB is structured especially
-                        // around BLOB_UNICHAR and the UserType that it should return in a more consistent way
-                        if (commandType != CommandType.StoredProcedure)
-                            format.UserType = 0;
+                    switch (parameter.DbType)
+                    {
+                        case DbType.AnsiString:
+                            format.BlobType = BlobType.BLOB_LONGCHAR;
+                            break;
+                        case DbType.String:
+                            format.BlobType = BlobType.BLOB_UNICHAR;
+                            // This is far less than ideal but at the time of addressing this issue whereby if the
+                            // BlobType is a BLOB_UNICHAR then the UserType would need to be 36 when it
+                            // is a stored proc otherwise it would need to be zero (0).
+                            //
+                            // In the future, we'd need to overhaul how TDS_BLOB is structured especially
+                            // around BLOB_UNICHAR and the UserType that it should return in a more consistent way
+                            if (command.CommandType != CommandType.StoredProcedure)
+                                format.UserType = 0;
 
-                        break;
-                    case DbType.Binary:
-                        format.BlobType = BlobType.BLOB_LONGBINARY;
-                        break;
+                            break;
+                        case DbType.Binary:
+                            format.BlobType = BlobType.BLOB_LONGBINARY;
+                            break;
+                    }
                 }
             }
+            else
+            {
+                format.DataType = TypeMap.GetTdsDataType(dbType, parameter.SendableValue, length, parameter.ParameterName);
+                format.UserType = TypeMap.GetUserType(dbType, parameter.SendableValue, length);
+            }
 
             //fixup the FormatItem's length,scale,precision for decimals
             if (format.IsDecimalType)
diff --git a/src/AdoNetCore.AseClient/Internal/InternalConnection.cs b/src/AdoNetCore.AseClient/Internal/InternalConnection.cs
@@ -669,11 +669,7 @@ private IToken[] BuildParameterTokens(AseCommand command)
 
             foreach (var parameter in command.Parameters.SendableParameters)
             {
-                var parameterName = parameter.ParameterName ?? command.Parameters.IndexOf(parameter).ToString();
-                if (!(command.FormatItem != null && command.FormatItem.ParameterName == parameterName && command.FormatItem.AseDbType == parameter.AseDbType))
-                {
-                    command.FormatItem = FormatItem.CreateForParameter(parameter, _environment, command.CommandType);
-                }
+                command.FormatItem = FormatItem.CreateForParameter(parameter, _environment, command);
 
                 formatItems.Add(command.FormatItem);
                 parameterItems.Add(new ParametersToken.Parameter
diff --git a/src/AdoNetCore.AseClient/Internal/InternalConnectionFactory.cs b/src/AdoNetCore.AseClient/Internal/InternalConnectionFactory.cs
@@ -19,18 +19,23 @@ namespace AdoNetCore.AseClient.Internal
     internal class InternalConnectionFactory : IInternalConnectionFactory
     {
         private readonly IConnectionParameters _parameters;
+        private readonly RemoteCertificateValidationCallback _userCertificateValidationCallback;
+
+
 #if ENABLE_ARRAY_POOL
         private readonly System.Buffers.ArrayPool<byte> _arrayPool;
 #endif
         private IPEndPoint _endpoint;
 
 #if ENABLE_ARRAY_POOL
-        public InternalConnectionFactory(IConnectionParameters parameters, System.Buffers.ArrayPool<byte> arrayPool)
+        public InternalConnectionFactory(IConnectionParameters parameters, System.Buffers.ArrayPool<byte> arrayPool, RemoteCertificateValidationCallback userCertificateValidationCallback)
 #else
-        public InternalConnectionFactory(IConnectionParameters parameters)
+        public InternalConnectionFactory(IConnectionParameters parameters, RemoteCertificateValidationCallback userCertificateValidationCallback)
 #endif
         {
             _parameters = parameters;
+            _userCertificateValidationCallback = userCertificateValidationCallback ?? UserCertificateValidationCallback;
+
 #if ENABLE_ARRAY_POOL
             _arrayPool = arrayPool;
 #endif
@@ -109,7 +114,7 @@ private InternalConnection CreateConnection(Socket socket, CancellationToken tok
 
                 if (_parameters.Encryption)
                 {
-                    sslStream = new SslStream(networkStream, false, UserCertificateValidationCallback);
+                    sslStream = new SslStream(networkStream, false, _userCertificateValidationCallback);
 
                     var authenticate = sslStream.AuthenticateAsClientAsync(_parameters.Server);
 
@@ -175,10 +180,11 @@ private InternalConnection CreateConnectionInternal(Stream networkStream)
 #if ENABLE_ARRAY_POOL
             return new InternalConnection(_parameters, networkStream, reader, environment, _arrayPool);
 #else   
-                return new InternalConnection(_parameters, networkStream, reader, environment);
+            return new InternalConnection(_parameters, networkStream, reader, environment);
 #endif
         }
 
+
         private bool UserCertificateValidationCallback(object sender, X509Certificate serverCertificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
             var certificateChainPolicyErrors = (sslPolicyErrors & SslPolicyErrors.RemoteCertificateChainErrors) == SslPolicyErrors.RemoteCertificateChainErrors;
diff --git a/src/AdoNetCore.AseClient/Internal/SchemaTableBuilder.cs b/src/AdoNetCore.AseClient/Internal/SchemaTableBuilder.cs
@@ -130,17 +130,12 @@ private FillTableResults FillTableFromFormats(DataTable table)
         private void TryLoadKeyInfo(DataTable table, string baseTableNameValue, string baseSchemaNameValue, string baseCatalogNameValue)
         {
             if (_connection == null)
-            {
                 throw new InvalidOperationException("Invalid AseCommand.Connection");
-            }
 
             if (_connection.State != ConnectionState.Open)
-            {
                 throw new InvalidOperationException("Invalid AseCommand.Connection.ConnectionState");
-            }
 
-            if (!string.IsNullOrWhiteSpace(baseTableNameValue) &&
-                !string.IsNullOrWhiteSpace(baseCatalogNameValue))
+            if (string.IsNullOrWhiteSpace(baseTableNameValue))
                 return;
 
             using (var command = _connection.CreateCommand())
diff --git a/test/AdoNetCore.AseClient.Tests/AdoNetCore.AseClient.Tests.csproj b/test/AdoNetCore.AseClient.Tests/AdoNetCore.AseClient.Tests.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
   </ItemGroup>
   <ItemGroup>
@@ -34,9 +35,11 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
+    <PackageReference Include="System.Net.Security" Version="4.3.2" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
+    <PackageReference Include="System.Net.Security" Version="4.3.2" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
     <PackageReference Include="Sybase.AdoNet4.AseClient">
diff --git a/test/AdoNetCore.AseClient.Tests/Integration/AseCommandTests.cs b/test/AdoNetCore.AseClient.Tests/Integration/AseCommandTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Integration/ConnectionTests.cs b/test/AdoNetCore.AseClient.Tests/Integration/ConnectionTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Integration/TextEchoProcedureTests.cs b/test/AdoNetCore.AseClient.Tests/Integration/TextEchoProcedureTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/AseConnectionTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/AseConnectionTests.cs

Original file line number	Diff line number	Diff line change
`@@ -224,12 +224,15 @@ private static DataTable GetSchemaTableWithKeyInfo(DbCommand sourceCommand)`
`224`	`224`	`if (dataTable != null)`
`225`	`225`	`{`
`226`	`226`	`// If there is no primary key on the table, then throw MissingPrimaryKeyException.`
`227`		`- var isKeyColumn = dataTable.Columns["IsKey"];`
	`227`	`+ var isKeyColumn = dataTable.Columns[SchemaTableColumn.IsKey];`
	`228`	`+ var isUniqueColumn = dataTable.Columns[SchemaTableColumn.IsUnique];`
	`229`	`+`
`228`	`230`	`var hasKey = false;`
`229`	`231`
`230`	`232`	`foreach (DataRow columnDescriptorRow in dataTable.Rows)`
`231`	`233`	`{`
`232`		`- hasKey \|= (bool)columnDescriptorRow[isKeyColumn];`
	`234`	`+ hasKey \|= (bool)columnDescriptorRow[isKeyColumn] \|\|`
	`235`	`+ (bool)columnDescriptorRow[isUniqueColumn];`
`233`	`236`
`234`	`237`	`if (hasKey)`
`235`	`238`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using System.Data;`
`4`	`4`	`using System.Data.Common;`
	`5`	`+using System.Net.Security;`
`5`	`6`	`using AdoNetCore.AseClient.Interface;`
`6`	`7`	`using AdoNetCore.AseClient.Internal;`
`7`	`8`
`@@ -274,7 +275,7 @@ public override void Open()`
`274`	`275`	`{`
`275`	`276`	`var parameters = ConnectionParameters.Parse(_connectionString);`
`276`	`277`
`277`		`- _internal = _connectionPoolManager.Reserve(_connectionString, parameters, _eventNotifier);`
	`278`	`+ _internal = _connectionPoolManager.Reserve(_connectionString, parameters, _eventNotifier, UserCertificateValidationCallback);`
`278`	`279`
`279`	`280`	`InternalConnectionTimeout = parameters.LoginTimeout;`
`280`	`281`	`}`
`@@ -543,7 +544,10 @@ public bool NamedParameters`
`543`	`544`	`#if ENABLE_CLONEABLE_INTERFACE`
`544`	`545`	`public object Clone()`
`545`	`546`	`{`
`546`		`- return new AseConnection(_connectionString, _connectionPoolManager);`
	`547`	`+ return new AseConnection(_connectionString, _connectionPoolManager)`
	`548`	`+ {`
	`549`	`+ UserCertificateValidationCallback = UserCertificateValidationCallback,`
	`550`	`+ };`
`547`	`551`	`}`
`548`	`552`	`#endif`
`549`	`553`
`@@ -621,6 +625,12 @@ public AseTransaction Transaction`
`621`	`625`	`return _transaction;`
`622`	`626`	`}`
`623`	`627`	`}`
	`628`	`+`
	`629`	`+ /// <summary>`
	`630`	`+ /// Allow consumer to override the default certificate validation`
	`631`	`+ /// </summary>`
	`632`	`+ public RemoteCertificateValidationCallback UserCertificateValidationCallback { get; set; }`
	`633`	`+`
`624`	`634`	`}`
`625`	`635`
`626`	`636`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -263,10 +263,10 @@ public AseParameter Add(string parameterName, AseDbType dbType, int size, Parame`
`263`	`263`	`/// <returns>A new <see cref="AseParameter" /> object.</returns>`
`264`	`264`	`public AseParameter Add(AseParameter parameter)`
`265`	`265`	`{`
`266`		`- if (parameter != null)`
`267`		`- {`
`268`		`- _parameters.Add(parameter);`
`269`		`- }`
	`266`	`+ if (parameter == null) throw new ArgumentNullException(nameof(parameter));`
	`267`	`+ if (Contains(parameter)) throw new ArgumentException($"parameter name '{parameter.ParameterName}' is already in the collection");`
	`268`	`+`
	`269`	`+ _parameters.Add(parameter);`
`270`	`270`	`return parameter;`
`271`	`271`	`}`
`272`	`272`
`@@ -379,6 +379,7 @@ public override int Add(object value)`
`379`	`379`	`{`
`380`	`380`	`if (value is AseParameter p)`
`381`	`381`	`{`
	`382`	`+ if (Contains(p)) throw new ArgumentException($"Parameter name: '{p.ParameterName}' is already registered", nameof(value));`
`382`	`383`	`return ((IList)_parameters).Add(p);`
`383`	`384`	`}`
`384`	`385`	`return -1;`
`@@ -438,15 +439,23 @@ public override int IndexOf(object value)`
`438`	`439`	`/// Returns -1 when the object does not exist in the <see cref="AseParameterCollection" />.</returns>`
`439`	`440`	`public int IndexOf(AseParameter value)`
`440`	`441`	`{`
`441`		`- if (value != null)`
	`442`	`+ if (value == null) return -1;`
	`443`	`+ for (var i = 0; i < _parameters.Count; i++)`
`442`	`444`	`{`
`443`		`- for (var i = 0; i < _parameters.Count; i++)`
	`445`	`+ if (string.IsNullOrWhiteSpace(value.ParameterName))`
`444`	`446`	`{`
`445`	`447`	`if (value == _parameters[i])`
`446`	`448`	`{`
`447`	`449`	`return i;`
`448`	`450`	`}`
`449`	`451`	`}`
	`452`	`+ else`
	`453`	`+ {`
	`454`	`+ if (value == _parameters[i] \|\| value.ParameterName == _parameters[i].ParameterName)`
	`455`	`+ {`
	`456`	`+ return i;`
	`457`	`+ }`
	`458`	`+ }`
`450`	`459`	`}`
`451`	`460`
`452`	`461`	`return -1;`
`@@ -459,6 +468,7 @@ public int IndexOf(AseParameter value)`
`459`	`468`	`/// <param name="parameter">The <see cref="AseParameter" /> object to add to the collection.</param>`
`460`	`469`	`public override void Insert(int index, object parameter)`
`461`	`470`	`{`
	`471`	`+ if (Contains(parameter)) throw new ArgumentException($"parameter name '{parameter}' is already in the collection");`
`462`	`472`	`((IList)_parameters).Insert(index, parameter);`
`463`	`473`	`}`
`464`	`474`
`@@ -469,6 +479,7 @@ public override void Insert(int index, object parameter)`
`469`	`479`	`/// <param name="parameter">The <see cref="AseParameter" /> object to add to the collection.</param>`
`470`	`480`	`public void Insert(int index, AseParameter parameter)`
`471`	`481`	`{`
	`482`	`+ if (Contains(parameter)) throw new ArgumentException($"parameter name '{parameter.ParameterName}' is already in the collection");`
`472`	`483`	`((IList)_parameters).Insert(index, parameter);`
`473`	`484`	`}`
`474`	`485`
`@@ -521,10 +532,7 @@ public override void RemoveAt(int index)`
`521`	`532`	`/// <param name="index">The starting index of the array.</param>`
`522`	`533`	`public override void CopyTo(Array array, int index)`
`523`	`534`	`{`
`524`		`- if (array != null)`
`525`		`- {`
`526`		`- ((IList)_parameters).CopyTo(array, index);`
`527`		`- }`
	`535`	`+ ((IList)_parameters).CopyTo(array, index);`
`528`	`536`	`}`
`529`	`537`
`530`	`538`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
	`1`	`+using System.Net.Security;`
	`2`	`+`
`1`	`3`	`namespace AdoNetCore.AseClient.Interface`
`2`	`4`	`{`
`3`	`5`	`internal interface IConnectionPoolManager`
`4`	`6`	`{`
`5`		`- IInternalConnection Reserve(string connectionString, IConnectionParameters parameters, IInfoMessageEventNotifier eventNotifier);`
	`7`	`+ IInternalConnection Reserve(string connectionString, IConnectionParameters parameters, IInfoMessageEventNotifier eventNotifier, RemoteCertificateValidationCallback userCertificateValidationCallback = null);`
`6`	`8`	`void Release(string connectionString, IInternalConnection connection);`
`7`	`9`	`void ClearPool(string connectionString);`
`8`	`10`	`void ClearPools();`