Skip to content

Commit 3b71c73

Browse files
authored
Add missing check for predicate in primitive collection simplifications (#3196)
Fixes #3195
1 parent 6b3ca68 commit 3b71c73

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/EFCore.PG/Query/Internal/NpgsqlQueryableMethodTranslatingExpressionVisitor.cs

+8
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@ static IEnumerable<INavigation> GetAllNavigationsInHierarchy(IEntityType entityT
551551
Source1:
552552
{
553553
Tables: [PgUnnestExpression { Array: var array1 }],
554+
Predicate: null,
554555
GroupBy: [],
555556
Having: null,
556557
IsDistinct: false,
@@ -560,6 +561,7 @@ static IEnumerable<INavigation> GetAllNavigationsInHierarchy(IEntityType entityT
560561
Source2:
561562
{
562563
Tables: [PgUnnestExpression { Array: var array2 }],
564+
Predicate: null,
563565
GroupBy: [],
564566
Having: null,
565567
IsDistinct: false,
@@ -676,6 +678,7 @@ static IEnumerable<INavigation> GetAllNavigationsInHierarchy(IEntityType entityT
676678
&& source.QueryExpression is SelectExpression
677679
{
678680
Tables: [PgUnnestExpression { Array: var array }],
681+
Predicate: null,
679682
GroupBy: [],
680683
Having: null,
681684
IsDistinct: false,
@@ -715,6 +718,7 @@ protected override ShapedQueryExpression TranslateConcat(ShapedQueryExpression s
715718
if (source1.QueryExpression is SelectExpression
716719
{
717720
Tables: [PgUnnestExpression { Array: var array1 } unnestExpression1],
721+
Predicate: null,
718722
GroupBy: [],
719723
Having: null,
720724
IsDistinct: false,
@@ -725,6 +729,7 @@ protected override ShapedQueryExpression TranslateConcat(ShapedQueryExpression s
725729
&& source2.QueryExpression is SelectExpression
726730
{
727731
Tables: [PgUnnestExpression { Array: var array2 }],
732+
Predicate: null,
728733
GroupBy: [],
729734
Having: null,
730735
IsDistinct: false,
@@ -788,6 +793,7 @@ [new PgUnnestExpression(tableAlias, _sqlExpressionFactory.Add(array1, array2), "
788793
&& source.QueryExpression is SelectExpression
789794
{
790795
Tables: [PgUnnestExpression { Array: var array }],
796+
Predicate: null,
791797
GroupBy: [],
792798
Having: null,
793799
IsDistinct: false,
@@ -918,6 +924,7 @@ [new PgUnnestExpression(tableAlias, _sqlExpressionFactory.Add(array1, array2), "
918924
if (source.QueryExpression is SelectExpression
919925
{
920926
Tables: [PgUnnestExpression { Array: var array } unnestExpression],
927+
Predicate: null,
921928
GroupBy: [],
922929
Having: null,
923930
IsDistinct: false,
@@ -980,6 +987,7 @@ [new PgUnnestExpression(tableAlias, _sqlExpressionFactory.Add(array1, array2), "
980987
if (source.QueryExpression is SelectExpression
981988
{
982989
Tables: [PgUnnestExpression { Array: var array } unnestExpression],
990+
Predicate: null,
983991
GroupBy: [],
984992
Having: null,
985993
IsDistinct: false,

0 commit comments

Comments
 (0)