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.
This commit is contained in:
parent
cb2bab14ff
commit
87669de72c
|
@ -175,19 +175,20 @@
|
||||||
will demonstrate the key features:
|
will demonstrate the key features:
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<programlisting>
|
<!-- The "slight modification" is the apostrophe in the description. -->
|
||||||
|
<programlisting><![CDATA[
|
||||||
[
|
[
|
||||||
|
|
||||||
# A comment could appear here.
|
# A comment could appear here.
|
||||||
{ oid => '1', oid_symbol => 'TemplateDbOid',
|
{ oid => '1', oid_symbol => 'TemplateDbOid',
|
||||||
descr => 'database\'s default template',
|
descr => 'database\'s default template',
|
||||||
datname => 'template1', encoding => 'ENCODING', datcollate => 'LC_COLLATE',
|
datname => 'template1', encoding => 'ENCODING', datistemplate => 't',
|
||||||
datctype => 'LC_CTYPE', datistemplate => 't', datallowconn => 't',
|
datallowconn => 't', datconnlimit => '-1', datfrozenxid => '0',
|
||||||
datconnlimit => '-1', datfrozenxid => '0',
|
datminmxid => '1', dattablespace => 'pg_default', datcollate => 'LC_COLLATE',
|
||||||
datminmxid => '1', dattablespace => 'pg_default', datacl => '_null_' },
|
datctype => 'LC_CTYPE', datacl => '_null_' },
|
||||||
|
|
||||||
]
|
]
|
||||||
</programlisting>
|
]]></programlisting>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
Points to note:
|
Points to note:
|
||||||
|
|
|
@ -570,14 +570,14 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
|
||||||
DirectFunctionCall1(namein, CStringGetDatum(dbname));
|
DirectFunctionCall1(namein, CStringGetDatum(dbname));
|
||||||
new_record[Anum_pg_database_datdba - 1] = ObjectIdGetDatum(datdba);
|
new_record[Anum_pg_database_datdba - 1] = ObjectIdGetDatum(datdba);
|
||||||
new_record[Anum_pg_database_encoding - 1] = Int32GetDatum(encoding);
|
new_record[Anum_pg_database_encoding - 1] = Int32GetDatum(encoding);
|
||||||
new_record[Anum_pg_database_datcollate - 1] = CStringGetTextDatum(dbcollate);
|
|
||||||
new_record[Anum_pg_database_datctype - 1] = CStringGetTextDatum(dbctype);
|
|
||||||
new_record[Anum_pg_database_datistemplate - 1] = BoolGetDatum(dbistemplate);
|
new_record[Anum_pg_database_datistemplate - 1] = BoolGetDatum(dbistemplate);
|
||||||
new_record[Anum_pg_database_datallowconn - 1] = BoolGetDatum(dballowconnections);
|
new_record[Anum_pg_database_datallowconn - 1] = BoolGetDatum(dballowconnections);
|
||||||
new_record[Anum_pg_database_datconnlimit - 1] = Int32GetDatum(dbconnlimit);
|
new_record[Anum_pg_database_datconnlimit - 1] = Int32GetDatum(dbconnlimit);
|
||||||
new_record[Anum_pg_database_datfrozenxid - 1] = TransactionIdGetDatum(src_frozenxid);
|
new_record[Anum_pg_database_datfrozenxid - 1] = TransactionIdGetDatum(src_frozenxid);
|
||||||
new_record[Anum_pg_database_datminmxid - 1] = TransactionIdGetDatum(src_minmxid);
|
new_record[Anum_pg_database_datminmxid - 1] = TransactionIdGetDatum(src_minmxid);
|
||||||
new_record[Anum_pg_database_dattablespace - 1] = ObjectIdGetDatum(dst_deftablespace);
|
new_record[Anum_pg_database_dattablespace - 1] = ObjectIdGetDatum(dst_deftablespace);
|
||||||
|
new_record[Anum_pg_database_datcollate - 1] = CStringGetTextDatum(dbcollate);
|
||||||
|
new_record[Anum_pg_database_datctype - 1] = CStringGetTextDatum(dbctype);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We deliberately set datacl to default (NULL), rather than copying it
|
* We deliberately set datacl to default (NULL), rather than copying it
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
|
|
||||||
{ oid => '1', oid_symbol => 'TemplateDbOid',
|
{ oid => '1', oid_symbol => 'TemplateDbOid',
|
||||||
descr => 'default template for new databases',
|
descr => 'default template for new databases',
|
||||||
datname => 'template1', encoding => 'ENCODING', datcollate => 'LC_COLLATE',
|
datname => 'template1', encoding => 'ENCODING', datistemplate => 't',
|
||||||
datctype => 'LC_CTYPE', datistemplate => 't', datallowconn => 't',
|
datallowconn => 't', datconnlimit => '-1', datfrozenxid => '0',
|
||||||
datconnlimit => '-1', datfrozenxid => '0',
|
datminmxid => '1', dattablespace => 'pg_default', datcollate => 'LC_COLLATE',
|
||||||
datminmxid => '1', dattablespace => 'pg_default', datacl => '_null_' },
|
datctype => 'LC_CTYPE', datacl => '_null_' },
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue