Merge pull request #252 from linq2db/master

sdanyliv · web-flow · commit 8dfbe2e0bfac · 2022-09-06T16:33:42.000+03:00
Release 5.12.0
diff --git a/.editorconfig b/.editorconfig
@@ -251,6 +251,7 @@ dotnet_diagnostic.IDE0079.severity = none # IDE0079: Remove unnecessary suppress
 dotnet_diagnostic.IDE0080.severity = none # IDE0080: Remove unnecessary suppression operator
 dotnet_diagnostic.IDE0081.severity = none # IDE0081: Remove ByVal
 dotnet_diagnostic.IDE0083.severity = none # IDE0083: Use pattern matching (not operator)
+dotnet_diagnostic.IDE0130.severity = none # IDE0130: Namespace does not match folder structure
 dotnet_diagnostic.IDE1006.severity = none # IDE1006: Naming rule violation
 
 dotnet_diagnostic.CS1998.severity = error # CS1998: Async method lacks 'await' operators and will run synchronously
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 ﻿<Project>
 	<PropertyGroup>
-		<Version>5.11.0</Version>
+		<Version>5.12.0</Version>
 
 		<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
 		<Product>Linq to DB</Product>
diff --git a/Build/linq2db.Tests.props b/Build/linq2db.Tests.props
@@ -2,7 +2,7 @@
 	<Import Project="linq2db.Default.props" />
 	
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+		<TargetFramework>net5.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,8 +5,8 @@
 		<PackageVersion Include="NUnit" Version="3.13.3" />
 		<PackageVersion Include="FluentAssertions" Version="6.6.0" />
 
-		<PackageVersion Include="linq2db" Version="4.0.1" />
-		<PackageVersion Include="linq2db.Tools" Version="4.0.1" />
+		<PackageVersion Include="linq2db" Version="4.2.0" />
+		<PackageVersion Include="linq2db.Tools" Version="4.2.0" />
 
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 
@@ -20,5 +20,8 @@
 		<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
 		<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.17" />
 		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.17" />
+
+		<PackageVersion Include="EntityFrameworkCore.FSharp" Version="5.0.3" />
+		<PackageVersion Include="FSharp.Core" Version="6.0.5" />
 	</ItemGroup>
 </Project>
diff --git a/NuGet/linq2db.EntityFrameworkCore.nuspec b/NuGet/linq2db.EntityFrameworkCore.nuspec
@@ -16,7 +16,7 @@
 		<dependencies>
 			<group targetFramework=".NETStandard2.1">
 				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="5.0.17" />
-				<dependency id="linq2db" version="4.0.1" />
+				<dependency id="linq2db" version="4.2.0" />
 			</group>
 		</dependencies>
 	</metadata>
diff --git a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
@@ -524,7 +524,7 @@ public override int GetHashCode()
 					var objExpr = new SqlTransparentExpression(Expression.Constant(DefaultValue.GetValue(type), type), _mappingSource?.FindMapping(propInfo));
 
 					var newExpression = _dependencies.MemberTranslatorProvider.Translate(objExpr, propInfo, propInfo.GetMemberType(), _logger!);
-					if (newExpression != null)
+					if (newExpression != null && newExpression != objExpr)
 					{
 						var parametersArray = new Expression[] { objExpr };
 						result = ConvertToExpressionAttribute(propInfo, newExpression, parametersArray);
diff --git a/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs b/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -158,8 +159,17 @@ IEnumerator IEnumerable.GetEnumerator()
 		/// <returns>Query result as <see cref="IAsyncEnumerable{T}"/>.</returns>
 		public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken)
 		{
-			return Task.Run(() => QueryProvider.ExecuteAsyncEnumerable<T>(Expression, cancellationToken),
-				cancellationToken).Result.GetAsyncEnumerator(cancellationToken);
+			async IAsyncEnumerable<T> EnumerateAsyncEnumerable([EnumeratorCancellation] CancellationToken ct)
+			{
+				var asyncEnumerable = await QueryProvider.ExecuteAsyncEnumerable<T>(Expression, ct)
+					.ConfigureAwait(false);
+				await foreach (var item in asyncEnumerable.WithCancellation(ct).ConfigureAwait(false))
+				{
+					yield return item;
+				}
+			}
+
+			return EnumerateAsyncEnumerable(cancellationToken).GetAsyncEnumerator(cancellationToken);
 		}
 
 		/// <summary>
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsDataConnection.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsDataConnection.cs
@@ -85,8 +85,8 @@ public LinqToDBForEFToolsDataConnection(
 			[NotNull]   IDataProvider dataProvider,
 			[NotNull]   DbTransaction transaction,
 			            IModel?       model,
-			Func<Expression, IDataContext, DbContext?, IModel?, Expression>? transformFunc
-			) : base(dataProvider, transaction)
+			Func<Expression, IDataContext, DbContext?, IModel?, Expression>? transformFunc)
+				: base(dataProvider, transaction)
 		{
 			Context          = context;
 			_model           = model;
@@ -243,9 +243,11 @@ object IEntityServiceInterceptor.EntityCreated(EntityCreatedEventData eventData,
 			var assignExpr = Expression.Assign(variable, Expression.Convert(objParam, entityType.ClrType));
 
 			var key = entityType.GetKeys().FirstOrDefault();
+			if (key == null)
+				return null;
 
 			var arrayExpr = key.Properties.Where(p => p.PropertyInfo != null || p.FieldInfo != null).Select(p =>
-					Expression.Convert(Expression.MakeMemberAccess(variable, p.PropertyInfo ?? (MemberInfo)p.FieldInfo),
+					Expression.Convert(Expression.MakeMemberAccess(variable, p.PropertyInfo ?? (MemberInfo)p.FieldInfo!),
 						typeof(object)))
 				.ToArray();
 
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -1074,6 +1074,7 @@ public virtual EFConnectionInfo ExtractConnectionInfo(IDbContextOptions? options
 		/// <param name="logger">Logger instance.</param>
 		public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)
 		{
+#pragma warning disable CA1848 // Use the LoggerMessage delegates
 			var logLevel = info.TraceLevel switch
 			{
 				TraceLevel.Off => LogLevel.None,
@@ -1084,7 +1085,6 @@ public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)
 				_ => LogLevel.Trace,
 			};
 
-#pragma warning disable CA1848 // Use the LoggerMessage delegates
 			using var _ = logger.BeginScope("TraceInfoStep: {TraceInfoStep}, IsAsync: {IsAsync}", info.TraceInfoStep, info.IsAsync);
 
 			switch (info.TraceInfoStep)
diff --git a/Tests/LinqToDB.EntityFrameworkCore.FSharpTests/LinqToDB.EntityFrameworkCore.FSharpTests.fsproj b/Tests/LinqToDB.EntityFrameworkCore.FSharpTests/LinqToDB.EntityFrameworkCore.FSharpTests.fsproj
@@ -0,0 +1,20 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\Build\linq2db.Tests.props" />
+
+    <PropertyGroup>
+        <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="Tests.fs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\Source\LinqToDB.EntityFrameworkCore\linq2db.EntityFrameworkCore.csproj" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+        <PackageReference Include="EntityFrameworkCore.FSharp" />
+        <PackageReference Include="FSharp.Core" />
+    </ItemGroup>
+
+</Project>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.FSharpTests/Tests.fs b/Tests/LinqToDB.EntityFrameworkCore.FSharpTests/Tests.fs
@@ -0,0 +1,61 @@
+﻿module LinqToDB.EntityFrameworkCore.FSharpTests
+
+open System.Linq
+open LinqToDB
+open System.ComponentModel.DataAnnotations
+open System.ComponentModel.DataAnnotations.Schema
+open Microsoft.EntityFrameworkCore
+open EntityFrameworkCore.FSharp.Extensions
+open NUnit.Framework
+
+[<CLIMutable>]
+type WithIdentity = {
+    [<Key>]
+    [<DatabaseGenerated(DatabaseGeneratedOption.Identity)>]
+    Id : int
+    Name : string
+}
+
+type AppDbContext(options: DbContextOptions<AppDbContext>) =
+    inherit DbContext(options)
+
+    [<DefaultValue>] val mutable WithIdentity : DbSet<WithIdentity>
+    member this.CompaniesInformation
+        with get() = this.WithIdentity
+        and set v = this.WithIdentity <- v
+
+type TestDbContextFactory() =
+    member this.CreateDbContext() =
+        let options = new DbContextOptionsBuilder<AppDbContext>()
+        options.UseSqlite("DataSource=:memory:").UseFSharpTypes() |> ignore
+        new AppDbContext(options.Options)
+
+[<TestFixture>]
+type Tests() =
+
+    [<Test>]
+    member this.TestLeftJoin() =
+        let context = TestDbContextFactory().CreateDbContext()
+        let q =
+            context
+                .WithIdentity
+                .Join(
+                    context.WithIdentity,
+                    (fun p -> p.Id),
+                    (fun c -> c.Id),
+                    (fun p c ->
+                    {|
+                        Person = p
+                        Company = c
+                    |}) )
+                .LeftJoin(
+                    context.WithIdentity,
+                    (fun partialPerson cInfo -> partialPerson.Company.Id = cInfo.Id),
+                    (fun partialPerson cInfo ->
+                    {|
+                        Company = partialPerson.Company
+                        CompanyInformation = cInfo
+                        Person = partialPerson.Person
+                    |}) )
+        //q.ToArray() |> ignore
+        q.ToLinqToDB().ToString() |> ignore
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/EntityWithXmin.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/EntityWithXmin.cs
@@ -1,4 +1,5 @@
-﻿using System.ComponentModel.DataAnnotations;
+﻿using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.Models.NpgSqlEntities
 {
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/JsonConverTests.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/JsonConverTests.cs
@@ -26,7 +26,7 @@ public class EventScheduleItemBase
 		{
 			public int Id { get; set; }
 			public virtual LocalizedString NameLocalized { get; set; } = null!;
-			public virtual string JsonColumn { get; set; } = null!;
+			public virtual string? JsonColumn { get; set; }
 		}
 		
 		public enum CrashEnum : byte
@@ -74,7 +74,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 					entity.Property(e => e.GuidColumn).HasColumnType("uniqueidentifier");
 				});
 
-				modelBuilder.HasDbFunction(typeof(JsonConverTests).GetMethod(nameof(JsonConverTests.JsonValue)))
+				modelBuilder.HasDbFunction(typeof(JsonConverTests).GetMethod(nameof(JsonConverTests.JsonValue))!)
 					.HasTranslation(e => new SqlFunctionExpression(
 						"JSON_VALUE", e, true, e.Select(_ => false), typeof(string), null));
 			}
@@ -133,14 +133,15 @@ public void TestJsonConvert()
 						p.NameLocalized,
 						p.CrashEnum,
 						p.GuidColumn,
-						JsonValue = JsonValue(p.JsonColumn, path)
+						JsonValue = JsonValue(p.JsonColumn!, path)
 					});
 
 				var item = items.FirstOrDefault();
 
