summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/backend/commands/comment.c10
-rw-r--r--src/backend/commands/functioncmds.c20
-rw-r--r--src/backend/commands/tablecmds.c8
-rw-r--r--src/backend/commands/typecmds.c6
-rw-r--r--src/test/regress/expected/alter_table.out6
5 files changed, 25 insertions, 25 deletions
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index b1c0f0a8c5..67bed6c7ed 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -882,7 +882,7 @@ CommentType(List *typename, char *comment)
if (!pg_type_ownercheck(oid, GetUserId()))
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TYPE,
- TypeNameToString(tname));
+ format_type_be(oid));
/* Call CreateComments() to create/drop the comments */
CreateComments(oid, TypeRelationId, 0, comment);
@@ -1464,8 +1464,8 @@ CommentCast(List *qualname, List *arguments, char *comment)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("cast from type %s to type %s does not exist",
- TypeNameToString(sourcetype),
- TypeNameToString(targettype))));
+ format_type_be(sourcetypeid),
+ format_type_be(targettypeid))));
/* Get the OID of the cast */
castOid = HeapTupleGetOid(tuple);
@@ -1476,8 +1476,8 @@ CommentCast(List *qualname, List *arguments, char *comment)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("must be owner of type %s or type %s",
- TypeNameToString(sourcetype),
- TypeNameToString(targettype))));
+ format_type_be(sourcetypeid),
+ format_type_be(targettypeid))));
ReleaseSysCache(tuple);
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 6f5b501dc5..fe6d547cd2 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -1412,8 +1412,8 @@ CreateCast(CreateCastStmt *stmt)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("must be owner of type %s or type %s",
- TypeNameToString(stmt->sourcetype),
- TypeNameToString(stmt->targettype))));
+ format_type_be(sourcetypeid),
+ format_type_be(targettypeid))));
if (stmt->func != NULL)
{
@@ -1554,8 +1554,8 @@ CreateCast(CreateCastStmt *stmt)
ereport(ERROR,
(errcode(ERRCODE_DUPLICATE_OBJECT),
errmsg("cast from type %s to type %s already exists",
- TypeNameToString(stmt->sourcetype),
- TypeNameToString(stmt->targettype))));
+ format_type_be(sourcetypeid),
+ format_type_be(targettypeid))));
/* ready to go */
values[Anum_pg_cast_castsource - 1] = ObjectIdGetDatum(sourcetypeid);
@@ -1629,13 +1629,13 @@ DropCast(DropCastStmt *stmt)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("cast from type %s to type %s does not exist",
- TypeNameToString(stmt->sourcetype),
- TypeNameToString(stmt->targettype))));
+ format_type_be(sourcetypeid),
+ format_type_be(targettypeid))));
else
ereport(NOTICE,
(errmsg("cast from type %s to type %s does not exist, skipping",
- TypeNameToString(stmt->sourcetype),
- TypeNameToString(stmt->targettype))));
+ format_type_be(sourcetypeid),
+ format_type_be(targettypeid))));
return;
}
@@ -1646,8 +1646,8 @@ DropCast(DropCastStmt *stmt)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("must be owner of type %s or type %s",
- TypeNameToString(stmt->sourcetype),
- TypeNameToString(stmt->targettype))));
+ format_type_be(sourcetypeid),
+ format_type_be(targettypeid))));
/*
* Do the deletion
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index b039227c3c..ee1b5849f5 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -5520,8 +5520,8 @@ ATPrepAlterColumnType(List **wqueue,
if (transform == NULL)
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
- errmsg("column \"%s\" cannot be cast to type \"%s\"",
- colName, TypeNameToString(typename))));
+ errmsg("column \"%s\" cannot be cast to type %s",
+ colName, format_type_be(targettype))));
/*
* Add a work queue item to make ATRewriteTable update the column
@@ -5619,8 +5619,8 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
if (defaultexpr == NULL)
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
- errmsg("default for column \"%s\" cannot be cast to type \"%s\"",
- colName, TypeNameToString(typename))));
+ errmsg("default for column \"%s\" cannot be cast to type %s",
+ colName, format_type_be(targettype))));
}
else
defaultexpr = NULL;
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index a1c009d4a9..bee300c797 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -581,7 +581,7 @@ RemoveTypes(DropStmt *drop)
if (!pg_type_ownercheck(typeoid, GetUserId()) &&
!pg_namespace_ownercheck(typ->typnamespace, GetUserId()))
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TYPE,
- TypeNameToString(typename));
+ format_type_be(typeoid));
if (drop->removeType == OBJECT_DOMAIN)
{
@@ -2082,7 +2082,7 @@ checkDomainOwner(HeapTuple tup, TypeName *typename)
/* Permission check: must own type */
if (!pg_type_ownercheck(HeapTupleGetOid(tup), GetUserId()))
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TYPE,
- TypeNameToString(typename));
+ format_type_be(HeapTupleGetOid(tup)));
}
/*
@@ -2487,7 +2487,7 @@ AlterTypeOwner(List *names, Oid newOwnerId)
/* Otherwise, must be owner of the existing object */
if (!pg_type_ownercheck(HeapTupleGetOid(tup), GetUserId()))
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TYPE,
- TypeNameToString(typename));
+ format_type_be(HeapTupleGetOid(tup)));
/* Must be able to become new owner */
check_is_member_of_role(GetUserId(), newOwnerId);
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 15179540a2..388e25e9db 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1301,7 +1301,7 @@ select f3,max(f1) from foo group by f3;
-- Simple tests for alter table column type
alter table foo alter f1 TYPE integer; -- fails
-ERROR: column "f1" cannot be cast to type "pg_catalog.int4"
+ERROR: column "f1" cannot be cast to type integer
alter table foo alter f1 TYPE varchar(10);
create table anothertab (atcol1 serial8, atcol2 boolean,
constraint anothertab_chk check (atcol1 <= 3));
@@ -1316,7 +1316,7 @@ select * from anothertab;
(2 rows)
alter table anothertab alter column atcol1 type boolean; -- fails
-ERROR: column "atcol1" cannot be cast to type "pg_catalog.bool"
+ERROR: column "atcol1" cannot be cast to type boolean
alter table anothertab alter column atcol1 type integer;
select * from anothertab;
atcol1 | atcol2
@@ -1350,7 +1350,7 @@ select * from anothertab;
alter table anothertab alter column atcol1 type boolean
using case when atcol1 % 2 = 0 then true else false end; -- fails
-ERROR: default for column "atcol1" cannot be cast to type "pg_catalog.bool"
+ERROR: default for column "atcol1" cannot be cast to type boolean
alter table anothertab alter column atcol1 drop default;
alter table anothertab alter column atcol1 type boolean
using case when atcol1 % 2 = 0 then true else false end; -- fails
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-12 10:17:35 +0000