Merge pull request linq2db#2344 from linq2db/master

Release 3.0.1

Author: MaceWindu

Build/Azure/pipelines/default.yml

@@ -1,9 +1,9 @@
 variables:
   solution: 'linq2db.sln'
   build_configuration: 'Azure'
-  assemblyVersion: 3.0.0
-  nugetVersion: 3.0.0
-  nugetDevVersion: 3.0.0
+  assemblyVersion: 3.0.1
+  nugetVersion: 3.0.1
+  nugetDevVersion: 3.0.1
   artifact_nugets: 'nugets'
   artifact_linq2db_binaries: 'linq2db_binaries'
   artifact_linq2db_tools_binaries: 'linq2db_tools_binaries'

Source/LinqToDB/Data/RetryPolicy/RetryingDbCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Data;
+using System.Data;
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;

Source/LinqToDB/DataProvider/DynamicDataProviderBase.cs

@@ -9,6 +9,7 @@ namespace LinqToDB.DataProvider
 {
 	using Expressions;
 	using Extensions;
+	using LinqToDB.Data.RetryPolicy;
 	using Mapping;
 
 	public abstract class DynamicDataProviderBase<TProviderMappings> : DataProviderBase
@@ -168,11 +169,19 @@ protected bool SetProviderField(Type toType, Type fieldType, string methodName,
 
 		public virtual IDbCommand? TryGetProviderCommand(IDbCommand command, MappingSchema ms)
 		{
+			// remove retry policy wrapper
+			if (command is RetryingDbCommand rcmd)
+				command = rcmd.UnderlyingObject;
+
 			return TryConvertProviderType(_commandConverters, Adapter.CommandType, command, ms);
 		}
 
 		public virtual IDbConnection? TryGetProviderConnection(IDbConnection connection, MappingSchema ms)
 		{
+			// remove retry policy wrapper
+			if (connection is RetryingDbConnection rcn)
+				connection = rcn.UnderlyingObject;
+
 			return TryConvertProviderType(_connectionConverters, Adapter.ConnectionType, connection, ms);
 		}
 

Tests/Linq/Data/MiniProfilerTests.cs

@@ -37,6 +37,7 @@
 using LinqToDB.DataProvider.Informix;
 using LinqToDB.DataProvider.Oracle;
 using LinqToDB.DataProvider.PostgreSQL;
+using LinqToDB.Common;
 #if NET46
 using IBM.Data.Informix;
 #endif
@@ -525,6 +526,20 @@ public void TestDB2([IncludeDataSources(ProviderName.DB2)] string context, [Valu
 			}
 		}
 
+		[Test]
+		public void TestRetryPolicy([IncludeDataSources(TestProvName.AllSqlServer)] string context, [Values] ConnectionType type)
+		{
+			Configuration.RetryPolicy.Factory = connection => new SqlServerRetryPolicy();
+			try
+			{
+				TestSqlServer(context, type);
+			}
+			finally
+			{
+				Configuration.RetryPolicy.Factory = null;
+			}
+		}
+
 		[Test]
 		public void TestSqlServer([IncludeDataSources(TestProvName.AllSqlServer)] string context, [Values] ConnectionType type)
 		{

Tests/Linq/DataProvider/OracleTests.cs

@@ -25,6 +25,9 @@
 namespace Tests.DataProvider
 {
 	using System.Diagnostics.CodeAnalysis;
+	using System.Threading;
+	using System.Threading.Tasks;
+	using LinqToDB.Data.RetryPolicy;
 	using LinqToDB.Linq;
 	using LinqToDB.SchemaProvider;
 	using Model;
@@ -2873,5 +2876,45 @@ void AssertColumn(string name, string dbType, int? length)
 				}
 			}
 		}
+
+		#region Issue 2342
+		[Test]
+		public void Issue2342Test([IncludeDataSources(false, TestProvName.AllOracle)] string context)
+		{
+			var oldMode = OracleTools.UseAlternativeBulkCopy;
+			try
+			{
+				OracleTools.UseAlternativeBulkCopy = AlternativeBulkCopy.InsertInto;
+				Configuration.RetryPolicy.Factory  = connection => new DummyRetryPolicy();
+
+				using (var db    = new TestDataConnection(context))
+				using (var table = db.CreateTempTable<Issue2342Entity>())
+				using (db.BeginTransaction())
+				{
+					table.BulkCopy(Enumerable.Range(1, 10).Select(id => new Issue2342Entity { Id = id, Name = $"Name_{id}" }));
+				}
+			}
+			finally
+			{
+				OracleTools.UseAlternativeBulkCopy = oldMode;
+				Configuration.RetryPolicy.Factory  = null;
+			}
+		}
+
+		sealed class DummyRetryPolicy : IRetryPolicy
+		{
+			public TResult       Execute<TResult>(Func<TResult> operation) => operation();
+			public void          Execute(Action operation) => operation();
+			public Task<TResult> ExecuteAsync<TResult>(Func<CancellationToken, Task<TResult>> operation, CancellationToken cancellationToken = new CancellationToken()) => operation(cancellationToken);
+			public Task          ExecuteAsync(Func<CancellationToken, Task> operation, CancellationToken cancellationToken = new CancellationToken()) => operation(cancellationToken);
+		}
+
+		[Table]
+		sealed class Issue2342Entity
+		{
+			[Column]                        public long   Id   { get; set; }
+			[NotNull, Column(Length = 256)] public string Name { get; set; } = null!;
+		}
+		#endregion
 	}
 }