String fixes/improvements found by Alvaro Herrera

petere · petere · commit 14528ffe6b6b · 2003-10-02T06:36:37.000Z
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.84 2003/09/29 00:05:25 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.85 2003/10/02 06:36:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4090,7 +4090,7 @@ AlterTableCreateToastTable(Oid relOid, bool silent)
 
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("tables \"%s\" already has a TOAST table",
+				 errmsg("table \"%s\" already has a TOAST table",
 						RelationGetRelationName(rel))));
 	}
 
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.127 2003/09/29 00:05:25 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.128 2003/10/02 06:36:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -648,7 +648,7 @@ CreateUser(CreateUserStmt *stmt)
 	if (sysid_exists)
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
-				 errmsg("sysid %d is already assigned", sysid)));
+				 errmsg("user ID %d is already assigned", sysid)));
 
 	/* If no sysid given, use max existing id + 1 */
 	if (!havesysid)
@@ -1354,7 +1354,7 @@ CreateGroup(CreateGroupStmt *stmt)
 	if (sysid_exists)
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
-				 errmsg("sysid %d is already assigned", sysid)));
+				 errmsg("group ID %d is already assigned", sysid)));
 
 	/* If no sysid given, use max existing id + 1 */
 	if (!havesysid)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.84 2003/09/29 00:05:25 petere Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.85 2003/10/02 06:36:37 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -4090,7 +4090,7 @@ AlterTableCreateToastTable(Oid relOid, bool silent)`
`4090`	`4090`
`4091`	`4091`	`ereport(ERROR,`
`4092`	`4092`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
`4093`		`- errmsg("tables \"%s\" already has a TOAST table",`
	`4093`	`+ errmsg("table \"%s\" already has a TOAST table",`
`4094`	`4094`	`RelationGetRelationName(rel))));`
`4095`	`4095`	`}`
`4096`	`4096`