diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-06-24 15:06:19 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-06-24 15:14:15 -0400 |
| commit | 9e9c38e15947f4f3ed478f8b70e74b55e31fe950 (patch) | |
| tree | d9f54f2467dc92d7d029baed1487a0cbfebb4d73 /contrib/postgres_fdw/deparse.c | |
| parent | 267569b24c1782b756cad46ffc8e9b28988e7385 (diff) | |
| download | postgresql-9e9c38e15947f4f3ed478f8b70e74b55e31fe950.tar.gz postgresql-9e9c38e15947f4f3ed478f8b70e74b55e31fe950.zip | |
postgres_fdw: Fix incorrect NULL handling in join pushdown.
something.* IS NOT NULL means that every attribute of the row is not
NULL, not that the row itself is non-NULL (e.g. because it's coming
from below an outer join. Use (somevar.*)::pg_catalog.text IS NOT
NULL instead.
Ashutosh Bapat, per a report by Rushabh Lathia. Reviewed by
Amit Langote and Etsuro Fujita. Schema-qualification added by me.
Diffstat (limited to 'contrib/postgres_fdw/deparse.c')
| -rw-r--r-- | contrib/postgres_fdw/deparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index b0558edbf1b..2ca0e0ccf12 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -1599,9 +1599,9 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root, if (qualify_col) { - appendStringInfoString(buf, "CASE WHEN "); + appendStringInfoString(buf, "CASE WHEN ("); ADD_REL_QUALIFIER(buf, varno); - appendStringInfo(buf, "* IS NOT NULL THEN %u END", fetchval); + appendStringInfo(buf, "*)::pg_catalog.text IS NOT NULL THEN %u END", fetchval); } else appendStringInfo(buf, "%u", fetchval); @@ -1643,9 +1643,9 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root, */ if (qualify_col) { - appendStringInfoString(buf, "CASE WHEN "); + appendStringInfoString(buf, "CASE WHEN ("); ADD_REL_QUALIFIER(buf, varno); - appendStringInfo(buf, "* IS NOT NULL THEN "); + appendStringInfo(buf, "*)::pg_catalog.text IS NOT NULL THEN "); } appendStringInfoString(buf, "ROW("); |