Bring pg_nextoid()'s error messages into line with message style guide.

tglsfdc · tglsfdc · commit bd5e8b627bae · 2019-05-05T17:06:53.000-04:00
Noticed while reviewing nearby code.  Given all the disclaimers about
this not being meant as user-facing code, I wonder whether we should
make these non-translatable?  But in any case there's little excuse
for them not to be good English.
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
@@ -479,44 +479,44 @@ pg_nextoid(PG_FUNCTION_ARGS)
 	if (!superuser())
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("must be superuser to call pg_nextoid")));
+				 errmsg("must be superuser to call pg_nextoid()")));
 
 	rel = table_open(reloid, RowExclusiveLock);
 	idx = index_open(idxoid, RowExclusiveLock);
 
 	if (!IsSystemRelation(rel))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("pg_nextoid() can only be used on system relation")));
+				 errmsg("pg_nextoid() can only be used on system catalogs")));
 
 	if (idx->rd_index->indrelid != RelationGetRelid(rel))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("index %s does not belong to table %s",
+				 errmsg("index \"%s\" does not belong to table \"%s\"",
 						RelationGetRelationName(idx),
 						RelationGetRelationName(rel))));
 
 	atttuple = SearchSysCacheAttName(reloid, NameStr(*attname));
 	if (!HeapTupleIsValid(atttuple))
 		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("attribute %s does not exists",
-						NameStr(*attname))));
+				(errcode(ERRCODE_UNDEFINED_COLUMN),
+				 errmsg("column \"%s\" of relation \"%s\" does not exist",
+						NameStr(*attname), RelationGetRelationName(rel))));
 
 	attform = ((Form_pg_attribute) GETSTRUCT(atttuple));
 	attno = attform->attnum;
 
 	if (attform->atttypid != OIDOID)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("attribute %s is not of type oid",
+				 errmsg("column \"%s\" is not of type oid",
 						NameStr(*attname))));
 
 	if (IndexRelationGetNumberOfKeyAttributes(idx) != 1 ||
 		idx->rd_index->indkey.values[0] != attno)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("index %s is not the index for attribute %s",
+				 errmsg("index \"%s\" is not the index for column \"%s\"",
 						RelationGetRelationName(idx),
 						NameStr(*attname))));
 
