Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6f7fc0b

Browse files
committed
Cause initdb to create a third standard database "postgres", which
unlike template0 and template1 does not have any special status interms of backend functionality. However, all external utilities suchas createuser and createdb now connect to "postgres" instead oftemplate1, and the documentation is changed to encourage people to use"postgres" instead of template1 as a play area. This should fix somelongstanding gotchas involving unexpected propagation of databaseobjects by createdb (when you used template1 without understandingthe implications), as well as ameliorating the problem that CREATEDATABASE is unhappy if anyone else is connected to template1.Patch by Dave Page, minor editing by Tom Lane. All per recentpghackers discussions.
1 parentec3a1af commit6f7fc0b

38 files changed

+167
-107
lines changed

‎contrib/dblink/doc/connection

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Outputs
2828

2929
Example usage
3030

31-
select dblink_connect('dbname=template1');
31+
select dblink_connect('dbname=postgres');
3232
dblink_connect
3333
----------------
3434
OK
3535
(1 row)
3636

37-
select dblink_connect('myconn','dbname=template1');
37+
select dblink_connect('myconn','dbname=postgres');
3838
dblink_connect
3939
----------------
4040
OK

‎contrib/dblink/doc/cursor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Note
4444

4545
Example usage
4646

47-
test=# select dblink_connect('dbname=template1');
47+
test=# select dblink_connect('dbname=postgres');
4848
dblink_connect
4949
----------------
5050
OK
@@ -94,7 +94,7 @@ Outputs
9494

9595
Example usage
9696

97-
test=# select dblink_connect('dbname=template1');
97+
test=# select dblink_connect('dbname=postgres');
9898
dblink_connect
9999
----------------
100100
OK
@@ -175,7 +175,7 @@ Note
175175

176176
Example usage
177177

178-
test=# select dblink_connect('dbname=template1');
178+
test=# select dblink_connect('dbname=postgres');
179179
dblink_connect
180180
----------------
181181
OK

‎contrib/dblink/doc/misc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Outputs
1717

1818
Example usage
1919

