From 4140c2f30e2814527f0975876956f446e326ae70 Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Mon, 14 Dec 1998 00:02:17 +0000
Subject: Add support for the CASE statement in the rewrite handling. Allows
 (at least some) rules and views. Still some trouble (crashes) with target
 CASE columns spanning tables,  but lots now works.

---
 src/backend/rewrite/rewriteRemove.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/backend/rewrite/rewriteRemove.c')

diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 17aa34be07..fd1472a93c 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,11 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.19 1998/11/27 19:52:17 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.20 1998/12/14 00:02:17 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include <string.h>
+
 #include "postgres.h"
 
 #include "fmgr.h"				/* for F_NAMEEQ */
@@ -39,14 +41,14 @@ RewriteGetRuleEventRel(char *rulename)
 							   PointerGetDatum(rulename),
 							   0, 0, 0);
 	if (!HeapTupleIsValid(htup))
-		elog(ERROR, "RewriteGetRuleEventRel: rule \"%s\" not found",
-			 rulename);
+		elog(ERROR, "Rule or view '%s' not found",
+			 ((!strncmp(rulename, "_RET", 4))? (rulename+4): rulename));
 	eventrel = ((Form_pg_rewrite) GETSTRUCT(htup))->ev_class;
 	htup = SearchSysCacheTuple(RELOID,
 							   PointerGetDatum(eventrel),
 							   0, 0, 0);
 	if (!HeapTupleIsValid(htup))
-		elog(ERROR, "RewriteGetRuleEventRel: class %d not found",
+		elog(ERROR, "Class '%d' not found",
 			 eventrel);
 	return ((Form_pg_class) GETSTRUCT(htup))->relname.data;
 }
@@ -94,7 +96,7 @@ RemoveRewriteRule(char *ruleName)
 	if (!HeapTupleIsValid(tuple))
 	{
 		heap_close(RewriteRelation);
-		elog(ERROR, "No rule with name = '%s' was found.\n", ruleName);
+		elog(ERROR, "Rule '%s' not found\n", ruleName);
 	}
 
 	/*
@@ -110,7 +112,7 @@ RemoveRewriteRule(char *ruleName)
 	{
 		/* XXX strange!!! */
 		pfree(tuple);
-		elog(ERROR, "RemoveRewriteRule: null event target relation!");
+		elog(ERROR, "RemoveRewriteRule: internal error; null event target relation!");
 	}
 	eventRelationOid = DatumGetObjectId(eventRelationOidDatum);
 
-- 
cgit v1.2.1