database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Clean up error messages.

Browse Source
This commit is contained in:
Thomas G. Lockhart
1999-02-23 07:54:03 +00:00
parent 681c587d22
commit 70600bd6f1
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/parser/parse_relation.c
View File

@@ -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
}

10
src/backend/parser/parse_type.c
View File

@@ -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