diff --git a/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs b/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs index c030b9aead7..6db3281dd6e 100644 --- a/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs +++ b/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs @@ -140,7 +140,6 @@ protected virtual string GetPropertyName([NotNull] DatabaseColumn column) var table = column.Table ?? _nullTable; var usedNames = new List(); - // TODO - need to clean up the way CSharpNamer & CSharpUniqueNamer work (see issue #1671) if (column.Table != null) { usedNames.Add(GetEntityTypeName(table)); diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs index fc42706c0f6..708bc29d37f 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs @@ -92,16 +92,6 @@ FROM root c OFFSET 0 LIMIT 2"); } - public override void Method_with_constant_queryable_arg() - { - base.Method_with_constant_queryable_arg(); - - AssertSql( - @"SELECT c -FROM root c -WHERE (c[""Discriminator""] = ""Customer"")"); - } - public override async Task Entity_equality_self(bool isAsync) { await base.Entity_equality_self(isAsync); @@ -2537,7 +2527,7 @@ public override async Task Select_expression_date_add_milliseconds_above_the_ran await base.Select_expression_date_add_milliseconds_above_the_range(isAsync); AssertSql( - @"SELECT c + @"SELECT c[""OrderDate""] FROM root c WHERE ((c[""Discriminator""] = ""Order"") AND (c[""OrderDate""] != null))"); } @@ -2547,7 +2537,7 @@ public override async Task Select_expression_date_add_milliseconds_below_the_ran await base.Select_expression_date_add_milliseconds_below_the_range(isAsync); AssertSql( - @"SELECT c + @"SELECT c[""OrderDate""] FROM root c WHERE ((c[""Discriminator""] = ""Order"") AND (c[""OrderDate""] != null))"); } diff --git a/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs b/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs index b058cde31cf..b7376f1eb69 100644 --- a/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs +++ b/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs @@ -309,8 +309,32 @@ public virtual void Entities_are_stored_in_model_snapshot() }); } - //[ConditionalFact] - //Issue #14103 + [ConditionalFact] + public virtual void Sequence_is_stored_in_snapshot_as_annotations() + { + Test( + builder => + { + builder.HasSequence("Foo", "Bar") + .StartsAt(2) + .HasMin(1) + .HasMax(3) + .IncrementsBy(2) + .IsCyclic(); + }, + AddBoilerPlate( + @" + modelBuilder + .HasAnnotation(""Relational:MaxIdentifierLength"", 128) + .HasAnnotation(""Relational:Sequence:Bar.Foo"", ""'Foo', 'Bar', '2', '2', '1', '3', 'Int32', 'True'"") + .HasAnnotation(""SqlServer:ValueGenerationStrategy"", SqlServerValueGenerationStrategy.IdentityColumn);"), + o => + { + Assert.Equal(3, o.GetAnnotations().Count()); + }); + } + + [ConditionalFact(Skip = "Issue #14103")] public virtual void Sequence_is_stored_in_snapshot_as_fluent_api() { Test( diff --git a/test/EFCore.InMemory.FunctionalTests/GraphUpdatesInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/GraphUpdatesInMemoryTest.cs index 1a7377ce2c8..9368b0c1bab 100644 --- a/test/EFCore.InMemory.FunctionalTests/GraphUpdatesInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/GraphUpdatesInMemoryTest.cs @@ -8,7 +8,7 @@ namespace Microsoft.EntityFrameworkCore { - // issue #15318 + // issue #16963 internal class GraphUpdatesInMemoryTest : GraphUpdatesTestBase { diff --git a/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs b/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs index b7c3d8e4af4..4624cbf7854 100644 --- a/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs @@ -15,14 +15,14 @@ public class InMemoryComplianceTest : ComplianceTestBase typeof(FunkyDataQueryTestBase<>), typeof(OptimisticConcurrencyTestBase<>), typeof(StoreGeneratedTestBase<>), - typeof(LoadTestBase<>), // issue #15318 - typeof(MusicStoreTestBase<>), // issue #15318 - typeof(ConferencePlannerTestBase<>), // issue #15318 - typeof(GraphUpdatesTestBase<>), // issue #15318 - typeof(ProxyGraphUpdatesTestBase<>), // issue #15318 - typeof(ComplexNavigationsWeakQueryTestBase<>), // issue #15285 - typeof(OwnedQueryTestBase<>), // issue #15285 - typeof(FiltersInheritanceTestBase<>), // issue #17047 + typeof(LoadTestBase<>), // issue #16963 + typeof(MusicStoreTestBase<>), // issue #16963 + typeof(ConferencePlannerTestBase<>), // issue #16963 + typeof(GraphUpdatesTestBase<>), // issue #16963 + typeof(ProxyGraphUpdatesTestBase<>), // issue #16963 + typeof(ComplexNavigationsWeakQueryTestBase<>), // issue #16963 + typeof(FiltersInheritanceTestBase<>), // issue #16963 + typeof(OwnedQueryTestBase<>), // issue #16963 // Query pipeline typeof(SimpleQueryTestBase<>), typeof(GroupByQueryTestBase<>), diff --git a/test/EFCore.InMemory.FunctionalTests/LoadInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/LoadInMemoryTest.cs index 666e639033f..2ad32198b72 100644 --- a/test/EFCore.InMemory.FunctionalTests/LoadInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/LoadInMemoryTest.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore { - //issue #15318 + //issue #16963 internal class LoadInMemoryTest : LoadTestBase { public LoadInMemoryTest(LoadInMemoryFixture fixture) diff --git a/test/EFCore.InMemory.FunctionalTests/MusicStoreInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/MusicStoreInMemoryTest.cs index 02728977f40..5abf4195c31 100644 --- a/test/EFCore.InMemory.FunctionalTests/MusicStoreInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/MusicStoreInMemoryTest.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore { - // issue #15318 + // issue #16963 internal class MusicStoreInMemoryTest : MusicStoreTestBase { public MusicStoreInMemoryTest(MusicStoreInMemoryFixture fixture) diff --git a/test/EFCore.InMemory.FunctionalTests/ProxyGraphUpdatesInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/ProxyGraphUpdatesInMemoryTest.cs index 7782eaaf79a..7c18d612989 100644 --- a/test/EFCore.InMemory.FunctionalTests/ProxyGraphUpdatesInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/ProxyGraphUpdatesInMemoryTest.cs @@ -114,7 +114,7 @@ public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder build } } - // issue #15318 + // issue #16963 internal class LazyLoading : ProxyGraphUpdatesInMemoryTestBase { public LazyLoading(ProxyGraphUpdatesWithLazyLoadingInMemoryFixture fixture) diff --git a/test/EFCore.InMemory.FunctionalTests/Query/AsyncSimpleQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/AsyncSimpleQueryInMemoryTest.cs index f3ddfe62215..13f8693a0f2 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/AsyncSimpleQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/AsyncSimpleQueryInMemoryTest.cs @@ -32,7 +32,7 @@ public override Task ToList_on_nav_subquery_with_predicate_in_projection() return base.ToList_on_nav_subquery_with_predicate_in_projection(); } - [ConditionalFact(Skip = "See issue#13857")] + [ConditionalFact(Skip = "See issue#16963")] public override Task Query_backed_by_database_view() { return base.Query_backed_by_database_view(); diff --git a/test/EFCore.InMemory.FunctionalTests/Query/CompiledQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/CompiledQueryInMemoryTest.cs index 029a434a050..f3d5c75504f 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/CompiledQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/CompiledQueryInMemoryTest.cs @@ -14,13 +14,13 @@ public CompiledQueryInMemoryTest(NorthwindQueryInMemoryFixture { diff --git a/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs index 696319b1e5e..1d45aaca666 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs @@ -27,55 +27,55 @@ public override Task Null_semantics_is_correctly_applied_for_function_comparison return base.Null_semantics_is_correctly_applied_for_function_comparisons_that_take_arguments_from_optional_navigation_complex(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Negated_bool_ternary_inside_anonymous_type_in_projection(bool isAsync) { return base.Negated_bool_ternary_inside_anonymous_type_in_projection(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Optional_navigation_type_compensation_works_with_binary_expression(bool isAsync) { return base.Optional_navigation_type_compensation_works_with_binary_expression(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Complex_predicate_with_AndAlso_and_nullable_bool_property(bool isAsync) { return base.Complex_predicate_with_AndAlso_and_nullable_bool_property(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Optional_navigation_type_compensation_works_with_conditional_expression(bool isAsync) { return base.Optional_navigation_type_compensation_works_with_conditional_expression(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Optional_navigation_type_compensation_works_with_predicate_negated(bool isAsync) { return base.Optional_navigation_type_compensation_works_with_predicate_negated(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task String_compare_with_null_conditional_argument(bool isAsync) { return base.String_compare_with_null_conditional_argument(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Optional_navigation_type_compensation_works_with_predicate2(bool isAsync) { return base.Optional_navigation_type_compensation_works_with_predicate2(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Where_required_navigation_on_derived_type(bool isAsync) { return base.Where_required_navigation_on_derived_type(isAsync); } - [ConditionalTheory(Skip = "issue #15343")] + [ConditionalTheory(Skip = "issue #16963")] public override Task Optional_navigation_type_compensation_works_with_binary_and_expression(bool isAsync) { return base.Optional_navigation_type_compensation_works_with_binary_and_expression(isAsync); diff --git a/test/EFCore.InMemory.FunctionalTests/Query/InheritanceInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/InheritanceInMemoryTest.cs index 0b9a962c7aa..122ac9287db 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/InheritanceInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/InheritanceInMemoryTest.cs @@ -8,7 +8,7 @@ namespace Microsoft.EntityFrameworkCore.Query { - // TODO: Issue#14630#21 + // TODO: Issue #16963 internal class InheritanceInMemoryTest : InheritanceTestBase { public InheritanceInMemoryTest(InheritanceInMemoryFixture fixture, ITestOutputHelper testOutputHelper) diff --git a/test/EFCore.InMemory.FunctionalTests/Query/InheritanceRelationshipsQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/InheritanceRelationshipsQueryInMemoryTest.cs index c57a78547e8..78c69300dc3 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/InheritanceRelationshipsQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/InheritanceRelationshipsQueryInMemoryTest.cs @@ -3,7 +3,7 @@ namespace Microsoft.EntityFrameworkCore.Query { - // TODO: Issue#14630#21 + // TODO: Issue #16963 internal class InheritanceRelationshipsQueryInMemoryTest : InheritanceRelationshipsQueryTestBase< InheritanceRelationshipsQueryInMemoryFixture> { diff --git a/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs index e9288883c04..e838b036b63 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore.Query { - // issue #15285 + // issue #16963 internal class OwnedQueryInMemoryTest : OwnedQueryTestBase { public OwnedQueryInMemoryTest(OwnedQueryInMemoryFixture fixture, ITestOutputHelper testOutputHelper) diff --git a/test/EFCore.Relational.Specification.Tests/Query/FromSqlQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/FromSqlQueryTestBase.cs index 7c848694364..48395adac4e 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/FromSqlQueryTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/FromSqlQueryTestBase.cs @@ -254,7 +254,7 @@ public virtual void FromSqlRaw_queryable_composed_after_removing_whitespaces() } } - [ConditionalFact(Skip = "Compiled queries not yet supported, #14551")] + [ConditionalFact(Skip = "Issue #17071")] public virtual void FromSqlRaw_queryable_composed_compiled() { var query = EF.CompileQuery( diff --git a/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryTestBase.cs index 5980fcd88cd..6a8c74ce33b 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryTestBase.cs @@ -736,7 +736,7 @@ public virtual void Switching_parameter_value_to_null_produces_different_cache_e } } - [ConditionalFact(Skip = "issue #15704")] + [ConditionalFact] public virtual void From_sql_composed_with_relational_null_comparison() { using (var context = CreateContext(useRelationalNulls: true)) diff --git a/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs index 28f2398d321..bef9fa94d3b 100644 --- a/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs @@ -6101,63 +6101,6 @@ public virtual void GroupJoin_with_navigations_in_the_result_selector() } } - [ConditionalFact(Skip = "issue #15412")] - public virtual void GroupJoin_with_grouping_composed_on1() - { - using (var ctx = CreateContext()) - { - var query = from l1 in ctx.LevelOne - join l2 in ctx.LevelTwo.Where(x => x.OneToOne_Optional_FK2.Name != "Foo") on l1.Id equals l2.Level1_Optional_Id into grouping - from l2 in grouping.DefaultIfEmpty() - select new { l1, l2, grouping }; - - var result = query.ToList(); - } - } - - [ConditionalFact(Skip = "issue #15412")] - public virtual void GroupJoin_with_grouping_composed_on2() - { - using (var ctx = CreateContext()) - { - var query = from l1 in ctx.LevelOne - join l2 in ctx.LevelTwo.Where(x => x.OneToOne_Optional_FK2.Name != "Foo") on l1.Id equals l2.Level1_Optional_Id into grouping - from l2 in grouping.DefaultIfEmpty() - select new { l1, l2, grouping = grouping.Select(x => x.OneToOne_Optional_FK2.OneToOne_Required_FK3.Name) }; - - var result = query.ToList(); - } - } - - [ConditionalFact(Skip = "issue #15412")] - public virtual void GroupJoin_with_grouping_composed_on3() - { - using (var ctx = CreateContext()) - { - var query = from l1 in ctx.LevelOne - join l2 in ctx.LevelTwo.Where(x => x.OneToOne_Optional_FK2.Name != "Foo") on l1.Id equals l2.Level1_Optional_Id into grouping - from l2 in grouping.DefaultIfEmpty() - select new { l1, l2.OneToOne_Required_FK2, grouping }; - - var result = query.ToList(); - } - } - - [ConditionalFact(Skip = "issue #15412")] - public virtual void GroupJoin_with_grouping_composed_on4() - { - using (var ctx = CreateContext()) - { - // TODO: this is broken - when we add navigation for OneToOne_Required_FK2 we don't remap source of the grouping correctly since we already removed the binding - var query = from l1 in ctx.LevelOne - join l2 in ctx.LevelTwo.Where(x => x.OneToOne_Optional_FK2.Name != "Foo") on l1.Id equals l2.Level1_Optional_Id into grouping - from l2 in grouping.DefaultIfEmpty() - select new { l1, l2.OneToOne_Required_FK2, grouping = grouping.Select(x => x.OneToOne_Required_PK2.Name) }; - - var result = query.ToList(); - } - } - [ConditionalFact] public virtual void Member_pushdown_chain_3_levels_deep() { diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs index af5bfa4b2a3..e20a759b8b9 100644 --- a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs @@ -36,7 +36,7 @@ protected GearsOfWarQueryTestBase(TFixture fixture) { } - [ConditionalTheory(Skip = "issue #15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Entity_equality_empty(bool isAsync) { @@ -392,7 +392,7 @@ public virtual void Include_where_list_contains_navigation2(bool isAsync) } } - [ConditionalTheory(Skip = "issue #15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual void Navigation_accessed_twice_outside_and_inside_subquery(bool isAsync) { @@ -1229,7 +1229,7 @@ public virtual Task Select_null_propagation_negative7(bool isAsync) gs => gs.Select(g => null != g.LeaderNickname ? g.LeaderNickname == g.LeaderNickname : (bool?)null)); } - [ConditionalTheory(Skip = "issue #15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_null_propagation_negative8(bool isAsync) { @@ -1256,7 +1256,7 @@ public virtual Task Select_null_propagation_works_for_navigations_with_composite select t.Gear != null ? Maybe(t.Gear, () => t.Gear.Nickname) : null); } - [ConditionalTheory(Skip = "issue #15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_null_propagation_works_for_multiple_navigations_with_composite_keys(bool isAsync) { @@ -1509,7 +1509,7 @@ public virtual Task Optional_Navigation_Null_Coalesce_To_Clr_Type(bool isAsync) })); } - [ConditionalTheory(Skip = "issue #15849")] + [ConditionalTheory(Skip = "issue #14900")] [MemberData(nameof(IsAsyncData))] public virtual Task Where_subquery_boolean(bool isAsync) { @@ -1518,7 +1518,7 @@ public virtual Task Where_subquery_boolean(bool isAsync) gs => gs.Where(g => g.Weapons.OrderBy(w => w.Id).Select(w => w.IsAutomatic).FirstOrDefault())); } - [ConditionalTheory(Skip = "issue #15849")] + [ConditionalTheory(Skip = "issue #14900")] [MemberData(nameof(IsAsyncData))] public virtual Task Where_subquery_boolean_with_pushdown(bool isAsync) { @@ -1527,7 +1527,7 @@ public virtual Task Where_subquery_boolean_with_pushdown(bool isAsync) gs => gs.Where(g => g.Weapons.OrderBy(w => w.Id).FirstOrDefault().IsAutomatic)); } - [ConditionalTheory(Skip = "issue #15849")] + [ConditionalTheory(Skip = "issue #14900")] [MemberData(nameof(IsAsyncData))] public virtual Task Where_subquery_distinct_firstordefault_boolean(bool isAsync) { @@ -1536,7 +1536,7 @@ public virtual Task Where_subquery_distinct_firstordefault_boolean(bool isAsync) gs => gs.Where(g => g.HasSoulPatch && g.Weapons.Distinct().OrderBy(w => w.Id).Select(w => w.IsAutomatic).FirstOrDefault())); } - [ConditionalTheory(Skip = "issue #15849")] + [ConditionalTheory(Skip = "issue #14900")] [MemberData(nameof(IsAsyncData))] public virtual Task Where_subquery_distinct_firstordefault_boolean_with_pushdown(bool isAsync) { @@ -1625,7 +1625,7 @@ public virtual void Where_subquery_distinct_last_boolean() } } - [ConditionalTheory(Skip = "issue #15849")] + [ConditionalTheory(Skip = "issue #14900")] [MemberData(nameof(IsAsyncData))] public virtual Task Where_subquery_distinct_orderby_firstordefault_boolean(bool isAsync) { @@ -1634,7 +1634,7 @@ public virtual Task Where_subquery_distinct_orderby_firstordefault_boolean(bool gs => gs.Where(g => g.HasSoulPatch && g.Weapons.Distinct().OrderBy(w => w.Id).Select(w => w.IsAutomatic).FirstOrDefault())); } - [ConditionalTheory(Skip = "issue #15849")] + [ConditionalTheory(Skip = "issue #14900")] [MemberData(nameof(IsAsyncData))] public virtual Task Where_subquery_distinct_orderby_firstordefault_boolean_with_pushdown(bool isAsync) { @@ -1781,7 +1781,7 @@ public virtual Task Select_Where_Navigation_Client(bool isAsync) select t); } - [ConditionalTheory(Skip = "issue #15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_Where_Navigation_Null(bool isAsync) { @@ -1792,7 +1792,7 @@ public virtual Task Select_Where_Navigation_Null(bool isAsync) select t); } - [ConditionalTheory(Skip = "issue #15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_Where_Navigation_Null_Reverse(bool isAsync) { @@ -1803,7 +1803,7 @@ public virtual Task Select_Where_Navigation_Null_Reverse(bool isAsync) select t); } - [ConditionalTheory(Skip = "issue #15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_Where_Navigation_Equals_Navigation(bool isAsync) { @@ -5860,7 +5860,7 @@ public virtual Task Negated_bool_ternary_inside_anonymous_type_in_projection(boo elementSorter: e => e.c); } - [ConditionalTheory(Skip = "issue #15848")] + [ConditionalTheory(Skip = "Issue #15848")] [MemberData(nameof(IsAsyncData))] public virtual Task Order_by_entity_qsre(bool isAsync) { @@ -5872,7 +5872,7 @@ public virtual Task Order_by_entity_qsre(bool isAsync) assertOrder: true); } - [ConditionalTheory(Skip = "Issue#15939")] + [ConditionalTheory(Skip = "Issue #15848")] [MemberData(nameof(IsAsyncData))] public virtual Task Order_by_entity_qsre_with_inheritance(bool isAsync) { @@ -5882,7 +5882,7 @@ public virtual Task Order_by_entity_qsre_with_inheritance(bool isAsync) assertOrder: true); } - [ConditionalTheory(Skip = "issue #15848")] + [ConditionalTheory(Skip = "Issue #15848")] [MemberData(nameof(IsAsyncData))] public virtual Task Order_by_entity_qsre_composite_key(bool isAsync) { @@ -5894,7 +5894,7 @@ public virtual Task Order_by_entity_qsre_composite_key(bool isAsync) assertOrder: true); } - [ConditionalTheory(Skip = "issue #15848")] + [ConditionalTheory(Skip = "Issue #15848")] [MemberData(nameof(IsAsyncData))] public virtual Task Order_by_entity_qsre_with_other_orderbys(bool isAsync) { @@ -5974,7 +5974,7 @@ join w2 in ws on w1.SynergyWith equals w2 elementSorter: e => e.Name1 + " " + e.Name2); } - [ConditionalTheory(Skip = "Issue#15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Join_on_entity_qsre_keys_inner_key_is_navigation(bool isAsync) { @@ -6025,7 +6025,7 @@ join w in ws.Where(ww => ww.IsAutomatic) on s equals w.Owner.Squad elementSorter: e => e.SquadName + " " + e.WeaponName); } - [ConditionalTheory(Skip = "Issue#15588")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task GroupJoin_on_entity_qsre_keys_inner_key_is_nested_navigation(bool isAsync) { @@ -6847,7 +6847,7 @@ public virtual Task String_concat_with_null_conditional_argument2(bool isAsync) assertOrder: true); } - [ConditionalTheory(Skip = "issue #13104")] + [ConditionalTheory(Skip = "issue #14205")] [MemberData(nameof(IsAsyncData))] public virtual Task String_concat_on_various_types(bool isAsync) { diff --git a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs index f0548118018..d9cc42d083b 100644 --- a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs +++ b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs @@ -1018,7 +1018,7 @@ public virtual Task Select_datetime_millisecond_component(bool isAsync) os => os.Select(o => o.OrderDate.Value.Millisecond)); } - [ConditionalTheory(Skip = "Issue #15716")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_datetime_DayOfWeek_component(bool isAsync) { @@ -1027,7 +1027,7 @@ public virtual Task Select_datetime_DayOfWeek_component(bool isAsync) os => os.Select(o => (int)o.OrderDate.Value.DayOfWeek)); } - [ConditionalTheory(Skip = "Issue #15716")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_datetime_Ticks_component(bool isAsync) { diff --git a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs index d31008b05f5..23b1b963316 100644 --- a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs @@ -251,27 +251,6 @@ public virtual Task Local_dictionary(bool isAsync) entryCount: 1); } - [ConditionalFact(Skip = "issue #12037")] - public virtual void Method_with_constant_queryable_arg() - { - using (var context = CreateContext()) - { - var cache = (MemoryCache)typeof(CompiledQueryCache).GetTypeInfo() - .GetField("_memoryCache", BindingFlags.Instance | BindingFlags.NonPublic) - ?.GetValue(context.GetService()); - - cache.Compact(1); - - var count = QueryableArgQuery(context, new[] { "ALFKI" }.AsQueryable()).Count(); - Assert.Equal(1, count); - Assert.Equal(1, cache.Count); - - count = QueryableArgQuery(context, new[] { "FOO" }.AsQueryable()).Count(); - Assert.Equal(1, cache.Count); - Assert.Equal(0, count); - } - } - private static IQueryable QueryableArgQuery(NorthwindContext context, IQueryable ids) { return context.Customers.Where(c => ids.Contains(c.CustomerID)); @@ -4411,7 +4390,7 @@ public virtual Task Select_expression_datetime_add_second(bool isAsync) e => e.OrderDate); } - [ConditionalTheory(Skip = "Issue #15716")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_expression_datetime_add_ticks(bool isAsync) { @@ -4426,7 +4405,7 @@ public virtual Task Select_expression_datetime_add_ticks(bool isAsync) e => e.OrderDate); } - [ConditionalTheory(Skip = "Issue #15716")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_expression_date_add_milliseconds_above_the_range(bool isAsync) { @@ -4441,7 +4420,7 @@ public virtual Task Select_expression_date_add_milliseconds_above_the_range(bool e => e.OrderDate); } - [ConditionalTheory(Skip = "Issue #15716")] + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task Select_expression_date_add_milliseconds_below_the_range(bool isAsync) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/AsyncSimpleQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/AsyncSimpleQuerySqlServerTest.cs index b07336a603f..58d8f8b10ae 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/AsyncSimpleQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/AsyncSimpleQuerySqlServerTest.cs @@ -83,23 +83,6 @@ public Task Single_Predicate_Cancellation() () => Single_Predicate_Cancellation_test(Fixture.TestSqlLoggerFactory.CancelQuery())); } - [ConditionalFact(Skip = "Issue#10914")] - public async Task Concurrent_async_queries_are_serialized() - { - using (var context = CreateContext()) - { - var task1 = context.Customers.Where(c => c.City == "México D.F.").ToListAsync(); - var task2 = context.Customers.Where(c => c.City == "London").ToListAsync(); - var task3 = context.Customers.Where(c => c.City == "Sao Paulo").ToListAsync(); - - var tasks = await Task.WhenAll(task1, task2, task3); - - Assert.Equal(5, tasks[0].Count); - Assert.Equal(6, tasks[1].Count); - Assert.Equal(4, tasks[2].Count); - } - } - [ConditionalFact(Skip = "Issue #14935. Cannot eval 'Except({from Customer c in value(Microsoft.EntityFrameworkCore.Query.Internal.EntityQueryable`1[Microsoft.EntityFrameworkCore.TestModels.Northwind.Customer]) where ([c].City == \"México D.F.\") select [c].CustomerID})'")] public async Task Concurrent_async_queries_are_serialized2() { @@ -116,46 +99,6 @@ await context.OrderDetails } } - [ConditionalFact(Skip = "Issue#10914")] - public async Task Concurrent_async_queries_are_serialized_find() - { - using (var context = CreateContext()) - { - var task1 = context.Customers.FindAsync("ALFKI").AsTask(); - var task2 = context.Customers.FindAsync("ANATR").AsTask(); - var task3 = context.Customers.FindAsync("FISSA").AsTask(); - - var tasks = await Task.WhenAll(task1, task2, task3); - - Assert.NotNull(tasks[0]); - Assert.NotNull(tasks[1]); - Assert.NotNull(tasks[2]); - } - } - - [ConditionalFact(Skip = "Issue#10914")] - public async Task Concurrent_async_queries_are_serialized_mixed1() - { - using (var context = CreateContext()) - { - await context.Customers.ForEachAsync( - // ReSharper disable once ReturnValueOfPureMethodIsNotUsed - c => context.Orders.Where(o => o.CustomerID == c.CustomerID).ToList()); - } - } - - [ConditionalFact(Skip = "Issue#10914")] - public async Task Concurrent_async_queries_are_serialized_mixed2() - { - using (var context = CreateContext()) - { - foreach (var c in context.Customers) - { - await context.Orders.Where(o => o.CustomerID == c.CustomerID).ToListAsync(); - } - } - } - [ConditionalFact] public async Task Concurrent_async_queries_when_raw_query() { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs index b33f0a5cc08..73d9b92b33e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs @@ -4602,38 +4602,6 @@ public override void GroupJoin_with_navigations_in_the_result_selector() @""); } - public override void GroupJoin_with_grouping_composed_on1() - { - base.GroupJoin_with_grouping_composed_on1(); - - AssertSql( - @""); - } - - public override void GroupJoin_with_grouping_composed_on2() - { - base.GroupJoin_with_grouping_composed_on2(); - - AssertSql( - @""); - } - - public override void GroupJoin_with_grouping_composed_on3() - { - base.GroupJoin_with_grouping_composed_on3(); - - AssertSql( - @""); - } - - public override void GroupJoin_with_grouping_composed_on4() - { - base.GroupJoin_with_grouping_composed_on4(); - - AssertSql( - @""); - } - public override void Member_pushdown_chain_3_levels_deep() { base.Member_pushdown_chain_3_levels_deep(); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs index 8ae0939a573..9eed584c654 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs @@ -27,7 +27,7 @@ public override async Task Entity_equality_empty(bool isAsync) AssertSql( @"SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] FROM [Gears] AS [g] -WHERE [g].[Discriminator] IN (N'Officer', N'Gear') AND ([g].[Nickname] IS NULL AND ([g].[SquadId] = 0))"); +WHERE CAST(0 AS bit) = CAST(1 AS bit)"); } public override async Task Include_multiple_one_to_one_and_one_to_many(bool isAsync) @@ -244,7 +244,13 @@ public override void Navigation_accessed_twice_outside_and_inside_subquery(bool { base.Navigation_accessed_twice_outside_and_inside_subquery(isAsync); - AssertSql(" "); + AssertSql( + @"SELECT [t].[Id] +FROM [Tags] AS [t]", + @"SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] +FROM [Gears] AS [g] +LEFT JOIN [Tags] AS [t] ON (([g].[Nickname] = [t].[GearNickName]) AND [t].[GearNickName] IS NOT NULL) AND (([g].[SquadId] = [t].[GearSquadId]) AND [t].[GearSquadId] IS NOT NULL) +WHERE [g].[Discriminator] IN (N'Gear', N'Officer') AND ([t].[Id] IS NOT NULL AND [t].[Id] IN ('34c8d86e-a4ac-4be5-827f-584dda348a07', 'df36f493-463f-4123-83f9-6b135deeb7ba', 'a8ad98f9-e023-4e2a-9a70-c2728455bd34', '70534e05-782c-4052-8720-c2c54481ce5f', 'a7be028a-0cf2-448f-ab55-ce8bc5d8cf69', 'b39a6fba-9026-4d69-828e-fd7068673e57'))"); } public override async Task Include_with_join_multi_level(bool isAsync) @@ -1110,17 +1116,17 @@ public override async Task Select_null_propagation_negative8(bool isAsync) AssertSql( @"SELECT CASE - WHEN [t.Gear.Squad].[Id] IS NOT NULL - THEN [t.Gear.Squad.AssignedCity].[Name] ELSE NULL + WHEN [s].[Id] IS NOT NULL THEN [c].[Name] + ELSE NULL END FROM [Tags] AS [t] LEFT JOIN ( - SELECT [t.Gear].* - FROM [Gears] AS [t.Gear] - WHERE [t.Gear].[Discriminator] IN (N'Officer', N'Gear') -) AS [t0] ON ([t].[GearNickName] = [t0].[Nickname]) AND ([t].[GearSquadId] = [t0].[SquadId]) -LEFT JOIN [Squads] AS [t.Gear.Squad] ON [t0].[SquadId] = [t.Gear.Squad].[Id] -LEFT JOIN [Cities] AS [t.Gear.Squad.AssignedCity] ON [t0].[AssignedCityName] = [t.Gear.Squad.AssignedCity].[Name]"); + SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] + FROM [Gears] AS [g] + WHERE [g].[Discriminator] IN (N'Gear', N'Officer') +) AS [t0] ON (([t].[GearNickName] = [t0].[Nickname]) AND [t].[GearNickName] IS NOT NULL) AND (([t].[GearSquadId] = [t0].[SquadId]) AND [t].[GearSquadId] IS NOT NULL) +LEFT JOIN [Squads] AS [s] ON [t0].[SquadId] = [s].[Id] +LEFT JOIN [Cities] AS [c] ON [t0].[AssignedCityName] = [c].[Name]"); } public override async Task Select_null_propagation_works_for_navigations_with_composite_keys(bool isAsync) @@ -1143,22 +1149,22 @@ public override async Task Select_null_propagation_works_for_multiple_navigation AssertSql( @"SELECT CASE - WHEN [t.Gear.Tag.Gear.AssignedCity].[Name] IS NOT NULL - THEN [t.Gear.Tag.Gear.AssignedCity].[Name] ELSE NULL + WHEN [c].[Name] IS NOT NULL THEN [c].[Name] + ELSE NULL END FROM [Tags] AS [t] LEFT JOIN ( - SELECT [t.Gear].* - FROM [Gears] AS [t.Gear] - WHERE [t.Gear].[Discriminator] IN (N'Officer', N'Gear') -) AS [t0] ON ([t].[GearNickName] = [t0].[Nickname]) AND ([t].[GearSquadId] = [t0].[SquadId]) -LEFT JOIN [Tags] AS [t.Gear.Tag] ON (([t0].[Nickname] = [t.Gear.Tag].[GearNickName]) OR ([t0].[Nickname] IS NULL AND [t.Gear.Tag].[GearNickName] IS NULL)) AND (([t0].[SquadId] = [t.Gear.Tag].[GearSquadId]) OR ([t0].[SquadId] IS NULL AND [t.Gear.Tag].[GearSquadId] IS NULL)) + SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] + FROM [Gears] AS [g] + WHERE [g].[Discriminator] IN (N'Gear', N'Officer') +) AS [t0] ON (([t].[GearNickName] = [t0].[Nickname]) AND [t].[GearNickName] IS NOT NULL) AND (([t].[GearSquadId] = [t0].[SquadId]) AND [t].[GearSquadId] IS NOT NULL) +LEFT JOIN [Tags] AS [t1] ON ((([t0].[Nickname] = [t1].[GearNickName]) AND ([t0].[Nickname] IS NOT NULL AND [t1].[GearNickName] IS NOT NULL)) OR ([t0].[Nickname] IS NULL AND [t1].[GearNickName] IS NULL)) AND ((([t0].[SquadId] = [t1].[GearSquadId]) AND ([t0].[SquadId] IS NOT NULL AND [t1].[GearSquadId] IS NOT NULL)) OR ([t0].[SquadId] IS NULL AND [t1].[GearSquadId] IS NULL)) LEFT JOIN ( - SELECT [t.Gear.Tag.Gear].* - FROM [Gears] AS [t.Gear.Tag.Gear] - WHERE [t.Gear.Tag.Gear].[Discriminator] IN (N'Officer', N'Gear') -) AS [t1] ON ([t.Gear.Tag].[GearNickName] = [t1].[Nickname]) AND ([t.Gear.Tag].[GearSquadId] = [t1].[SquadId]) -LEFT JOIN [Cities] AS [t.Gear.Tag.Gear.AssignedCity] ON [t1].[AssignedCityName] = [t.Gear.Tag.Gear.AssignedCity].[Name]"); + SELECT [g0].[Nickname], [g0].[SquadId], [g0].[AssignedCityName], [g0].[CityOrBirthName], [g0].[Discriminator], [g0].[FullName], [g0].[HasSoulPatch], [g0].[LeaderNickname], [g0].[LeaderSquadId], [g0].[Rank] + FROM [Gears] AS [g0] + WHERE [g0].[Discriminator] IN (N'Gear', N'Officer') +) AS [t2] ON (([t1].[GearNickName] = [t2].[Nickname]) AND [t1].[GearNickName] IS NOT NULL) AND (([t1].[GearSquadId] = [t2].[SquadId]) AND [t1].[GearSquadId] IS NOT NULL) +LEFT JOIN [Cities] AS [c] ON [t2].[AssignedCityName] = [c].[Name]"); } public override async Task Select_conditional_with_anonymous_type_and_null_constant(bool isAsync) @@ -1320,20 +1326,20 @@ public override async Task Select_Where_Navigation_Equals_Navigation(bool isAsyn await base.Select_Where_Navigation_Equals_Navigation(isAsync); AssertSql( - @"SELECT [t1].[Id], [t1].[GearNickName], [t1].[GearSquadId], [t1].[Note], [t2].[Id], [t2].[GearNickName], [t2].[GearSquadId], [t2].[Note] -FROM [Tags] AS [t1] -CROSS JOIN [Tags] AS [t2] + @"SELECT [t].[Id], [t].[GearNickName], [t].[GearSquadId], [t].[Note], [t0].[Id], [t0].[GearNickName], [t0].[GearSquadId], [t0].[Note] +FROM [Tags] AS [t] +CROSS JOIN [Tags] AS [t0] LEFT JOIN ( - SELECT [join.Gear].* - FROM [Gears] AS [join.Gear] - WHERE [join.Gear].[Discriminator] IN (N'Officer', N'Gear') -) AS [t] ON ([t1].[GearNickName] = [t].[Nickname]) AND ([t1].[GearSquadId] = [t].[SquadId]) + SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] + FROM [Gears] AS [g] + WHERE [g].[Discriminator] IN (N'Gear', N'Officer') +) AS [t1] ON (([t].[GearNickName] = [t1].[Nickname]) AND [t].[GearNickName] IS NOT NULL) AND (([t].[GearSquadId] = [t1].[SquadId]) AND [t].[GearSquadId] IS NOT NULL) LEFT JOIN ( - SELECT [join.Gear.Gear].* - FROM [Gears] AS [join.Gear.Gear] - WHERE [join.Gear.Gear].[Discriminator] IN (N'Officer', N'Gear') -) AS [t0] ON ([t2].[GearNickName] = [t0].[Nickname]) AND ([t2].[GearSquadId] = [t0].[SquadId]) -WHERE (([t].[Nickname] = [t0].[Nickname]) OR ([t].[Nickname] IS NULL AND [t0].[Nickname] IS NULL)) AND (([t].[SquadId] = [t0].[SquadId]) OR ([t].[SquadId] IS NULL AND [t0].[SquadId] IS NULL))"); + SELECT [g0].[Nickname], [g0].[SquadId], [g0].[AssignedCityName], [g0].[CityOrBirthName], [g0].[Discriminator], [g0].[FullName], [g0].[HasSoulPatch], [g0].[LeaderNickname], [g0].[LeaderSquadId], [g0].[Rank] + FROM [Gears] AS [g0] + WHERE [g0].[Discriminator] IN (N'Gear', N'Officer') +) AS [t2] ON (([t0].[GearNickName] = [t2].[Nickname]) AND [t0].[GearNickName] IS NOT NULL) AND (([t0].[GearSquadId] = [t2].[SquadId]) AND [t0].[GearSquadId] IS NOT NULL) +WHERE ((([t1].[Nickname] = [t2].[Nickname]) AND ([t1].[Nickname] IS NOT NULL AND [t2].[Nickname] IS NOT NULL)) OR ([t1].[Nickname] IS NULL AND [t2].[Nickname] IS NULL)) AND ((([t1].[SquadId] = [t2].[SquadId]) AND ([t1].[SquadId] IS NOT NULL AND [t2].[SquadId] IS NOT NULL)) OR ([t1].[SquadId] IS NULL AND [t2].[SquadId] IS NULL))"); } public override async Task Select_Where_Navigation_Null(bool isAsync) @@ -1344,11 +1350,11 @@ public override async Task Select_Where_Navigation_Null(bool isAsync) @"SELECT [t].[Id], [t].[GearNickName], [t].[GearSquadId], [t].[Note] FROM [Tags] AS [t] LEFT JOIN ( - SELECT [t.Gear].* - FROM [Gears] AS [t.Gear] - WHERE [t.Gear].[Discriminator] IN (N'Officer', N'Gear') -) AS [t0] ON ([t].[GearNickName] = [t0].[Nickname]) AND ([t].[GearSquadId] = [t0].[SquadId]) -WHERE [t0].[Nickname] IS NULL AND [t0].[SquadId] IS NULL"); + SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] + FROM [Gears] AS [g] + WHERE [g].[Discriminator] IN (N'Gear', N'Officer') +) AS [t0] ON (([t].[GearNickName] = [t0].[Nickname]) AND [t].[GearNickName] IS NOT NULL) AND (([t].[GearSquadId] = [t0].[SquadId]) AND [t].[GearSquadId] IS NOT NULL) +WHERE [t0].[Nickname] IS NULL"); } public override async Task Select_Where_Navigation_Null_Reverse(bool isAsync) @@ -1359,11 +1365,11 @@ public override async Task Select_Where_Navigation_Null_Reverse(bool isAsync) @"SELECT [t].[Id], [t].[GearNickName], [t].[GearSquadId], [t].[Note] FROM [Tags] AS [t] LEFT JOIN ( - SELECT [t.Gear].* - FROM [Gears] AS [t.Gear] - WHERE [t.Gear].[Discriminator] IN (N'Officer', N'Gear') -) AS [t0] ON ([t].[GearNickName] = [t0].[Nickname]) AND ([t].[GearSquadId] = [t0].[SquadId]) -WHERE [t0].[Nickname] IS NULL AND [t0].[SquadId] IS NULL"); + SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] + FROM [Gears] AS [g] + WHERE [g].[Discriminator] IN (N'Gear', N'Officer') +) AS [t0] ON (([t].[GearNickName] = [t0].[Nickname]) AND [t].[GearNickName] IS NOT NULL) AND (([t].[GearSquadId] = [t0].[SquadId]) AND [t].[GearSquadId] IS NOT NULL) +WHERE [t0].[Nickname] IS NULL"); } public override async Task Select_Where_Navigation_Scalar_Equals_Navigation_Scalar_Projected(bool isAsync) @@ -5890,14 +5896,14 @@ public override async Task Join_on_entity_qsre_keys_inner_key_is_navigation(bool await base.Join_on_entity_qsre_keys_inner_key_is_navigation(isAsync); AssertSql( - @"SELECT [c].[Name] AS [CityName], [g].[Nickname] AS [GearNickname] + @"SELECT [c].[Name] AS [CityName], [t].[Nickname] AS [GearNickname] FROM [Cities] AS [c] -INNER JOIN [Gears] AS [g] ON [c].[Name] = ( - SELECT TOP(1) [subQuery0].[Name] - FROM [Cities] AS [subQuery0] - WHERE [subQuery0].[Name] = [g].[AssignedCityName] -) -WHERE [g].[Discriminator] IN (N'Officer', N'Gear')"); +INNER JOIN ( + SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank], [c0].[Name], [c0].[Location], [c0].[Nation] + FROM [Gears] AS [g] + LEFT JOIN [Cities] AS [c0] ON [g].[AssignedCityName] = [c0].[Name] + WHERE [g].[Discriminator] IN (N'Gear', N'Officer') +) AS [t] ON [c].[Name] = [t].[Name]"); } public override async Task Join_on_entity_qsre_keys_inner_key_is_navigation_composite_key(bool isAsync) @@ -5956,14 +5962,18 @@ public override async Task GroupJoin_on_entity_qsre_keys_inner_key_is_nested_nav await base.GroupJoin_on_entity_qsre_keys_inner_key_is_nested_navigation(isAsync); AssertSql( - @"SELECT [s].[Name] AS [SquadName], [w].[Name] AS [WeaponName] + @"SELECT [s].[Name] AS [SquadName], [t0].[Name] AS [WeaponName] FROM [Squads] AS [s] -LEFT JOIN [Weapons] AS [w] ON [s].[Id] = ( - SELECT TOP(1) [subQuery.Squad0].[Id] - FROM [Gears] AS [subQuery0] - INNER JOIN [Squads] AS [subQuery.Squad0] ON [subQuery0].[SquadId] = [subQuery.Squad0].[Id] - WHERE [subQuery0].[Discriminator] IN (N'Officer', N'Gear') AND ([subQuery0].[FullName] = [w].[OwnerFullName]) -)"); +LEFT JOIN ( + SELECT [w].[Id], [w].[AmmunitionType], [w].[IsAutomatic], [w].[Name], [w].[OwnerFullName], [w].[SynergyWithId], [t].[Nickname], [t].[SquadId], [t].[AssignedCityName], [t].[CityOrBirthName], [t].[Discriminator], [t].[FullName], [t].[HasSoulPatch], [t].[LeaderNickname], [t].[LeaderSquadId], [t].[Rank], [s0].[Id] AS [Id0], [s0].[InternalNumber], [s0].[Name] AS [Name0] + FROM [Weapons] AS [w] + LEFT JOIN ( + SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] + FROM [Gears] AS [g] + WHERE [g].[Discriminator] IN (N'Gear', N'Officer') + ) AS [t] ON [w].[OwnerFullName] = [t].[FullName] + LEFT JOIN [Squads] AS [s0] ON [t].[SquadId] = [s0].[Id] +) AS [t0] ON [s].[Id] = [t0].[Id0]"); } public override async Task Join_with_complex_key_selector(bool isAsync) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs index ba899642e45..09108b64f8f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs @@ -1243,11 +1243,11 @@ public override void From_sql_composed_with_relational_null_comparison() base.From_sql_composed_with_relational_null_comparison(); AssertSql( - @"SELECT [c].[Id], [c].[BoolA], [c].[BoolB], [c].[BoolC], [c].[IntA], [c].[IntB], [c].[IntC], [c].[NullableBoolA], [c].[NullableBoolB], [c].[NullableBoolC], [c].[NullableIntA], [c].[NullableIntB], [c].[NullableIntC], [c].[NullableStringA], [c].[NullableStringB], [c].[NullableStringC], [c].[StringA], [c].[StringB], [c].[StringC] + @"SELECT [e].[Id], [e].[BoolA], [e].[BoolB], [e].[BoolC], [e].[IntA], [e].[IntB], [e].[IntC], [e].[NullableBoolA], [e].[NullableBoolB], [e].[NullableBoolC], [e].[NullableIntA], [e].[NullableIntB], [e].[NullableIntC], [e].[NullableStringA], [e].[NullableStringB], [e].[NullableStringC], [e].[StringA], [e].[StringB], [e].[StringC] FROM ( SELECT * FROM ""Entities1"" -) AS [c] -WHERE [c].[StringA] = [c].[StringB]"); +) AS [e] +WHERE [e].[StringA] = [e].[StringB]"); } public override void Projecting_nullable_bool_with_coalesce() diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs index 5e9c1ed8696..b9125993755 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs @@ -4010,45 +4010,6 @@ FROM [Table] AS [t0] } } - [ConditionalFact(Skip = "Issue #11870")] - public virtual void GroupJoin_Anonymous_projection_GroupBy_Aggregate_join_elimination_3() - { - using (CreateDatabase11818()) - { - using (var context = new MyContext11818(_options)) - { - var query = (from e in context.Set() - join a in context.Set() - on e.Id equals a.Id into grouping - from a in grouping.DefaultIfEmpty() - join m in context.Set() - on e.Id equals m.Id into grouping2 - from m in grouping2.DefaultIfEmpty() - select new - { - aname = a.Name, - mname = m.Name - }) - .GroupBy( - g => new - { - g.aname, - g.mname - }).DefaultIfEmpty() - .Select( - g => new - { - MyKey = g.Key.aname, - cnt = g.Count() + 5 - }) - .ToList(); - - AssertSql( - ""); - } - } - } - [ConditionalFact(Skip = "Issue #11871")] public virtual void GroupJoin_Anonymous_projection_GroupBy_Aggregate_join_elimination_4() { @@ -4148,7 +4109,7 @@ public class MaumarEntity11818 #region Bug11803_11791 - [ConditionalFact(Skip = "See issue#13587")] + [ConditionalFact(Skip = "Issue #15364")] public virtual void Query_filter_with_db_set_should_not_block_other_filters() { using (CreateDatabase11803()) @@ -5246,7 +5207,7 @@ private enum TodoType #region Bug13157 - [ConditionalFact(Skip = "Issue#16321")] + [ConditionalFact] public virtual void Correlated_subquery_with_owned_navigation_being_compared_to_null_works() { using (CreateDatabase13157()) @@ -5275,25 +5236,17 @@ public virtual void Correlated_subquery_with_owned_navigation_being_compared_to_ Assert.Equal(10, partners[0].Addresses[0].Turnovers.AmountIn); AssertSql( - @"SELECT [x].[Id] -FROM [Partners] AS [x] -ORDER BY [x].[Id]", - // - @"SELECT [t0].[Id], CASE - WHEN [t].[Id] IS NULL - THEN CAST(1 AS bit) ELSE CAST(0 AS bit) -END, [t].[Turnovers_AmountIn] AS [AmountIn], [x.Addresses].[Partner13157Id] -FROM [Address13157] AS [x.Addresses] + @"SELECT [p].[Id], [t].[c], [t].[Turnovers_AmountIn], [t].[Id], [t].[Partner13157Id] +FROM [Partners] AS [p] LEFT JOIN ( - SELECT [y.Turnovers].* - FROM [Address13157] AS [y.Turnovers] - WHERE [y.Turnovers].[Turnovers_AmountIn] IS NOT NULL -) AS [t] ON [x.Addresses].[Id] = [t].[Id] -INNER JOIN ( - SELECT [x0].[Id] - FROM [Partners] AS [x0] -) AS [t0] ON [x.Addresses].[Partner13157Id] = [t0].[Id] -ORDER BY [t0].[Id]"); + SELECT CASE + WHEN [a].[Id] IS NULL THEN CAST(1 AS bit) + ELSE CAST(0 AS bit) + END AS [c], [a].[Turnovers_AmountIn], [a0].[Id], [a0].[Partner13157Id] + FROM [Address13157] AS [a0] + LEFT JOIN [Address13157] AS [a] ON [a0].[Id] = [a].[Id] +) AS [t] ON [p].[Id] = [t].[Partner13157Id] +ORDER BY [p].[Id], [t].[Id]"); } } } @@ -5361,7 +5314,7 @@ public class AddressTurnovers13157 #region Bug13346 - [ConditionalFact(Skip = "See issue#13587")] + [ConditionalFact(Skip = "Issue #13346")] public virtual void ToQuery_can_define_in_own_terms_using_FromSql() { using (CreateDatabase13346()) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs index a41408aa061..e4042717c6e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs @@ -146,20 +146,6 @@ FROM [Customers] AS [c] WHERE ([c].[CustomerID] = @__p_0) AND @__p_0 IS NOT NULL"); } - public override void Method_with_constant_queryable_arg() - { - base.Method_with_constant_queryable_arg(); - - AssertSql( - @"SELECT COUNT(*) -FROM [Customers] AS [c] -WHERE [c].[CustomerID] IN (N'ALFKI')", - // - @"SELECT COUNT(*) -FROM [Customers] AS [c] -WHERE [c].[CustomerID] IN (N'FOO')"); - } - public override async Task Entity_equality_self(bool isAsync) { await base.Entity_equality_self(isAsync); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/SimpleQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/SimpleQuerySqliteTest.cs index c74bd184ce2..cfeb97d9f25 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/SimpleQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/SimpleQuerySqliteTest.cs @@ -840,7 +840,7 @@ public override async Task Select_datetime_DayOfWeek_component(bool isAsync) await base.Select_datetime_DayOfWeek_component(isAsync); AssertSql( - @"SELECT CAST(strftime('%w', ""o"".""OrderDate"") AS INTEGER) + @"SELECT CAST(CAST(strftime('%w', ""o"".""OrderDate"") AS INTEGER) AS INTEGER) FROM ""Orders"" AS ""o"""); } @@ -849,7 +849,7 @@ public override async Task Select_datetime_Ticks_component(bool isAsync) await base.Select_datetime_Ticks_component(isAsync); AssertSql( - @"SELECT CAST((julianday(""o"".""OrderDate"") - 1721425.5) * 864000000000 AS INTEGER) + @"SELECT CAST(((julianday(""o"".""OrderDate"") - 1721425.5) * 864000000000.0) AS INTEGER) FROM ""Orders"" AS ""o"""); } @@ -930,7 +930,7 @@ public override async Task Select_expression_datetime_add_ticks(bool isAsync) await base.Select_expression_datetime_add_ticks(isAsync); AssertSql( - @"SELECT rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', ""o"".""OrderDate"", CAST(10000 / 10000000.0 AS TEXT) || ' seconds'), '0'), '.') AS ""OrderDate"" + @"SELECT rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', ""o"".""OrderDate"", CAST((10000 / 864000000000) AS TEXT) || ' seconds'), '0'), '.') AS ""OrderDate"" FROM ""Orders"" AS ""o"" WHERE ""o"".""OrderDate"" IS NOT NULL"); } @@ -940,7 +940,7 @@ public override async Task Select_expression_date_add_milliseconds_above_the_ran await base.Select_expression_date_add_milliseconds_above_the_range(isAsync); AssertSql( - @"SELECT rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', ""o"".""OrderDate"", CAST(1000000000000.0 / 1000 AS TEXT) || ' seconds'), '0'), '.') AS ""OrderDate"" + @"SELECT rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', ""o"".""OrderDate"", CAST((1000000000000.0 / 1000.0) AS TEXT) || ' seconds'), '0'), '.') AS ""OrderDate"" FROM ""Orders"" AS ""o"" WHERE ""o"".""OrderDate"" IS NOT NULL"); } @@ -950,7 +950,7 @@ public override async Task Select_expression_date_add_milliseconds_below_the_ran await base.Select_expression_date_add_milliseconds_below_the_range(isAsync); AssertSql( - @"SELECT rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', ""o"".""OrderDate"", CAST(-1000000000000.0 / 1000 AS TEXT) || ' seconds'), '0'), '.') AS ""OrderDate"" + @"SELECT rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', ""o"".""OrderDate"", CAST((-1000000000000.0 / 1000.0) AS TEXT) || ' seconds'), '0'), '.') AS ""OrderDate"" FROM ""Orders"" AS ""o"" WHERE ""o"".""OrderDate"" IS NOT NULL"); } diff --git a/test/EFCore.Tests/ChangeTracking/ChangeTrackerTest.cs b/test/EFCore.Tests/ChangeTracking/ChangeTrackerTest.cs index 0fcd9f44b6c..28b7385fdc5 100644 --- a/test/EFCore.Tests/ChangeTracking/ChangeTrackerTest.cs +++ b/test/EFCore.Tests/ChangeTracking/ChangeTrackerTest.cs @@ -81,7 +81,7 @@ public void Detect_property_change_is_logged(bool sensitive) } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(false)] [InlineData(true)] public void Detect_foreign_key_property_change_is_logged(bool sensitive) @@ -121,7 +121,7 @@ public void Detect_foreign_key_property_change_is_logged(bool sensitive) } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(false)] [InlineData(true)] public void Detect_collection_change_is_logged(bool sensitive) @@ -161,7 +161,7 @@ public void Detect_collection_change_is_logged(bool sensitive) } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(false)] [InlineData(true)] public void Detect_reference_change_is_logged(bool sensitive) @@ -352,7 +352,7 @@ public void Reset(bool generateTemporaryValues) } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(false, CascadeTiming.OnSaveChanges, CascadeTiming.OnSaveChanges)] [InlineData(false, CascadeTiming.OnSaveChanges, CascadeTiming.Immediate)] [InlineData(false, CascadeTiming.OnSaveChanges, CascadeTiming.Never)] @@ -471,7 +471,7 @@ void ClearMessages() } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(false, CascadeTiming.OnSaveChanges, CascadeTiming.OnSaveChanges)] [InlineData(false, CascadeTiming.OnSaveChanges, CascadeTiming.Immediate)] [InlineData(false, CascadeTiming.OnSaveChanges, CascadeTiming.Never)] diff --git a/test/EFCore.Tests/ChangeTracking/Internal/FixupTest.cs b/test/EFCore.Tests/ChangeTracking/Internal/FixupTest.cs index 942dfbec98b..345e64a70e7 100644 --- a/test/EFCore.Tests/ChangeTracking/Internal/FixupTest.cs +++ b/test/EFCore.Tests/ChangeTracking/Internal/FixupTest.cs @@ -2418,7 +2418,7 @@ public void Replace_dependent_one_to_one_no_navs_FK_set(EntityState oldEntitySta } } - [ConditionalFact(Skip = "issue #15318 - using InMemory Include query")] // Issue #6067 + [ConditionalFact(Skip = "issue #16963 - using InMemory Include query")] // Issue #6067 public void Collection_nav_props_remain_fixed_up_after_manual_fixup_and_DetectChanges() { using (var context = new FixupContext()) diff --git a/test/EFCore.Tests/ChangeTracking/Internal/QueryFixupTest.cs b/test/EFCore.Tests/ChangeTracking/Internal/QueryFixupTest.cs index b33cd55d45b..2cd8b405f64 100644 --- a/test/EFCore.Tests/ChangeTracking/Internal/QueryFixupTest.cs +++ b/test/EFCore.Tests/ChangeTracking/Internal/QueryFixupTest.cs @@ -12,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal { public class QueryFixupTest { - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal() { Seed(); @@ -33,7 +33,7 @@ public void Query_dependent_include_principal() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_principal_include_dependent() { Seed(); @@ -54,7 +54,7 @@ public void Query_principal_include_dependent() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_unidirectional() { Seed(); @@ -74,7 +74,7 @@ public void Query_dependent_include_principal_unidirectional() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_principal_include_dependent_unidirectional() { Seed(); @@ -94,7 +94,7 @@ public void Query_principal_include_dependent_unidirectional() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_one_to_one() { Seed(); @@ -115,7 +115,7 @@ public void Query_dependent_include_principal_one_to_one() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_principal_include_dependent_one_to_one() { Seed(); @@ -136,7 +136,7 @@ public void Query_principal_include_dependent_one_to_one() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_unidirectional_one_to_one() { Seed(); @@ -156,7 +156,7 @@ public void Query_dependent_include_principal_unidirectional_one_to_one() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_principal_include_dependent_unidirectional_one_to_one() { Seed(); @@ -198,7 +198,7 @@ public void Query_self_ref() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_self_ref() { Seed(); @@ -220,7 +220,7 @@ public void Query_dependent_include_principal_self_ref() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_principal_include_dependent_self_ref() { Seed(); @@ -284,7 +284,7 @@ public void Query_self_ref_dependent_nav_only() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_self_ref_unidirectional() { Seed(); @@ -305,7 +305,7 @@ public void Query_dependent_include_principal_self_ref_unidirectional() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_principal_include_dependent_self_ref_unidirectional() { Seed(); @@ -348,7 +348,7 @@ public void Query_self_ref_one_to_one() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_self_ref_one_to_one() { Seed(); @@ -370,7 +370,7 @@ public void Query_dependent_include_principal_self_ref_one_to_one() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_principal_include_dependent_self_ref_one_to_one() { Seed(); @@ -434,7 +434,7 @@ public void Query_self_ref_one_to_one_dependent_nav_only() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_self_ref_one_to_one_unidirectional() { Seed(); @@ -455,7 +455,7 @@ public void Query_dependent_include_principal_self_ref_one_to_one_unidirectional } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_principal_include_dependent_self_ref_one_to_one_unidirectional() { Seed(); @@ -476,7 +476,7 @@ public void Query_principal_include_dependent_self_ref_one_to_one_unidirectional } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact] public void Query_dependent_include_principal_multiple_relationships() { Seed(); @@ -500,7 +500,7 @@ public void Query_dependent_include_principal_multiple_relationships() } } - [ConditionalFact(Skip = "TaskList#19")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_principal_include_dependent_multiple_relationships() { Seed(); @@ -524,7 +524,7 @@ public void Query_principal_include_dependent_multiple_relationships() } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -558,7 +558,7 @@ public void Query_dependent_include_principal_with_existing(EntityState existing } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -592,7 +592,7 @@ public void Query_principal_include_dependent_with_existing(EntityState existing } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -624,7 +624,7 @@ public void Query_dependent_include_principal_unidirectional_with_existing(Entit } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -691,7 +691,7 @@ public void Query_self_ref_with_existing(EntityState existingState) } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -726,7 +726,7 @@ public void Query_dependent_include_principal_self_ref_with_existing(EntityState } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -827,7 +827,7 @@ public void Query_self_ref_dependent_nav_only_with_existing(EntityState existing } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -860,7 +860,7 @@ public void Query_dependent_include_principal_self_ref_unidirectional_with_exist } } - [ConditionalTheory(Skip = "TaskList#19")] + [ConditionalTheory(Skip = "Issue #16963")] [InlineData(EntityState.Added)] [InlineData(EntityState.Modified)] [InlineData(EntityState.Unchanged)] @@ -893,7 +893,7 @@ public void Query_principal_include_dependent_self_ref_unidirectional_with_exist } } - [ConditionalFact(Skip = "TaskList#20")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_ownership_navigations() { Seed(); @@ -944,7 +944,7 @@ public void Query_ownership_navigations() } } - [ConditionalFact(Skip = "TaskList#20")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_owned_foreign_key() { Seed(); @@ -961,7 +961,7 @@ public void Query_owned_foreign_key() } } - [ConditionalFact(Skip = "TaskList#20")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_subowned_foreign_key() { Seed(); @@ -978,7 +978,7 @@ public void Query_subowned_foreign_key() } } - [ConditionalFact(Skip = "TaskList#20")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_owned() { Seed(); @@ -999,7 +999,7 @@ public void Query_owned() } } - [ConditionalFact(Skip = "TaskList#20")] + [ConditionalFact(Skip = "Issue #16963")] public void Query_subowned() { Seed();