Fixed issue with transactions. Updated linq2db version.

sdanyliv · sdanyliv · commit 6633aeb2fbec · 2018-12-06T16:33:02.000+02:00
diff --git a/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs b/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs
@@ -21,7 +21,7 @@ namespace LinqToDB.EntityFrameworkCore.Internal
 	///		It may change or be removed without further notice.
 	/// </summary>
 	/// <typeparam name="T"></typeparam>
-	public class LinqToDBForEFQueryProvider<T> : IAsyncQueryProvider, IQueryable<T>, System.Collections.Generic.IAsyncEnumerable<T>
+	public class LinqToDBForEFQueryProvider<T> : IAsyncQueryProvider, IQueryProviderAsync, IQueryable<T>, System.Collections.Generic.IAsyncEnumerable<T>
 	{
 		public LinqToDBForEFQueryProvider([NotNull] IDataContext dataContext, [NotNull] Expression expression)
 		{
@@ -59,6 +59,11 @@ public System.Collections.Generic.IAsyncEnumerable<TResult> ExecuteAsync<TResult
 			return new AsyncEnumerableAdaper<TResult>(QueryProvider.ExecuteAsync<TResult>(expression));
 		}
 
+		IAsyncEnumerable<TResult> IQueryProviderAsync.ExecuteAsync<TResult>(Expression expression)
+		{
+			return QueryProvider.ExecuteAsync<TResult>(expression);
+		}
+
 		public Task<TResult> ExecuteAsync<TResult>(Expression expression, CancellationToken cancellationToken)
 		{
 			return QueryProvider.ExecuteAsync<TResult>(expression, cancellationToken);
diff --git a/Source/LinqToDB.EntityFrameworkCore/linq2db.EntityFrameworkCore.csproj b/Source/LinqToDB.EntityFrameworkCore/linq2db.EntityFrameworkCore.csproj
@@ -9,9 +9,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="linq2db" Version="2.2.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.1" />
-		<PackageReference Include="System.Interactive.Async" Version="3.1.1" />
+		<PackageReference Include="linq2db" Version="2.5.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.Tests/LinqToDB.EntityFrameworkCore.Tests.csproj b/Tests/LinqToDB.EntityFrameworkCore.Tests/LinqToDB.EntityFrameworkCore.Tests.csproj
@@ -6,14 +6,14 @@
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.0.20171219.105559" />
-		<PackageReference Include="linq2db.MySql" Version="2.0.0-beta5" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0-rc1-final" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.0-rc1-final" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0-preview2" />
-		<PackageReference Include="NUnit" Version="3.10.1" />
-		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.0.1" />
+		<PackageReference Include="linq2db" Version="2.5.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
+		<PackageReference Include="NUnit" Version="3.11.0" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.Tests/ToolsTests.cs b/Tests/LinqToDB.EntityFrameworkCore.Tests/ToolsTests.cs
@@ -274,7 +274,7 @@ orderby p.ProductID
 		}
 
 		[Test]
-		public void TestTransaction()
+		public async Task TestTransaction()
 		{
 			using (var ctx = CreateAdventureWorksContext())
 			{
@@ -297,8 +297,8 @@ public void TestTransaction()
 						.Delete();
 
 
-					var test1 = ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsync(p => p.StandardCost).Result;
-					var test2 = ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsyncLinqToDB(p => p.StandardCost).Result;
+					var test1 = await ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsync(p => p.StandardCost);
+					var test2 = await ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsyncLinqToDB(p => p.StandardCost);
 
 					Assert.AreEqual(test1, test2);
 
@@ -557,6 +557,21 @@ public async Task TestContinuousQueries()
 
 		}
 
+		[Test]
+		public async Task TestSetUpdate()
+		{
+			using (var ctx = CreateAdventureWorksContext())
+			{
+				var customer = await ctx.Customers.FirstOrDefaultAsync();
+
+				var updatable = ctx.Customers.Where(c => c.CustomerID == customer.CustomerID)
+					.Set(c => c.CompanyName, customer.CompanyName);
+
+				var affected = updatable
+					.UpdateAsync();
+			}
+		}
+
 
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace LinqToDB.EntityFrameworkCore.Internal`
`21`	`21`	`/// It may change or be removed without further notice.`
`22`	`22`	`/// </summary>`
`23`	`23`	`/// <typeparam name="T"></typeparam>`
`24`		`- public class LinqToDBForEFQueryProvider<T> : IAsyncQueryProvider, IQueryable<T>, System.Collections.Generic.IAsyncEnumerable<T>`
	`24`	`+ public class LinqToDBForEFQueryProvider<T> : IAsyncQueryProvider, IQueryProviderAsync, IQueryable<T>, System.Collections.Generic.IAsyncEnumerable<T>`
`25`	`25`	`{`
`26`	`26`	`public LinqToDBForEFQueryProvider([NotNull] IDataContext dataContext, [NotNull] Expression expression)`
`27`	`27`	`{`
`@@ -59,6 +59,11 @@ public System.Collections.Generic.IAsyncEnumerable<TResult> ExecuteAsync<TResult`
`59`	`59`	`return new AsyncEnumerableAdaper<TResult>(QueryProvider.ExecuteAsync<TResult>(expression));`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ IAsyncEnumerable<TResult> IQueryProviderAsync.ExecuteAsync<TResult>(Expression expression)`
	`63`	`+ {`
	`64`	`+ return QueryProvider.ExecuteAsync<TResult>(expression);`
	`65`	`+ }`
	`66`	`+`
`62`	`67`	`public Task<TResult> ExecuteAsync<TResult>(Expression expression, CancellationToken cancellationToken)`
`63`	`68`	`{`
`64`	`69`	`return QueryProvider.ExecuteAsync<TResult>(expression, cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ orderby p.ProductID`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`[Test]`
`277`		`- public void TestTransaction()`
	`277`	`+ public async Task TestTransaction()`
`278`	`278`	`{`
`279`	`279`	`using (var ctx = CreateAdventureWorksContext())`
`280`	`280`	`{`
`@@ -297,8 +297,8 @@ public void TestTransaction()`
`297`	`297`	`.Delete();`
`298`	`298`
`299`	`299`
`300`		`- var test1 = ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsync(p => p.StandardCost).Result;`
`301`		`- var test2 = ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsyncLinqToDB(p => p.StandardCost).Result;`
	`300`	`+ var test1 = await ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsync(p => p.StandardCost);`
	`301`	`+ var test2 = await ctx.Products.Where(p => p.Name.StartsWith("U")).MaxAsyncLinqToDB(p => p.StandardCost);`
`302`	`302`
`303`	`303`	`Assert.AreEqual(test1, test2);`
`304`	`304`
`@@ -557,6 +557,21 @@ public async Task TestContinuousQueries()`
`557`	`557`
`558`	`558`	`}`
`559`	`559`
	`560`	`+ [Test]`
	`561`	`+ public async Task TestSetUpdate()`
	`562`	`+ {`
	`563`	`+ using (var ctx = CreateAdventureWorksContext())`
	`564`	`+ {`
	`565`	`+ var customer = await ctx.Customers.FirstOrDefaultAsync();`
	`566`	`+`
	`567`	`+ var updatable = ctx.Customers.Where(c => c.CustomerID == customer.CustomerID)`
	`568`	`+ .Set(c => c.CompanyName, customer.CompanyName);`
	`569`	`+`
	`570`	`+ var affected = updatable`
	`571`	`+ .UpdateAsync();`
	`572`	`+ }`
	`573`	`+ }`
	`574`	`+`
`560`	`575`
`561`	`576`	`}`
`562`	`577`	`}`