Skip to content

Commit a51dc6a

Browse files
messieurMemessieurMe
committed
ignored some tests due to unsupported queries
1 parent 5fe8d6d commit a51dc6a

8 files changed

+289
-7
lines changed

‎src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/FieldMappingYdbTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Microsoft.EntityFrameworkCore.Infrastructure;
44
using Microsoft.EntityFrameworkCore.Storage;
55
using Microsoft.EntityFrameworkCore.TestUtilities;
6+
using Xunit;
67

78
namespace EntityFrameworkCore.Ydb.FunctionalTests;
89

@@ -19,4 +20,7 @@ public class FieldMappingYdbFixture : FieldMappingFixtureBase
1920
protected override ITestStoreFactory TestStoreFactory
2021
=> YdbTestStoreFactory.Instance;
2122
}
23+
24+
[ConditionalFact(Skip = "OrderBy parameter not included in SELECT")]
25+
public override void Can_define_a_backing_field_for_a_navigation_and_query_and_update_it() => base.Can_define_a_backing_field_for_a_navigation_and_query_and_update_it();
2226
}

‎src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,47 @@ public override void AddColumnOperation_with_fixed_length_no_model()
1212
{
1313
base.AddColumnOperation_with_fixed_length_no_model();
1414

15-
AssertSql("ALTER TABLE `Person` ADD `Name` TEXT;");
15+
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
1616
}
1717

1818

1919
public override void AddColumnOperation_without_column_type()
2020
{
2121
base.AddColumnOperation_without_column_type();
2222

23-
AssertSql("ALTER TABLE `People` ADD `Alias` TEXT NOT NULL;");
23+
AssertSql("ALTER TABLE `People` ADD `Alias` Text NOT NULL;");
2424
}
2525

2626

2727
public override void AddColumnOperation_with_unicode_overridden()
2828
{
2929
base.AddColumnOperation_with_unicode_overridden();
3030

31-
AssertSql("ALTER TABLE `Person` ADD `Name` TEXT;");
31+
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
3232
}
3333

3434

3535
public override void AddColumnOperation_with_unicode_no_model()
3636
{
3737
base.AddColumnOperation_with_unicode_no_model();
3838

39-
AssertSql("ALTER TABLE `Person` ADD `Name` TEXT;");
39+
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
4040
}
4141

4242

4343
public override void AddColumnOperation_with_maxLength_overridden()
4444
{
4545
base.AddColumnOperation_with_maxLength_overridden();
4646

47-
AssertSql("ALTER TABLE `Person` ADD `Name` TEXT;");
47+
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
4848
}
4949

5050

5151
public override void AddColumnOperation_with_maxLength_no_model()
5252
{
5353
base.AddColumnOperation_with_maxLength_no_model();
5454

55-
AssertSql("ALTER TABLE `Person` ADD `Name` TEXT;");
55+
AssertSql("ALTER TABLE `Person` ADD `Name` Text;");
5656
}
5757

5858

‎src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities;
22
using Microsoft.EntityFrameworkCore.Query;
33
using Microsoft.EntityFrameworkCore.TestUtilities;
4+
using Xunit;
45

56
namespace EntityFrameworkCore.Ydb.FunctionalTests.Query;
67

@@ -27,4 +28,7 @@ public override Task
2728
public override Task Hierarchy_query_with_abstract_type_sibling_TPC(bool async) => Task.CompletedTask;
2829

2930
public override Task Projection_failing_with_EnumToStringConverter() => Task.CompletedTask;
31+
32+
[ConditionalFact(Skip = "OrderBy parameter not included in SELECT")]
33+
public override Task Projecting_one_of_two_similar_complex_types_picks_the_correct_one() => base.Projecting_one_of_two_similar_complex_types_picks_the_correct_one();
3034
}

