aboutsummaryrefslogtreecommitdiff
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 7eaf8d27bf0..5f736ad6c40 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -654,7 +654,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);
@@ -687,6 +687,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);
/*