Merge pull request #139 from linq2db/master

sdanyliv · web-flow · commit 8c20620c0181 · 2021-04-30T12:15:13.000+03:00
Release 5.2.1
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 ﻿<Project>
 	<PropertyGroup>
-		<Version>5.2.0</Version>
+		<Version>5.2.1</Version>
 
 		<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
 		<Product>Linq to DB</Product>
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBExtensionsAdapter.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBExtensionsAdapter.cs
@@ -87,17 +87,21 @@ public Task<TSource> FirstAsync<TSource>(
 			=> EntityFrameworkQueryableExtensions.FirstAsync(source, predicate, token);
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
-		public Task<TSource> FirstOrDefaultAsync<TSource>(
+		public Task<TSource?> FirstOrDefaultAsync<TSource>(
 			IQueryable<TSource> source,
 			CancellationToken   token)
+#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
 			=> EntityFrameworkQueryableExtensions.FirstOrDefaultAsync(source, token);
+#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
-		public Task<TSource> FirstOrDefaultAsync<TSource>(
+		public Task<TSource?> FirstOrDefaultAsync<TSource>(
 			IQueryable<TSource>            source,
 			Expression<Func<TSource,bool>> predicate,
 			CancellationToken              token)
+#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
 			=> EntityFrameworkQueryableExtensions.FirstOrDefaultAsync(source, predicate, token);
+#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.SingleAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
 		public Task<TSource> SingleAsync<TSource>(
@@ -113,17 +117,21 @@ public Task<TSource> SingleAsync<TSource>(
 			=> EntityFrameworkQueryableExtensions.SingleAsync(source, predicate, token);
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
-		public Task<TSource> SingleOrDefaultAsync<TSource>(
+		public Task<TSource?> SingleOrDefaultAsync<TSource>(
 			IQueryable<TSource> source,
 			CancellationToken   token)
+#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
 			=> EntityFrameworkQueryableExtensions.SingleOrDefaultAsync(source, token);
+#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
-		public Task<TSource> SingleOrDefaultAsync<TSource>(
+		public Task<TSource?> SingleOrDefaultAsync<TSource>(
 			IQueryable<TSource>            source,
 			Expression<Func<TSource,bool>> predicate,
 			CancellationToken              token)
+#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
 			=> EntityFrameworkQueryableExtensions.SingleOrDefaultAsync(source, predicate, token);
+#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.ContainsAsync{TSource}(IQueryable{TSource}, TSource, CancellationToken)"/>
 		public Task<bool> ContainsAsync<TSource>(
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFExtensions.Async.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFExtensions.Async.cs
@@ -76,13 +76,13 @@ public static Task<TSource> FirstAsyncLinqToDB<TSource>(
 			=> AsyncExtensions.FirstAsync(source.ToLinqToDB(), predicate, token);
 
 		/// <inheritdoc cref="AsyncExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
-		public static Task<TSource> FirstOrDefaultAsyncLinqToDB<TSource>(
+		public static Task<TSource?> FirstOrDefaultAsyncLinqToDB<TSource>(
 			this IQueryable<TSource> source,
 			CancellationToken        token = default)
 			=> AsyncExtensions.FirstOrDefaultAsync(source.ToLinqToDB(), token);
 
 		/// <inheritdoc cref="AsyncExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
-		public static Task<TSource> FirstOrDefaultAsyncLinqToDB<TSource>(
+		public static Task<TSource?> FirstOrDefaultAsyncLinqToDB<TSource>(
 			this IQueryable<TSource>       source,
 			Expression<Func<TSource,bool>> predicate,
 			CancellationToken              token = default)
@@ -102,13 +102,13 @@ public static Task<TSource> SingleAsyncLinqToDB<TSource>(
 			=> AsyncExtensions.SingleAsync(source.ToLinqToDB(), predicate, token);
 
 		/// <inheritdoc cref="AsyncExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
-		public static Task<TSource> SingleOrDefaultAsyncLinqToDB<TSource>(
+		public static Task<TSource?> SingleOrDefaultAsyncLinqToDB<TSource>(
 			this IQueryable<TSource> source,
 			CancellationToken        token = default)
 			=> AsyncExtensions.SingleOrDefaultAsync(source.ToLinqToDB(), token);
 
 		/// <inheritdoc cref="AsyncExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
-		public static Task<TSource> SingleOrDefaultAsyncLinqToDB<TSource>(
+		public static Task<TSource?> SingleOrDefaultAsyncLinqToDB<TSource>(
 			this IQueryable<TSource>       source,
 			Expression<Func<TSource,bool>> predicate,
 			CancellationToken              token = default)
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFTools.ContextExtensions.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFTools.ContextExtensions.cs
@@ -233,6 +233,7 @@ public static async Task<BulkCopyRowsCopied> BulkCopyAsync<T>(
 		[LinqTunnel]
 		[Pure]
 		public static IValueInsertable<T> Into<T>(this DbContext context, ITable<T> target)
+			where T: notnull
 		{
 			if (context == null) throw new ArgumentNullException(nameof(context));
 			if (target == null)  throw new ArgumentNullException(nameof(target));
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -455,6 +455,10 @@ public virtual void DefineConvertors(
 				if (modelType.IsEnum)
 					continue;
 
+				// skipping arrays
+				if (modelType.IsArray)
+					continue;
+
 				MapEFCoreType(modelType);
 				if (modelType.IsValueType && !typeof(Nullable<>).IsSameOrParentOf(modelType))
 					MapEFCoreType(typeof(Nullable<>).MakeGenericType(modelType));
diff --git a/Source/LinqToDB.EntityFrameworkCore/linq2db.EntityFrameworkCore.csproj b/Source/LinqToDB.EntityFrameworkCore/linq2db.EntityFrameworkCore.csproj
@@ -16,9 +16,20 @@
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<DebugType>portable</DebugType>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="linq2db" Version="3.3.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.2" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+
 	</ItemGroup>
 
 </Project>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Logging/TestLogger.cs b/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Logging/TestLogger.cs
@@ -13,7 +13,9 @@ internal class TestLogger : ILogger
 		private static readonly string _newLineWithMessagePadding;
 
 		// ConsoleColor does not have a value to specify the 'Default' color
+#pragma warning disable 649
 		private readonly ConsoleColor? DefaultConsoleColor;
+#pragma warning restore 649
 
 		private readonly string _name;
 
diff --git a/Tests/LinqToDB.EntityFrameworkCore.BaseTests/TestUtils.cs b/Tests/LinqToDB.EntityFrameworkCore.BaseTests/TestUtils.cs
@@ -15,7 +15,6 @@ public class TestUtils
 
 					.AddTestLogger(o =>
 					{
-						o.IncludeScopes = true;
 						o.FormatterName = ConsoleFormatterNames.Simple;
 					});
 			});		
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/EntityWithArrays.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/EntityWithArrays.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.Models.NpgSqlEntities
+{
+	public class EntityWithArrays
+	{
+		[Key]
+		public int Id { get; set; }
+
+		public Guid[] Guids { get; set; } = null!;
+	}
+}
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/NpgSqlEnititesContext.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/NpgSqlEnititesContext.cs
@@ -20,9 +20,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 					entity.HasNoKey();
 					entity.ToView("EventsView", "views");
 				});
+
+			modelBuilder.Entity<EntityWithArrays>(entity =>
+			{
+			});
 		}
 
 		public virtual DbSet<Event> Events { get; set; } = null!;
+		public virtual DbSet<EntityWithArrays> EntityWithArrays { get; set; } = null!;
 
 	}
 }
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/NpgSqlTests.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/NpgSqlTests.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Linq;
+using FluentAssertions;
 using LinqToDB.Data;
+using LinqToDB.DataProvider.PostgreSQL;
 using LinqToDB.EntityFrameworkCore.BaseTests;
 using LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.Models.NpgSqlEntities;
 using Microsoft.EntityFrameworkCore;
@@ -67,5 +69,23 @@ public void TestViewMapping()
 				var l2dbResult = query.ToLinqToDB().ToArray();
 			}
 		}
+
+		[Test]
+		public void TestArray()
+		{
+			using (var db = CreateNpgSqlEntitiesContext())
+			{
+				var guids = new Guid[] { Guid.Parse("271425b1-ebe8-400d-b71d-a6e47a460ae3"),
+					Guid.Parse("b75de94e-6d7b-4c70-bfa1-f8639a6a5b35") };
+
+				var query = 
+						from m in db.EntityWithArrays.ToLinqToDBTable()
+						where Sql.Ext.PostgreSQL().Overlaps(m.Guids, guids)
+						select m;
+
+				query.Invoking(q => q.ToArray()).Should().NotThrow();
+			}
+		}
+
 	}
 }
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/AAA.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/AAA.cs
@@ -1,6 +1,9 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+#pragma warning disable 8604
+#pragma warning disable CS8625
+
 namespace LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.SampleTests
 {
 	public class Unit
@@ -22,11 +25,11 @@ public static ArrangeResult<T, Unit> Arrange<T>(this T @object, Action<T> action
 		}
 
 		public static ArrangeResult<T, Unit> Arrange<T>(T @object) 
-			=> new ArrangeResult<T, Unit>(@object, default);
+			=> new(@object, default);
 
 		public static ArrangeResult<T, TMock> Arrange<T, TMock>(this TMock mock, Func<TMock, T> @object)
 			where TMock: notnull
-			=> new ArrangeResult<T, TMock>(@object(mock), mock);
+			=> new(@object(mock), mock);
 
 		public static ActResult<T, TMock> Act<T, TMock>(this ArrangeResult<T, TMock> arrange, Action<T> act)
 			where T : notnull
@@ -116,5 +119,5 @@ internal ActResult(T @object, TMock mock, Exception? exception)
 			internal TMock Mock { get; }
 			internal Exception? Exception { get; }
 		}
-	}
+	}
 }
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/IssueTests.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/IssueTests.cs
@@ -29,7 +29,7 @@ private void InitOptions()
 
 		private IssueContext CreateContext()
 		{
-			var ctx = new IssueContext(_options);
+			var ctx = new IssueContext(_options!);
 
 			if (!_created)
 			{
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/IssueModel/IssueContext.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/IssueModel/IssueContext.cs
@@ -43,7 +43,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 			modelBuilder
 				.Entity<Patent>()
 				.HasOne(p => p.Assessment)
-				.WithOne(pa => pa.Patent)
+				.WithOne(pa => pa!.Patent)
 				.HasForeignKey<PatentAssessment>(pa => pa.PatentId)
 				.OnDelete(DeleteBehavior.Restrict);
 
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs
@@ -674,7 +674,7 @@ public async Task TestSetUpdate([Values(true, false)] bool enableFilter)
 		{
 			using (var ctx = CreateContext(enableFilter))
 			{
-				var customer = await ctx.Customers.FirstOrDefaultAsync();
+				var customer = await ctx.Customers.FirstAsync();
 
 				var updatable = ctx.Customers.Where(c => c.CustomerId == customer.CustomerId)
 					.Set(c => c.CompanyName, customer.CompanyName);
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 5.2.0
-  nugetVersion: 5.2.0
+  assemblyVersion: 5.2.1
+  nugetVersion: 5.2.1
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):
@@ -43,37 +43,48 @@ stages:
       inputs:
         solution: '$(solution)'
         configuration: '$(build_configuration)'
-        msbuildArguments: '/t:Restore;Rebuild -m'
+        msbuildArguments: '/t:Restore;Rebuild -m /p:ContinuousIntegrationBuild=true'
       displayName: Build Solution
 
     - powershell: echo "##vso[task.setvariable variable=packageVersion]$(packageVersion)-rc.$(Build.BuildId)"
-      condition: ne(variables['Build.SourceBranchName'], 'release')
       displayName: Set nuget RC version for non-release branch
+      condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
 
     - task: PowerShell@2
       inputs:
         filePath: '$(Build.SourcesDirectory)/NuGet/BuildNuspecs.ps1'
         workingDirectory: '$(Build.SourcesDirectory)'
         arguments: -path $(Build.SourcesDirectory)/NuGet/linq2db.EntityFrameworkCore.nuspec -version $(packageVersion) -branch $(Build.SourceBranchName)
       displayName: Generate nuspec
+      condition: and(succeeded(), or(eq(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
 
     - task: NuGetToolInstaller@0
       inputs:
         versionSpec: '5.x'
         workingDirectory: $(Build.SourcesDirectory)/NuGet
       displayName: Install nuget
+      condition: and(succeeded(), or(eq(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
 
     - task: CmdLine@2
       inputs:
         script: 'nuget Pack linq2db.EntityFrameworkCore.nuspec -OutputDirectory built'
         workingDirectory: $(Build.SourcesDirectory)/NuGet
-      displayName: Build nuget
+      displayName: Build nuget (azure artifacts)
+      condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
+
+    - task: CmdLine@2
+      inputs:
+        script: 'nuget Pack linq2db.EntityFrameworkCore.nuspec -OutputDirectory built -Symbols -SymbolPackageFormat snupkg'
+        workingDirectory: $(Build.SourcesDirectory)/NuGet
+      displayName: Build nuget (nuget.org)
+      condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'release'))
 
     - task: PublishBuildArtifacts@1
       inputs:
         pathToPublish: '$(Build.SourcesDirectory)/NuGet/built'
         artifactName: '$(artifact_nugets)'
       displayName: Publish nugets to artifacts
+      condition: and(succeeded(), or(eq(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
 
     - task: NuGetCommand@2
       inputs:

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ public static async Task<BulkCopyRowsCopied> BulkCopyAsync<T>(`
`233`	`233`	`[LinqTunnel]`
`234`	`234`	`[Pure]`
`235`	`235`	`public static IValueInsertable<T> Into<T>(this DbContext context, ITable<T> target)`
	`236`	`+ where T: notnull`
`236`	`237`	`{`
`237`	`238`	`if (context == null) throw new ArgumentNullException(nameof(context));`
`238`	`239`	`if (target == null) throw new ArgumentNullException(nameof(target));`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ public class TestUtils`
`15`	`15`
`16`	`16`	`.AddTestLogger(o =>`
`17`	`17`	`{`
`18`		`- o.IncludeScopes = true;`
`19`	`18`	`o.FormatterName = ConsoleFormatterNames.Simple;`
`20`	`19`	`});`
`21`	`20`	`});`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)`
`20`	`20`	`entity.HasNoKey();`
`21`	`21`	`entity.ToView("EventsView", "views");`
`22`	`22`	`});`
	`23`	`+`
	`24`	`+ modelBuilder.Entity<EntityWithArrays>(entity =>`
	`25`	`+ {`
	`26`	`+ });`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`public virtual DbSet<Event> Events { get; set; } = null!;`
	`30`	`+ public virtual DbSet<EntityWithArrays> EntityWithArrays { get; set; } = null!;`
`26`	`31`
`27`	`32`	`}`
`28`	`33`	`}`