Merge pull request #181 from linq2db/version3

Release 3.15.0
linq2db · Oct 6, 2021 · de3bb2a · de3bb2a
2 parents 7411783 + 39be80b
commit de3bb2a
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 7 deletions.
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.14.0</Version>
+		<Version>3.15.0</Version>
 
 		<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
 		<Product>Linq to DB</Product>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,8 +5,8 @@
 		<PackageVersion Include="NUnit" Version="3.13.2" />
 		<PackageVersion Include="FluentAssertions" Version="5.10.3" />
 
-		<PackageVersion Include="linq2db" Version="3.4.4" />
-		<PackageVersion Include="linq2db.Tools" Version="3.4.4" />
+		<PackageVersion Include="linq2db" Version="3.4.5" />
+		<PackageVersion Include="linq2db.Tools" Version="3.4.5" />
 
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
 		<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />

diff --git a/NuGet/linq2db.EntityFrameworkCore.nuspec b/NuGet/linq2db.EntityFrameworkCore.nuspec
@@ -16,7 +16,7 @@
 		<dependencies>
 			<group targetFramework=".NETStandard2.0">
 				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="3.1.11" />
-				<dependency id="linq2db" version="3.4.4" />
+				<dependency id="linq2db" version="3.4.5" />
 			</group>
 		</dependencies>
 	</metadata>

diff --git a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
@@ -482,12 +482,23 @@ public override int GetHashCode()
 			return found;
 		}
 
+		private static PropertyInfo GetPropertyInfoForType(Type type, PropertyInfo propInfo)
+		{
+			if (propInfo.DeclaringType == type)
+				return propInfo;
+
+			var found = type.GetProperties()
+				.FirstOrDefault(x => x.Module == propInfo.Module && x.MetadataToken == propInfo.MetadataToken);
+
+			return found ?? propInfo;
+		}
+
 		private Sql.ExpressionAttribute? GetDbFunctionFromProperty(Type type, PropertyInfo propInfo)
 		{
 			if (_dependencies == null || _model == null)
 				return null;
 
-			propInfo = (PropertyInfo?) type.GetMemberEx(propInfo) ?? propInfo;
+			propInfo = GetPropertyInfoForType(type, propInfo);
 
 			var found = _calculatedExtensions.GetOrAdd(propInfo, mi =>
 			{

diff --git a/Tests/LinqToDB.EntityFrameworkCore.BaseTests/ForMappingTestsBase.cs b/Tests/LinqToDB.EntityFrameworkCore.BaseTests/ForMappingTestsBase.cs
@@ -108,5 +108,14 @@ public virtual async Task TestUIntTable()
 			var item = await context.UIntTable.FirstOrDefaultAsyncLinqToDB(e => e.Field64 == field64);
 		}
 
+		[Test]
+		public virtual void TestAmbiguousProperties()
+		{
+			using var context = CreateContext();
+
+			FluentActions.Awaiting(() => context.WithDuplicateProperties.Where(x => x.Value == 1)
+				.ToArrayAsyncLinqToDB()).Should().NotThrow();
+		}
+
 	}
 }
diff --git a/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/ForMapping/ForMappingContextBase.cs b/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/ForMapping/ForMappingContextBase.cs
@@ -12,5 +12,7 @@ protected ForMappingContextBase(DbContextOptions options) : base(options)
 		public DbSet<NoIdentity> NoIdentity { get; set; } = null!;
 		public DbSet<UIntTable> UIntTable { get; set; } = null!;
 		public DbSet<StringTypes> StringTypes { get; set; } = null!;
+
+		public DbSet<WithDuplicateProperties> WithDuplicateProperties { get; set; } = null!;
 	}
 }
diff --git a/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/ForMapping/WithDuplicateProperties.cs b/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/ForMapping/WithDuplicateProperties.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace LinqToDB.EntityFrameworkCore.BaseTests.Models.ForMapping
+{
+
+	public class WithDuplicatePropertiesBase
+	{
+		[Key]
+		public int Id { get; set; }
+
+		public virtual string? Value { get; set; }
+	}
+
+	public class WithDuplicateProperties : WithDuplicatePropertiesBase
+	{
+		public new int? Value { get; set; }
+	}
+}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 3.14.0
-  nugetVersion: 3.14.0
+  assemblyVersion: 3.15.0
+  nugetVersion: 3.15.0
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):