-				Assert.That(item.NameLocalized.English, Is.EqualTo("English"));
-				Assert.That(item.NameLocalized.German,  Is.EqualTo("German"));
-				Assert.That(item.NameLocalized.Slovak,  Is.EqualTo("Slovak"));
+				Assert.IsNotNull(item);
+				Assert.That(item!.NameLocalized.English, Is.EqualTo("English"));
+				Assert.That(item.NameLocalized.German,   Is.EqualTo("German"));
+				Assert.That(item.NameLocalized.Slovak,   Is.EqualTo("Slovak"));
 
 				//TODO: make it work
 				// var concrete = queryable.Select(p => new
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/Inheritance/InheritanceContext.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/Inheritance/InheritanceContext.cs
@@ -1,4 +1,6 @@
-﻿using Microsoft.EntityFrameworkCore;
+﻿using System;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
 
 namespace LinqToDB.EntityFrameworkCore.SqlServer.Tests.Models.Inheritance
 {
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 5.11.0
-  nugetVersion: 5.11.0
+  assemblyVersion: 5.12.0
+  nugetVersion: 5.12.0
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):
diff --git a/linq2db.EFCore.sln b/linq2db.EFCore.sln
@@ -1,14 +1,17 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29324.140
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32505.173
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linq2db.EntityFrameworkCore", "Source\LinqToDB.EntityFrameworkCore\linq2db.EntityFrameworkCore.csproj", "{29F45BE9-3B57-4162-A02A-59F05528A0E7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A3F30061-485E-4112-9675-3AE332BEED13}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
 		Directory.Packages.props = Directory.Packages.props
