postgrespro
diff --git a/‎contrib/postgres_fdw/deparse.c
Lines changed: 4 additions & 4 deletions b/‎contrib/postgres_fdw/deparse.c
Lines changed: 4 additions & 4 deletions
@@ -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(");
Original file line number	Diff line number	Diff line change
`@@ -1599,9 +1599,9 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root,`
`1599`	`1599`
`1600`	`1600`	`if (qualify_col)`
`1601`	`1601`	`{`
`1602`		`- appendStringInfoString(buf, "CASE WHEN ");`
	`1602`	`+ appendStringInfoString(buf, "CASE WHEN (");`
`1603`	`1603`	`ADD_REL_QUALIFIER(buf, varno);`
`1604`		`- appendStringInfo(buf, "* IS NOT NULL THEN %u END", fetchval);`
	`1604`	`+ appendStringInfo(buf, "*)::pg_catalog.text IS NOT NULL THEN %u END", fetchval);`
`1605`	`1605`	`}`
`1606`	`1606`	`else`
`1607`	`1607`	`appendStringInfo(buf, "%u", fetchval);`
`@@ -1643,9 +1643,9 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root,`
`1643`	`1643`	`*/`
`1644`	`1644`	`if (qualify_col)`
`1645`	`1645`	`{`
`1646`		`- appendStringInfoString(buf, "CASE WHEN ");`
	`1646`	`+ appendStringInfoString(buf, "CASE WHEN (");`
`1647`	`1647`	`ADD_REL_QUALIFIER(buf, varno);`
`1648`		`- appendStringInfo(buf, "* IS NOT NULL THEN ");`
	`1648`	`+ appendStringInfo(buf, "*)::pg_catalog.text IS NOT NULL THEN ");`
`1649`	`1649`	`}`
`1650`	`1650`
`1651`	`1651`	`appendStringInfoString(buf, "ROW(");`