20-
test=# select dblink_current_query() from (select dblink('dbname=template1','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
20+
test=# select dblink_current_query() from (select dblink('dbname=postgres','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
2121
dblink_current_query
2222
-----------------------------------------------------------------------------------------------------------------------------------------------------
23-
select dblink_current_query() from (select dblink('dbname=template1','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
23+
select dblink_current_query() from (select dblink('dbname=postgres','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
2424
(1 row)
2525

2626
==================================================================

‎contrib/dblink/doc/query

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Outputs
3737

3838
Example usage
3939

40-
select * from dblink('dbname=template1','select proname, prosrc from pg_proc')
40+
select * from dblink('dbname=postgres','select proname, prosrc from pg_proc')
4141
as t1(proname name, prosrc text) where proname like 'bytea%';
4242
proname | prosrc
4343
------------+------------
@@ -55,7 +55,7 @@ select * from dblink('dbname=template1','select proname, prosrc from pg_proc')
5555
byteaout | byteaout
5656
(12 rows)
5757

58-
select dblink_connect('dbname=template1');
58+
select dblink_connect('dbname=postgres');
5959
dblink_connect
6060
----------------
6161
OK
@@ -111,7 +111,7 @@ A more convenient way to use dblink may be to create a view:
111111

112112
create view myremote_pg_proc as
113113
select *
114-
from dblink('dbname=template1','select proname, prosrc from pg_proc')
114+
from dblink('dbname=postgres','select proname, prosrc from pg_proc')
115115
as t1(proname name, prosrc text);
116116

117117
Then you can simply write:

‎contrib/oid2name/oid2name.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ main(int argc, char **argv)
518518

519519
if (my_opts->dbname==NULL)
520520
{
521-
my_opts->dbname="template1";
521+
my_opts->dbname="postgres";
522522
my_opts->nodb= true;
523523
}
524524
pgconn=sql_conn(my_opts);

‎contrib/reindexdb/reindexdb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- #
3-
# Package : reindexdb Version : $Revision: 1.5 $
3+
# Package : reindexdb Version : $Revision: 1.6 $
44
# Date : 05/08/2002 Author : Shaun Thomas
55
# Req : psql, sh, perl, sed Type : Utility
66
#
@@ -174,7 +174,7 @@ if [ "$alldb" ]; then
174174
# connect to. That's the list we'll be using. It's also why it's
175175
# a good idea for this to be run as a super-user.
176176
sql='SELECT datname FROM pg_database WHERE datallowconn'
177-
dbname=`$PSQL$PSQLOPT -q -t -A -dtemplate1 -c"$sql"`
177+
dbname=`$PSQL$PSQLOPT -q -t -A -dpostgres -c"$sql"`
178178

179179
# Ok, if it's not all databases, make sure at least one database is
180180
# specified before continuing.

‎contrib/seg/README.seg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Any number(rules 5,6) -- creates a zero-length segment (a point,
159159
boundaries. For example, it adds an extra digit to the lower
160160
boundary if the resulting interval includes a power of ten:
161161

162-
template1=> select '10(+-)1'::seg as seg;
162+
postgres=> select '10(+-)1'::seg as seg;
163163
seg
164164
---------
165165
9.0 .. 11 -- should be: 9 .. 11

‎doc/src/sgml/backup.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.66 2005/06/20 13:52:17 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.67 2005/06/21 04:02:29 tgl Exp $
33
-->
44
<chapter id="backup">
55
<title>Backup and Restore</title>
@@ -177,11 +177,11 @@ pg_dumpall &gt; <replaceable>outfile</>
177177
</synopsis>
178178
The resulting dump can be restored with <application>psql</>:
179179
<synopsis>
180-
psql -f <replaceable class="parameter">infile</replaceable>template1
180+
psql -f <replaceable class="parameter">infile</replaceable>postgres
181181
</synopsis>
182182
(Actually, you can specify any existing database name to start from,
183-
but if you are reloading in an empty cluster then <literal>template1</>
184-
is the only available choice.) It is always necessary to have
183+
but if you are reloading in an empty cluster then <literal>postgres</>
184+
should generally be used.) It is always necessary to have
185185
database superuser access when restoring a <application>pg_dumpall</>
186186
dump, as that is required to restore the user and group information.
187187
</para>
@@ -1223,7 +1223,7 @@ restore_command = 'copy /mnt/server/archivedir/%f "%p"' # Windows
12231223
in parallel, on different ports. Then you can use something like
12241224

12251225
<programlisting>
1226-
pg_dumpall -p 5432 | psql -dtemplate1 -p 6543
1226+
pg_dumpall -p 5432 | psql -dpostgres -p 6543
12271227
</programlisting>
12281228

12291229
to transfer your data. Or use an intermediate file if you want.
@@ -1256,7 +1256,7 @@ cd ~/postgresql-&version;
12561256
gmake install
12571257
initdb -D /usr/local/pgsql/data
12581258
postmaster -D /usr/local/pgsql/data
1259-
psql -f backuptemplate1
1259+
psql -f backuppostgres
12601260
</programlisting>
12611261

12621262
See <xref linkend="runtime"> about ways to start and stop the

‎doc/src/sgml/charset.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.72 2005/04/16 16:50:01 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.73 2005/06/21 04:02:29 tgl Exp $ -->
22

33
<chapter id="charset">
44
<title>Localization</>
@@ -647,6 +647,7 @@ $ <userinput>psql -l</userinput>
647647
euc_kr | t-ishii | EUC_KR
648648
euc_tw | t-ishii | EUC_TW
649649
mule_internal | t-ishii | MULE_INTERNAL
650+
postgres | t-ishii | EUC_JP
650651
regression | t-ishii | SQL_ASCII
651652
template1 | t-ishii | EUC_JP
652653
test | t-ishii | EUC_JP

‎doc/src/sgml/client-auth.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.80 2005/06/04 20:42:41 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.81 2005/06/21 04:02:29 tgl Exp $
33
-->
44

55
<chapter id="client-authentication">
@@ -452,17 +452,17 @@ host all all 127.0.0.1/32 trust
452452
host all all 127.0.0.1 255.255.255.255 trust
453453

454454
# Allow any user from any host with IP address 192.168.93.x to connect
455-
# to database "template1" as the same user name that ident reports for
455+
# to database "postgres" as the same user name that ident reports for
456456
# the connection (typically the Unix user name).
457457
#
458458
# TYPE DATABASE USER CIDR-ADDRESS METHOD
459-
hosttemplate1 all 192.168.93.0/24 ident sameuser
459+
hostpostgres all 192.168.93.0/24 ident sameuser
460460

461461
# Allow a user from host 192.168.12.10 to connect to database
462-
# "template1" if the user's password is correctly supplied.
462+
# "postgres" if the user's password is correctly supplied.
463463
#
464464
# TYPE DATABASE USER CIDR-ADDRESS METHOD
465-
hosttemplate1 all 192.168.12.10/32 md5
465+
hostpostgres all 192.168.12.10/32 md5
466466

467467
# In the absence of preceding "host" lines, these two lines will
468468
# reject all connection from 192.168.54.1 (since that entry will be

‎doc/src/sgml/installation.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.235 2005/06/12 15:51:50 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.236 2005/06/21 04:02:29 tgl Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -468,7 +468,7 @@ su - postgres
468468
</programlisting>
469469
Finally, restore your data with
470470
<screen>
471-
<userinput>/usr/local/pgsql/bin/psql -dtemplate1 -f <replaceable>outputfile</></userinput>
471+
<userinput>/usr/local/pgsql/bin/psql -dpostgres -f <replaceable>outputfile</></userinput>
472472
</screen>
473473
using the <emphasis>new</> <application>psql</>.
474474
</para>

‎doc/src/sgml/libpq.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.185 2005/06/12 00:00:20 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.186 2005/06/21 04:02:29 tgl Exp $
33
-->
44

55
<chapter id="libpq">
@@ -4230,14 +4230,14 @@ main(int argc, char **argv)
42304230

42314231
/*
42324232
* If the user supplies a parameter on the command line, use it as
4233-
* the conninfo string; otherwise default to setting dbname=template1
4233+
* the conninfo string; otherwise default to setting dbname=postgres
42344234
* and using environment variables or defaults for all other connection
42354235
* parameters.
42364236
*/
42374237
if (argc &gt; 1)
42384238
conninfo = argv[1];
42394239
else
4240-
conninfo = "dbname =template1";
4240+
conninfo = "dbname =postgres";
42414241

42424242
/* Make a connection to the database */
42434243
conn = PQconnectdb(conninfo);
@@ -4376,14 +4376,14 @@ main(int argc, char **argv)
43764376

43774377
/*
43784378
* If the user supplies a parameter on the command line, use it as
4379-
* the conninfo string; otherwise default to setting dbname=template1
4379+
* the conninfo string; otherwise default to setting dbname=postgres
43804380
* and using environment variables or defaults for all other connection
43814381
* parameters.
43824382
*/
43834383
if (argc &gt; 1)
43844384
conninfo = argv[1];
43854385
else
4386-
conninfo = "dbname =template1";
4386+
conninfo = "dbname =postgres";
43874387

43884388
/* Make a connection to the database */
43894389
conn = PQconnectdb(conninfo);
@@ -4518,14 +4518,14 @@ main(int argc, char **argv)
45184518

45194519
/*
45204520
* If the user supplies a parameter on the command line, use it as
4521-
* the conninfo string; otherwise default to setting dbname=template1
4521+
* the conninfo string; otherwise default to setting dbname=postgres
45224522
* and using environment variables or defaults for all other connection
45234523
* parameters.
45244524
*/
45254525
if (argc &gt; 1)
45264526
conninfo = argv[1];
45274527
else
4528-
conninfo = "dbname =template1";
4528+
conninfo = "dbname =postgres";
45294529

45304530
/* Make a connection to the database */
45314531
conn = PQconnectdb(conninfo);

‎doc/src/sgml/manage-ag.sgml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.41 2005/06/1302:40:04 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.42 2005/06/21 04:02:30 tgl Exp $
33
-->
44

55
<chapter id="managing-databases">
@@ -113,17 +113,20 @@ CREATE DATABASE <replaceable>name</>;
113113
<command>initdb</> command when the data storage area is
114114
initialized. (See <xref linkend="creating-cluster">.) This
115115
database is called
116-
<literal>template1</>.<indexterm><primary>template1</></> So to
117-
create the first <quote>real</> database you can connect to
118-
<literal>template1</>.
116+
<literal>postgres</>.<indexterm><primary>postgres</></> So to
117+
create the first <quote>ordinary</> database you can connect to
118+
<literal>postgres</>.
119119
</para>
120120

121121
<para>
122-
The name <literal>template1</literal> is no accident: when a new
123-
database is created, the template database is essentially cloned.
122+
A second database,
123+
<literal>template1</literal>,<indexterm><primary>template1</></>
124+
is also created by
125+
<command>initdb</>. Whenever a new database is created within the
126+
cluster, <literal>template1</literal> is essentially cloned.
124127
This means that any changes you make in <literal>template1</> are
125-
propagated to all subsequently created databases.This implies that
126-
you should notusethe template database for real work, but when
128+
propagated to all subsequently created databases.Therefore it is
129+
unwise touse<literal>template1</> for real work, but when
127130
used judiciously this feature can be convenient. More details
128131
appear in <xref linkend="manage-ag-templatedbs">.
129132
</para>
@@ -137,7 +140,7 @@ CREATE DATABASE <replaceable>name</>;
137140
createdb <replaceable class="parameter">dbname</replaceable>
138141
</synopsis>
139142

140-
<command>createdb</> does no magic. It connects to the <literal>template1</>
143+
<command>createdb</> does no magic. It connects to the <literal>postgres</>
141144
database and issues the <command>CREATE DATABASE</> command,
142145
exactly as described above.
143146
The <xref linkend="app-createdb"> reference page contains the invocation
@@ -268,13 +271,19 @@ createdb -T template0 <replaceable>dbname</>
268271
<para>
269272
<literal>template1</> and <literal>template0</> do not have any special
270273
status beyond the fact that the name <literal>template1</> is the default
271-
source database name for <command>CREATE DATABASE</> and the default
272-
database-to-connect-to for various programs such as <command>createdb</>.
274+
source database name for <command>CREATE DATABASE</>.
273275
For example, one could drop <literal>template1</> and recreate it from
274276
<literal>template0</> without any ill effects. This course of action
275277
might be advisable if one has carelessly added a bunch of junk in
276278
<literal>template1</>.
277279
</para>
280+
281+
<para>
282+
The <literal>postgres</> database is also created when a database
283+
cluster is initialized. This database is meant as a default database for
284+
users and applications to connect to. It is simply a copy of
285+
<literal>template1</> and may be dropped and recreated if required.
286+
</para>
278287
</note>
279288
</sect1>
280289

‎doc/src/sgml/ref/createlang.sgml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.34 2005/05/29 03:32:18 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.35 2005/06/21 04:02:31 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -223,6 +223,9 @@ PostgreSQL documentation
223223
<screen>
224224
<prompt>$ </prompt><userinput>createlang pltcl template1</userinput>
225225
</screen>
226+
Note that installing the language into <literal>template1</literal>
227+
will cause it to be automatically installed into subsequently-created
228+
databases as well.
226229
</para>
227230
</refsect1>
228231

‎doc/src/sgml/ref/drop_database.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.19 2003/11/29 19:51:38 pgsql Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.20 2005/06/21 04:02:31 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -32,7 +32,7 @@ DROP DATABASE <replaceable class="PARAMETER">name</replaceable>
3232
catalog entries for the database and deletes the directory
3333
containing the data. It can only be executed by the database owner.
3434
Also, it cannot be executed while you or anyone else are connected
35-
to the target database. (Connect to <literal>template1</literal> or any
35+
to the target database. (Connect to <literal>postgres</literal> or any
3636
other database to issue this command.)
3737
</para>
3838

‎doc/src/sgml/ref/initdb.sgml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.34 2005/02/2202:54:19 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.35 2005/06/21 04:02:31 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -47,9 +47,12 @@ PostgreSQL documentation
4747
which the database data will live, generating the shared catalog
4848
tables (tables that belong to the whole cluster rather than to any
4949
particular database), and creating the <literal>template1</literal>
50-
database. When you later create a new database, everything in the
51-
<literal>template1</literal> database is copied. It contains catalog
52-
tables containing things like built-in data types.
50+
and <literal>postgres</literal> databases. When you later create a
51+
new database, everything in the <literal>template1</literal> database is
52+
copied. (Therefore, anything installed in <literal>template1</literal>
53+
is automatically copied into each database created later.)
54+
The <literal>postgres</literal> database is a default database meant
55+
for use by users, utilities and third party applications.
5356
</para>
5457

5558
<para>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp