Clean up error messages.

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index f1cb1e99f09e8b35fa3a03ff04fa6e11215eab41..465fcf2f6a01362813ac1e7f6eeb0b60e3f4a1c6 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.74 1999/02/13 23:14:55 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.75 1999/02/23 07:54:03 thomas Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -197,8 +197,8 @@ heap_create(char *relname,
 
        if (relname && IsSystemRelationName(relname) && IsNormalProcessingMode())
        {
-               elog(ERROR,
-                "Illegal class name: %s -- pg_ is reserved for system catalogs",
+               elog(ERROR, "Illegal class name '%s'"
+                        "\n\tThe 'pg_' name prefix is reserved for system catalogs",
                         relname);
        }
 
@@ -427,15 +427,15 @@ CheckAttributeNames(TupleDesc tupdesc)
                        if (nameeq(&(HeapAtt[j]->attname),
                                           &(tupdesc->attrs[i]->attname)))
                        {
-                               elog(ERROR,
-                                        "create: system attribute named \"%s\"",
+                               elog(ERROR, "Attribute '%s' has a name conflict"
+                                        "\n\tName matches an existing system attribute",
                                         HeapAtt[j]->attname.data);
                        }
                }
                if (tupdesc->attrs[i]->atttypid == UNKNOWNOID)
                {
-                       elog(NOTICE,
-                                "create: attribute named \"%s\" has an unknown type",
+                       elog(NOTICE, "Attribute '%s' has an unknown type"
+                                "\n\tRelation created; continue",
                                 tupdesc->attrs[i]->attname.data);
                }
        }
@@ -451,8 +451,7 @@ CheckAttributeNames(TupleDesc tupdesc)
                        if (nameeq(&(tupdesc->attrs[j]->attname),
                                           &(tupdesc->attrs[i]->attname)))
                        {
-                               elog(ERROR,
-                                        "create: repeated attribute \"%s\"",
+                               elog(ERROR, "Attribute '%s' is repeated",
                                         tupdesc->attrs[j]->attname.data);
                        }
                }
@@ -774,15 +773,16 @@ heap_create_with_catalog(char *relname,
         */
        Assert(IsNormalProcessingMode() || IsBootstrapProcessingMode());
        if (natts == 0 || natts > MaxHeapAttributeNumber)
-               elog(ERROR, "amcreate: from 1 to %d attributes must be specified",
-                        MaxHeapAttributeNumber);
+               elog(ERROR, "Number of attributes is out of range"
+                        "\n\tFrom 1 to %d attributes may be specified",
+                        MaxHeapAttributeNumber);
 
        CheckAttributeNames(tupdesc);
 
        /* temp tables can mask non-temp tables */
        if ((!istemp && RelnameFindRelid(relname)) ||
           (istemp && get_temp_rel_by_name(relname) != NULL))
-               elog(ERROR, "%s relation already exists", relname);
+               elog(ERROR, "Relation '%s' already exists", relname);
 
        /* invalidate cache so non-temp table is masked by temp */
        if (istemp)
@@ -951,7 +951,7 @@ RelationRemoveInheritance(Relation relation)
                heap_endscan(scan);
                heap_close(catalogRelation);
 
-               elog(ERROR, "relation <%d> inherits \"%s\"",
+               elog(ERROR, "Relation '%d' inherits '%s'",
                         ((Form_pg_inherits) GETSTRUCT(tuple))->inhrel,
                         RelationGetRelationName(relation));
        }
@@ -1054,7 +1054,7 @@ DeleteRelationTuple(Relation rel)
        if (!HeapTupleIsValid(tup))
        {
                heap_close(pg_class_desc);
-               elog(ERROR, "DeleteRelationTuple: %s relation nonexistent",
+               elog(ERROR, "Relation '%s' does not exist",
                         &rel->rd_rel->relname);
        }
 
@@ -1250,7 +1250,7 @@ heap_destroy_with_catalog(char *relname)
         */
        rel = heap_openr(relname);
        if (rel == NULL)
-               elog(ERROR, "Relation %s Does Not Exist!", relname);
+               elog(ERROR, "Relation '%s' does not exist", relname);
 
        LockRelation(rel, AccessExclusiveLock);
        rid = rel->rd_id;
@@ -1261,7 +1261,7 @@ heap_destroy_with_catalog(char *relname)
         */
        /* allow temp of pg_class? Guess so. */
        if (!istemp && IsSystemRelationName(RelationGetRelationName(rel)->data))
-               elog(ERROR, "amdestroy: cannot destroy %s relation",
+               elog(ERROR, "System relation '%s' cannot be destroyed",
                         &rel->rd_rel->relname);
 
        /* ----------------
@@ -1505,7 +1505,7 @@ start:;
 
        if (length(query->rtable) > 1 ||
                flatten_tlist(query->targetList) != NIL)
-               elog(ERROR, "DEFAULT: cannot use attribute(s)");
+               elog(ERROR, "Cannot use attribute(s) in DEFAULT clause");
        te = (TargetEntry *) lfirst(query->targetList);
        resdom = te->resdom;
        expr = te->expr;
@@ -1585,7 +1585,7 @@ StoreRelCheck(Relation rel, ConstrCheck *check)
        query = (Query *) (queryTree_list->qtrees[0]);
 
        if (length(query->rtable) > 1)
-               elog(ERROR, "CHECK: only relation %.*s can be referenced",
+               elog(ERROR, "Only relation '%.*s' can be referenced",
                         NAMEDATALEN, rel->rd_rel->relname.data);
 
        plan = (Plan *) lfirst(planTree_list);

diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 3388edb33796021da22e464b55dc10f9723d7be9..50abbc0a7cd3c565bda3721cc38c04ea617c0e29 100644 (file)
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.18 1999/02/21 03:49:03 scrappy Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.19 1999/02/23 07:53:01 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -157,7 +157,7 @@ colnameRangeTableEntry(ParseState *pstate, char *colname)
                                {
                                        if (!pstate->p_is_insert ||
                                                rte != pstate->p_target_rangetblentry)
-                                               elog(ERROR, "Column %s is ambiguous", colname);
+                                               elog(ERROR, "Column '%s' is ambiguous", colname);
                                }
                                else
                                        rte_result = rte;
@@ -198,7 +198,7 @@ addRangeTableEntry(ParseState *pstate,
 
                                return (RangeTblEntry *) nth(rt_index - 1, pstate->p_rtable);
                        }
-                       elog(ERROR, "Table name %s specified more than once", refname);
+                       elog(ERROR, "Table name '%s' specified more than once", refname);
                }
        }
 
@@ -317,7 +317,7 @@ attnameAttNum(Relation rd, char *a)
                        return special_attr[i].code;
 
        /* on failure */
-       elog(ERROR, "Relation %s does not have attribute %s",
+       elog(ERROR, "Relation '%s' does not have attribute '%s'",
                 RelationGetRelationName(rd), a);
        return 0;                                       /* lint */
 }
@@ -396,7 +396,7 @@ handleTargetColname(ParseState *pstate, char **resname,
                        pstate->p_insert_columns = lnext(pstate->p_insert_columns);
                }
                else
-                       elog(ERROR, "insert: more expressions than target columns");
+                       elog(ERROR, "INSERT has more expressions than target columns");
        }
        if (pstate->p_is_insert || pstate->p_is_update)
                checkTargetTypes(pstate, *resname, refname, colname);
@@ -424,13 +424,13 @@ checkTargetTypes(ParseState *pstate, char *target_colname,
        {
                rte = colnameRangeTableEntry(pstate, colname);
                if (rte == (RangeTblEntry *) NULL)
-                       elog(ERROR, "attribute %s not found", colname);
+                       elog(ERROR, "Attribute %s not found", colname);
                refname = rte->refname;
        }
 
 /*
        if (pstate->p_is_insert && rte == pstate->p_target_rangetblentry)
-               elog(ERROR, "%s not available in this context", colname);
+               elog(ERROR, "'%s' not available in this context", colname);
 */
        resdomno_id = get_attnum(rte->relid, colname);
        attrtype_id = get_atttype(rte->relid, resdomno_id);
@@ -460,18 +460,18 @@ checkTargetTypes(ParseState *pstate, char *target_colname,
        }
 #else
        if (attrtype_id != attrtype_target)
-               elog(ERROR, "Type of %s does not match target column %s",
+               elog(ERROR, "Type of '%s' does not match target column '%s'",
                         colname, target_colname);
 
        if (attrtype_id == BPCHAROID &&
                get_atttypmod(rte->relid, resdomno_id) !=
                get_atttypmod(pstate->p_target_relation->rd_id, resdomno_target))
-               elog(ERROR, "Length of %s is not equal to the length of target column %s",
+               elog(ERROR, "Length of '%s' is not equal to the length of target column '%s'",
                         colname, target_colname);
        if (attrtype_id == VARCHAROID &&
                get_atttypmod(rte->relid, resdomno_id) >
                get_atttypmod(pstate->p_target_relation->rd_id, resdomno_target))
-               elog(ERROR, "Length of %s is longer than length of target column %s",
+               elog(ERROR, "Length of '%s' is longer than length of target column '%s'",
                         colname, target_colname);
 #endif
 }

diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index c9034557662309dc491ded5b72ea046fd8241293..f2dddee9765b1a3b327f400906178443b4663c88 100644 (file)
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.18 1998/11/27 19:52:14 vadim Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.19 1999/02/23 07:53:01 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ typeidTypeName(Oid id)
                                                                        ObjectIdGetDatum(id),
                                                                        0, 0, 0)))
        {
-               elog(ERROR, "type id lookup of %u failed", id);
+               elog(ERROR, "Unable to locate type oid %u in catalog", id);
                return NULL;
        }
        typetuple = (Form_pg_type) GETSTRUCT(tup);
@@ -68,7 +68,7 @@ typeidType(Oid id)
                                                                        ObjectIdGetDatum(id),
                                                                        0, 0, 0)))
        {
-               elog(ERROR, "type id lookup of %u failed", id);
+               elog(ERROR, "Unable to locate type oid %u in catalog", id);
                return NULL;
        }
        return (Type) tup;
@@ -86,7 +86,7 @@ typenameType(char *s)
        if (!(tup = SearchSysCacheTuple(TYPNAME,
                                                                        PointerGetDatum(s),
                                                                        0, 0, 0)))
-               elog(ERROR, "type name lookup of %s failed", s);
+               elog(ERROR, "Unable to locate type name '%s' in catalog", s);
        return (Type) tup;
 }
 
@@ -217,7 +217,7 @@ typeidTypElem(Oid type_id)
        return type->typelem;
 }
 
-/* Given the attribute type of an array return the arrtribute type of
+/* Given the attribute type of an array return the attribute type of
    an element of the array */
 
 Oid