Back-patch fix for NULL condition in CASE.

tglsfdc · tglsfdc · commit 7fe22f5c8b09 · 1999-09-18T23:30:05.000Z
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.53 1999/06/12 19:22:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.53.2.1 1999/09/18 23:30:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1128,9 +1128,10 @@ ExecEvalCase(CaseExpr *caseExpr, ExprContext *econtext, bool *isNull)
 
 		/*
 		 * if we have a true test, then we return the result, since the
-		 * case statement is satisfied.
+		 * case statement is satisfied.  A NULL result from the test is
+		 * not considered true.
 		 */
-		if (DatumGetInt32(const_value) != 0)
+		if (DatumGetInt32(const_value) != 0 && ! *isNull)
 		{
 			const_value = ExecEvalExpr((Node *) wclause->result,
 									   econtext,

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.53 1999/06/12 19:22:40 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.53.2.1 1999/09/18 23:30:05 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1128,9 +1128,10 @@ ExecEvalCase(CaseExpr caseExpr, ExprContext econtext, bool *isNull)`
`1128`	`1128`
`1129`	`1129`	`/*`
`1130`	`1130`	`* if we have a true test, then we return the result, since the`
`1131`		`- * case statement is satisfied.`
	`1131`	`+ * case statement is satisfied. A NULL result from the test is`
	`1132`	`+ * not considered true.`
`1132`	`1133`	`*/`
`1133`		`- if (DatumGetInt32(const_value) != 0)`
	`1134`	`+ if (DatumGetInt32(const_value) != 0 && ! *isNull)`
`1134`	`1135`	`{`
`1135`	`1136`	`const_value = ExecEvalExpr((Node *) wclause->result,`
`1136`	`1137`	`econtext,`