diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4d1c09fe..746be191 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649;CS8632;EF1001;NU1608;NU1109 - 15.0.0 + 15.0.1 preview 1.0.0 EntityFramework, Verify diff --git a/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliases.verified.txt b/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliases.verified.txt index 14769be1..5dcd5088 100644 --- a/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliases.verified.txt +++ b/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliases.verified.txt @@ -3,17 +3,17 @@ Type: ReaderExecutedAsync, HasTransaction: false, Text: -select companies.Id, - companies.Name, - employees.Id, - employees.Age, - employees.CompanyId, - employees.Name -from Companies as companies +select Companies.Id, + Companies.Name, + Employees.Id, + Employees.Age, + Employees.CompanyId, + Employees.Name +from Companies as Companies left outer join - Employees as employees - on companies.Id = employees.CompanyId -order by companies.Name, - companies.Id + Employees as Employees + on Companies.Id = Employees.CompanyId +order by Companies.Name, + Companies.Id } } \ No newline at end of file diff --git a/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliasesQueryable.verified.sql b/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliasesQueryable.verified.sql index 189212e7..18176ecb 100644 --- a/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliasesQueryable.verified.sql +++ b/src/Verify.EntityFramework.Tests/CoreTests.DescriptiveTableAliasesQueryable.verified.sql @@ -1,4 +1,4 @@ -select companies.Id, - companies.Name -from Companies as companies -where companies.Name = N'company name' \ No newline at end of file +select Companies.Id, + Companies.Name +from Companies as Companies +where Companies.Name = N'company name' \ No newline at end of file diff --git a/src/Verify.EntityFramework/DescriptiveSqlAliasManager.cs b/src/Verify.EntityFramework/DescriptiveSqlAliasManager.cs index ce9a7f81..8638a582 100644 --- a/src/Verify.EntityFramework/DescriptiveSqlAliasManager.cs +++ b/src/Verify.EntityFramework/DescriptiveSqlAliasManager.cs @@ -6,16 +6,14 @@ class DescriptiveSqlAliasManager : SqlAliasManager public override string GenerateTableAlias(string name) { - var lowerName = name.ToLowerInvariant(); - - if (aliases.TryGetValue(lowerName, out var counter)) + if (aliases.TryGetValue(name, out var counter)) { - aliases[lowerName] = counter + 1; - return lowerName + counter; + aliases[name] = counter + 1; + return name + counter; } - aliases[lowerName] = 0; - return lowerName; + aliases[name] = 0; + return name; } protected override Dictionary? RemapTableAliases(IReadOnlySet usedAliases) => diff --git a/src/Verify.EntityFramework/VerifyEntityFramework.cs b/src/Verify.EntityFramework/VerifyEntityFramework.cs index 95312591..ee3cc268 100644 --- a/src/Verify.EntityFramework/VerifyEntityFramework.cs +++ b/src/Verify.EntityFramework/VerifyEntityFramework.cs @@ -86,7 +86,7 @@ public static void IgnoreNavigationProperties(IModel? model = null) throw new("The `model` parameter must be provided wither on this method or on VerifyEntityFramework.Enable()"); } - return GetNavigations(model); + return model.GetNavigations(); } static IEnumerable<(Type type, string name)> GetNavigations(this IModel model) @@ -190,4 +190,4 @@ public static void DisableRecording(this TContext context) internal static bool IsRecordingDisabled(this TContext context) where TContext : DbContext => recordingDisabledContextIds.Contains(context.ContextId.InstanceId); -} \ No newline at end of file +}