From 7564654adf07ec26b83c7effc7f54f7183e04519 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 10 Mar 2011 17:30:18 -0500 Subject: Revert addition of third argument to format_type(). Including collation in the behavior of that function promotes a world view we do not want. Moreover, it was producing the wrong behavior for pg_dump anyway: what we want is to dump a COLLATE clause on attributes whose attcollation is different from the underlying type, and likewise for domains, and the function cannot do that for us. Doing it the hard way in pg_dump is a bit more tedious but produces more correct output. In passing, fix initdb so that the initial entry in pg_collation is properly pinned. It was droppable before :-( --- doc/src/sgml/func.sgml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'doc/src') diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 5a021db33b7..4635cf2bb5e 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -13269,7 +13269,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype); - format_type(type_oid [, typemod [, collation_oid ]]) + format_type(type_oid, typemod) text get SQL name of a data type @@ -13410,9 +13410,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype); format_type returns the SQL name of a data type that is identified by its type OID and possibly a type modifier. Pass NULL - for the type modifier or omit the argument if no specific modifier is known. - If a collation is given as third argument, a COLLATE clause - followed by a formatted collation name is appended. + for the type modifier if no specific modifier is known. -- cgit v1.2.3