pgsql: Some cleanup for change of collate and ctype fields to type text

Some cleanup for change of collate and ctype fields to type text

Some cleanup for commit 54637508f87bd5f07fb9406bac6b08240283be3b:
Reformat pg_database.dat to reflect the new field order. Also update
the corresponding example in bki.sgml. Reorder the way the fields are
filled in dbcommands.c to correspond to the new order.

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/87669de72c2249e6aec84b8c27fdc3ffb7284e13

Modified Files
--------------
doc/src/sgml/bki.sgml | 17 +++++++++--------
src/backend/commands/dbcommands.c | 4 ++--
src/include/catalog/pg_database.dat | 8 ++++----
3 files changed, 15 insertions(+), 14 deletions(-)