From 3cba5ee32f2575956a646e2ea4f196042f8fcd43 Mon Sep 17 00:00:00 2001
From: Yuya Watari <watari.yuya@gmail.com>
Date: Tue, 29 Nov 2022 16:55:36 +0900
Subject: [PATCH v9 4/4] Fix incorrect assertion

---
 contrib/postgres_fdw/postgres_fdw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index bf79daee58..eadd8672d7 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -7478,10 +7478,10 @@ find_em_for_rel(PlannerInfo *root, EquivalenceClass *ec, RelOptInfo *rel)
 		 * Note we require !bms_is_empty, else we'd accept constant
 		 * expressions which are not suitable for the purpose.
 		 */
-		Assert(bms_is_subset(em->em_relids, rel->relids));
 		Assert(!bms_is_empty(em->em_relids));
 
-		if (is_foreign_expr(root, rel, em->em_expr))
+		if (bms_is_subset(em->em_relids, rel->relids) &&
+			is_foreign_expr(root, rel, em->em_expr))
 			return em;
 	}
 
-- 
2.35.3.windows.1