+		global.json = global.json
 		Build\linq2db.Default.props = Build\linq2db.Default.props
 		Build\linq2db.snk = Build\linq2db.snk
 		Build\linq2db.Tests.props = Build\linq2db.Tests.props
@@ -38,6 +41,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToDB.EntityFrameworkCor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToDB.EntityFrameworkCore.SQLite.Tests", "Tests\LinqToDB.EntityFrameworkCore.SQLite.Tests\LinqToDB.EntityFrameworkCore.SQLite.Tests.csproj", "{615C5697-5FA7-490C-8812-3D61994A8AC1}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LinqToDB.EntityFrameworkCore.FSharpTests", "Tests\LinqToDB.EntityFrameworkCore.FSharpTests\LinqToDB.EntityFrameworkCore.FSharpTests.fsproj", "{ECF4637B-1C93-4D87-BDF2-E7F4DF7ED5C9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -68,6 +73,10 @@ Global
 		{615C5697-5FA7-490C-8812-3D61994A8AC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{615C5697-5FA7-490C-8812-3D61994A8AC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{615C5697-5FA7-490C-8812-3D61994A8AC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECF4637B-1C93-4D87-BDF2-E7F4DF7ED5C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECF4637B-1C93-4D87-BDF2-E7F4DF7ED5C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECF4637B-1C93-4D87-BDF2-E7F4DF7ED5C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECF4637B-1C93-4D87-BDF2-E7F4DF7ED5C9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ public override int GetHashCode()`
`524`	`524`	`var objExpr = new SqlTransparentExpression(Expression.Constant(DefaultValue.GetValue(type), type), _mappingSource?.FindMapping(propInfo));`
`525`	`525`
`526`	`526`	`var newExpression = _dependencies.MemberTranslatorProvider.Translate(objExpr, propInfo, propInfo.GetMemberType(), _logger!);`
`527`		`- if (newExpression != null)`
	`527`	`+ if (newExpression != null && newExpression != objExpr)`
`528`	`528`	`{`
`529`	`529`	`var parametersArray = new Expression[] { objExpr };`
`530`	`530`	`result = ConvertToExpressionAttribute(propInfo, newExpression, parametersArray);`
Original file line number	Diff line number	Diff line change
`@@ -1074,6 +1074,7 @@ public virtual EFConnectionInfo ExtractConnectionInfo(IDbContextOptions? options`
`1074`	`1074`	`/// <param name="logger">Logger instance.</param>`
`1075`	`1075`	`public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)`
`1076`	`1076`	`{`
	`1077`	`+#pragma warning disable CA1848 // Use the LoggerMessage delegates`
`1077`	`1078`	`var logLevel = info.TraceLevel switch`
`1078`	`1079`	`{`
`1079`	`1080`	`TraceLevel.Off => LogLevel.None,`
`@@ -1084,7 +1085,6 @@ public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)`
`1084`	`1085`	`_ => LogLevel.Trace,`
`1085`	`1086`	`};`
`1086`	`1087`
`1087`		`-#pragma warning disable CA1848 // Use the LoggerMessage delegates`
`1088`	`1088`	`using var _ = logger.BeginScope("TraceInfoStep: {TraceInfoStep}, IsAsync: {IsAsync}", info.TraceInfoStep, info.IsAsync);`
`1089`	`1089`
`1090`	`1090`	`switch (info.TraceInfoStep)`