]> granicus.if.org Git - postgresql/commitdiff
Fix overly enthusiastic Assert introduced in 8.1: it's expecting a
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 1 Oct 2006 17:23:38 +0000 (17:23 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 1 Oct 2006 17:23:38 +0000 (17:23 +0000)
CaseTestExpr, but forgot that the optimizer is sometimes able to replace
CaseTestExpr by Const.

src/backend/utils/adt/ruleutils.c

index a88f5ef93c6b41b5bca191608a0e318c7f5f992e..821cc99e9f268afe7f974487bb295dd7443239dc 100644 (file)
@@ -2,7 +2,7 @@
  * ruleutils.c - Functions to convert stored expressions/querytrees
  *                             back to source text
  *
- *       $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.232 2006/08/21 00:57:25 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.233 2006/10/01 17:23:38 tgl Exp $
  **********************************************************************/
 
 #include "postgres.h"
@@ -3584,14 +3584,18 @@ get_rule_expr(Node *node, deparse_context *context,
                                                 * the optimizer's simplify_boolean_equality() may
                                                 * have reduced this to just "CaseTestExpr" or
                                                 * "NOT CaseTestExpr", for which we have to show
-                                                * "TRUE" or "FALSE".
+                                                * "TRUE" or "FALSE".  Also, depending on context
+                                                * the original CaseTestExpr might have been reduced
+                                                * to a Const (but we won't see "WHEN Const").
                                                 */
                                                if (IsA(w, OpExpr))
                                                {
                                                        Node       *rhs;
 
                                                        Assert(IsA(linitial(((OpExpr *) w)->args),
-                                                                          CaseTestExpr));
+                                                                          CaseTestExpr) ||
+                                                                  IsA(linitial(((OpExpr *) w)->args),
+                                                                          Const));
                                                        rhs = (Node *) lsecond(((OpExpr *) w)->args);
                                                        get_rule_expr(rhs, context, false);
                                                }