summaryrefslogtreecommitdiff
path: root/src/backend/optimizer/util/var.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/optimizer/util/var.c')
-rw-r--r--src/backend/optimizer/util/var.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 9bc90c25313..e59f0e13714 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -795,7 +795,7 @@ flatten_join_alias_vars_mutator(Node *node,
newvar = (Node *) lfirst(lv);
attnum++;
/* Ignore dropped columns */
- if (IsA(newvar, Const))
+ if (newvar == NULL)
continue;
newvar = copyObject(newvar);
@@ -828,6 +828,7 @@ flatten_join_alias_vars_mutator(Node *node,
/* Expand join alias reference */
Assert(var->varattno > 0);
newvar = (Node *) list_nth(rte->joinaliasvars, var->varattno - 1);
+ Assert(newvar != NULL);
newvar = copyObject(newvar);
/*