‎src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/ComplexNavigationsCollectionsQueryYdbTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,7 @@ public override Task Projecting_collection_after_optional_reference_correlated_w
149149
public override Task
150150
Projecting_collection_with_group_by_after_optional_reference_correlated_with_parent(bool async) =>
151151
base.Projecting_collection_with_group_by_after_optional_reference_correlated_with_parent(async);
152+
153+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
154+
public override Task Skip_Take_on_grouping_element_into_non_entity(bool async) => base.Skip_Take_on_grouping_element_into_non_entity(async);
152155
}

‎src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryYdbTest.cs‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace EntityFrameworkCore.Ydb.FunctionalTests.Query;
77

8-
// TODO: Success rate: 250/300
8+
// TODO: Success rate: 200/300
99
public class ComplexNavigationsCollectionsSharedTypeQueryYdbTest :
1010
ComplexNavigationsCollectionsSharedTypeQueryRelationalTestBase<
1111
ComplexNavigationsSharedTypeQueryYdbFixture>
@@ -132,4 +132,34 @@ public override Task Projecting_collection_after_optional_reference_correlated_w
132132
public override Task
133133
Projecting_collection_with_group_by_after_optional_reference_correlated_with_parent(bool async) =>
134134
base.Projecting_collection_with_group_by_after_optional_reference_correlated_with_parent(async);
135+
136+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
137+
public override Task Select_subquery_single_nested_subquery2(bool async) => base.Select_subquery_single_nested_subquery2(async);
138+
139+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
140+
public override Task Filtered_include_same_filter_set_on_same_navigation_twice(bool async) => base.Filtered_include_same_filter_set_on_same_navigation_twice(async);
141+
142+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
143+
public override Task Filtered_include_and_non_filtered_include_on_same_navigation1(bool async) => base.Filtered_include_and_non_filtered_include_on_same_navigation1(async);
144+
145+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
146+
public override Task Filtered_include_and_non_filtered_include_on_same_navigation2(bool async) => base.Filtered_include_and_non_filtered_include_on_same_navigation2(async);
147+
148+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
149+
public override Task Filtered_include_variable_used_inside_filter(bool async) => base.Filtered_include_variable_used_inside_filter(async);
150+
151+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
152+
public override Task Filtered_include_context_accessed_inside_filter(bool async) => base.Filtered_include_context_accessed_inside_filter(async);
153+
154+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
155+
public override Task Filtered_include_is_considered_loaded(bool async) => base.Filtered_include_is_considered_loaded(async);
156+
157+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
158+
public override Task Skip_Take_on_grouping_element_into_non_entity(bool async) => base.Skip_Take_on_grouping_element_into_non_entity(async);
159+
160+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
161+
public override Task Include_partially_added_before_Where_and_then_build_upon_with_filtered_include(bool async) => base.Include_partially_added_before_Where_and_then_build_upon_with_filtered_include(async);
162+
163+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
164+
public override Task Project_collection_and_nested_conditional(bool async) => base.Project_collection_and_nested_conditional(async);
135165
}

‎src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/ComplexNavigationsQueryYdbTest.cs‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,76 @@ public override Task Nested_SelectMany_correlated_with_join_table_correctly_tran
271271
[ConditionalTheory(Skip = "TODO: Fix translation for INNER JOIN"), MemberData(nameof(IsAsyncData))]
272272
public override Task Join_with_result_selector_returning_queryable_throws_validation_error(bool async) =>
273273
base.Join_with_result_selector_returning_queryable_throws_validation_error(async);
274+
275+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
276+
public override Task OrderBy_nav_prop_reference_optional(bool async) => base.OrderBy_nav_prop_reference_optional(async);
277+
278+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
279+
public override Task OrderBy_nav_prop_reference_optional_via_DefaultIfEmpty(bool async) => base.OrderBy_nav_prop_reference_optional_via_DefaultIfEmpty(async);
280+
281+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
282+
public override Task Order_by_key_of_navigation_similar_to_projected_gets_optimized_into_FK_access(bool async) => base.Order_by_key_of_navigation_similar_to_projected_gets_optimized_into_FK_access(async);
283+
284+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
285+
public override Task Order_by_key_of_projected_navigation_doesnt_get_optimized_into_FK_access_subquery(bool async) => base.Order_by_key_of_projected_navigation_doesnt_get_optimized_into_FK_access_subquery(async);
286+
287+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
288+
public override Task Order_by_key_of_anonymous_type_projected_navigation_doesnt_get_optimized_into_FK_access_subquery(bool async) => base.Order_by_key_of_anonymous_type_projected_navigation_doesnt_get_optimized_into_FK_access_subquery(async);
289+
290+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
291+
public override Task Optional_navigation_take_optional_navigation(bool async) => base.Optional_navigation_take_optional_navigation(async);
292+
293+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
294+
public override Task Projection_select_correct_table_from_subquery_when_materialization_is_not_required(bool async) => base.Projection_select_correct_table_from_subquery_when_materialization_is_not_required(async);
295+
296+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
297+
public override Task Projection_select_correct_table_with_anonymous_projection_in_subquery(bool async) => base.Projection_select_correct_table_with_anonymous_projection_in_subquery(async);
298+
299+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
300+
public override Task Projection_select_correct_table_in_subquery_when_materialization_is_not_required_in_multiple_joins(bool async) => base.Projection_select_correct_table_in_subquery_when_materialization_is_not_required_in_multiple_joins(async);
301+
302+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
303+
public override Task Where_predicate_on_optional_reference_navigation(bool async) => base.Where_predicate_on_optional_reference_navigation(async);
304+
305+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
306+
public override Task GroupJoin_on_a_subquery_containing_another_GroupJoin_projecting_outer(bool async) => base.GroupJoin_on_a_subquery_containing_another_GroupJoin_projecting_outer(async);
307+
308+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
309+
public override Task GroupJoin_on_a_subquery_containing_another_GroupJoin_projecting_inner(bool async) => base.GroupJoin_on_a_subquery_containing_another_GroupJoin_projecting_inner(async);
310+
311+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
312+
public override Task GroupJoin_on_a_subquery_containing_another_GroupJoin_with_orderby_on_inner_sequence_projecting_inner(bool async) => base.GroupJoin_on_a_subquery_containing_another_GroupJoin_with_orderby_on_inner_sequence_projecting_inner(async);
313+
314+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
315+
public override Task GroupJoin_on_left_side_being_a_subquery(bool async) => base.GroupJoin_on_left_side_being_a_subquery(async);
316+
317+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
318+
public override Task GroupJoin_on_right_side_being_a_subquery(bool async) => base.GroupJoin_on_right_side_being_a_subquery(async);
319+
320+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
321+
public override Task Where_on_multilevel_reference_in_subquery_with_outer_projection(bool async) => base.Where_on_multilevel_reference_in_subquery_with_outer_projection(async);
322+
323+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
324+
public override Task Nested_group_join_with_take(bool async) => base.Nested_group_join_with_take(async);
325+
326+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
327+
public override Task SelectMany_subquery_with_custom_projection(bool async) => base.SelectMany_subquery_with_custom_projection(async);
328+
329+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
330+
public override Task Include18_1_1(bool async) => base.Include18_1_1(async);
331+
332+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
333+
public override Task Include18_2(bool async) => base.Include18_2(async);
334+
335+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
336+
public override Task Include18_3(bool async) => base.Include18_3(async);
337+
338+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
339+
public override Task Include18_3_1(bool async) => base.Include18_3_1(async);
340+
341+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
342+
public override Task Include18_3_2(bool async) => base.Include18_3_2(async);
343+
344+
[ConditionalTheory(Skip = "OrderBy parameter not included in SELECT"), MemberData(nameof(IsAsyncData))]
345+
public override Task Member_pushdown_chain_3_levels_deep_entity(bool async) => base.Member_pushdown_chain_3_levels_deep_entity(async);
274346
}

0 commit comments

Comments
 (0)