Goodbye ABORT. Hello ERROR for all errors.

4 files changed, 18 insertions, 18 deletions

diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 9b913dca94b..c95be222a93 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.12 1998/01/07 15:32:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.13 1998/01/07 21:04:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,7 +98,7 @@ InsertRule(char *rulname,
 	eventrel = heap_openr(evobj);
 	if (eventrel == NULL)
 	{
-		elog(ABORT, "rules cannot be defined on relations not in schema");
+		elog(ERROR, "rules cannot be defined on relations not in schema");
 	}
 	eventrel_oid = RelationGetRelationId(eventrel);
 
@@ -118,7 +118,7 @@ InsertRule(char *rulname,
 		evqual = "<>";
 
 	if (IsDefinedRewriteRule(rulname))
-		elog(ABORT, "Attempt to insert rule '%s' failed: already exists",
+		elog(ERROR, "Attempt to insert rule '%s' failed: already exists",
 			 rulname);
 	strcpyq(actionbuf, actiontree);
 	strcpyq(qualbuf, evqual);
@@ -130,7 +130,7 @@ InsertRule(char *rulname,
 	if (strlen(template) + strlen(rulname) + strlen(actionbuf) +
 		strlen(qualbuf) + 20 /* fudge fac */ > RULE_PLAN_SIZE)
 	{
-		elog(ABORT, "DefineQueryRewrite: rule plan string too big.");
+		elog(ERROR, "DefineQueryRewrite: rule plan string too big.");
 	}
 	sprintf(rulebuf, template,
 			rulname, evtype, eventrel_oid, evslot_index, actionbuf,
@@ -156,12 +156,12 @@ ValidateRule(int event_type,
 	if (((event_type == CMD_INSERT) || (event_type == CMD_DELETE)) &&
 		eslot_string)
 	{
-		elog(ABORT,
+		elog(ERROR,
 		"rules not allowed for insert or delete events to an attribute");
 	}
 
 	if (event_qual && !*action && is_instead)
-		elog(ABORT,
+		elog(ERROR,
 		"event_quals on 'instead nothing' rules not currently supported");
 
 #if 0
@@ -211,7 +211,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 	event_relation = heap_openr(event_obj->relname);
 	if (event_relation == NULL)
 	{
-		elog(ABORT, "virtual relations not supported yet");
+		elog(ERROR, "virtual relations not supported yet");
 	}
 	ev_relid = RelationGetRelationId(event_relation);
 
@@ -265,7 +265,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 
 		/* what is the max size of type text? XXX -- glass */
 		if (length(action) > 15)
-			elog(ABORT, "max # of actions exceeded");
+			elog(ERROR, "max # of actions exceeded");
 		prs2_addToRelation(ev_relid, ruleId, event_type, event_attno,
 						   is_instead, event_qual, action);
 	}
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 0f9d3f3762e..34cf891b747 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.8 1998/01/05 03:32:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.9 1998/01/07 21:04:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -647,7 +647,7 @@ deepRewriteQuery(Query *parsetree)
 
 	if (++numQueryRewriteInvoked > REWRITE_INVOKE_MAX)
 	{
-		elog(ABORT, "query rewritten %d times, may contain cycles",
+		elog(ERROR, "query rewritten %d times, may contain cycles",
 			 numQueryRewriteInvoked - 1);
 	}
 
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 0da9dab3314..10ca1e82e0b 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.8 1998/01/05 03:32:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.9 1998/01/07 21:04:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,13 +39,13 @@ RewriteGetRuleEventRel(char *rulename)
 	htp = SearchSysCacheTuple(REWRITENAME, PointerGetDatum(rulename),
 							  0, 0, 0);
 	if (!HeapTupleIsValid(htp))
-		elog(ABORT, "RewriteGetRuleEventRel: rule \"%s\" not found",
+		elog(ERROR, "RewriteGetRuleEventRel: rule \"%s\" not found",
 			 rulename);
 	eventrel = ((Form_pg_rewrite) GETSTRUCT(htp))->ev_class;
 	htp = SearchSysCacheTuple(RELOID, PointerGetDatum(eventrel),
 							  0, 0, 0);
 	if (!HeapTupleIsValid(htp))
-		elog(ABORT, "RewriteGetRuleEventRel: class %d not found",
+		elog(ERROR, "RewriteGetRuleEventRel: class %d not found",
 			 eventrel);
 	return ((Form_pg_class) GETSTRUCT(htp))->relname.data;
 }
@@ -99,7 +99,7 @@ RemoveRewriteRule(char *ruleName)
 	if (!HeapTupleIsValid(tuple))
 	{
 		heap_close(RewriteRelation);
-		elog(ABORT, "No rule with name = '%s' was found.\n", ruleName);
+		elog(ERROR, "No rule with name = '%s' was found.\n", ruleName);
 	}
 
 	/*
@@ -116,7 +116,7 @@ RemoveRewriteRule(char *ruleName)
 	if (isNull)
 	{
 		/* XXX strange!!! */
-		elog(ABORT, "RemoveRewriteRule: null event target relation!");
+		elog(ERROR, "RemoveRewriteRule: null event target relation!");
 	}
 	eventRelationOid = DatumGetObjectId(eventRelationOidDatum);
 
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index 450b4619275..d5c6c13c4bb 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.13 1998/01/05 03:32:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.14 1998/01/07 21:04:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,7 +56,7 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees)
 									ObjectIdGetDatum(ruleoid),
 									0, 0, 0);
 	if (ruletuple == NULL)
-		elog(ABORT, "rule %u isn't in rewrite system relation", ruleoid);
+		elog(ERROR, "rule %u isn't in rewrite system relation", ruleoid);
 
 	ruleaction = (char *)heap_getattr(ruletuple,
 									  InvalidBuffer,
@@ -72,7 +72,7 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees)
 
 	if (action_is_null || instead_is_null)
 	{
-		elog(ABORT, "internal error: rewrite rule not properly set up");
+		elog(ERROR, "internal error: rewrite rule not properly set up");
 	}
 
 	ruleaction = textout((struct varlena *) ruleaction);