Extend CREATE DATABASE to allow selection of a template database to be

cloned, rather than always cloning template1.  Modify initdb to generate
two identical databases rather than one, template0 and template1.
Connections to template0 are disallowed, so that it will always remain
in its virgin as-initdb'd state.  pg_dumpall now dumps databases with
restore commands that say CREATE DATABASE foo WITH TEMPLATE = template0.
This allows proper behavior when there is user-added data in template1.
initdb forced!

doc/src/sgml/ref/create_database.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.15 2000/10/05 19:48:17 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.16 2000/11/14 18:37:40 tgl Exp $
 Postgres documentation
 -->
 
@@ -23,7 +23,10 @@ Postgres documentation
    <date>1999-12-11</date>
   </refsynopsisdivinfo>
   <synopsis>
-CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATION = '<replaceable class="parameter">dbpath</replaceable>' ]
+CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
+    [ WITH [ LOCATION = '<replaceable class="parameter">dbpath</replaceable>' ]
+           [ TEMPLATE = <replaceable class="parameter">template</replaceable> ]
+           [ ENCODING = <replaceable class="parameter">encoding</replaceable> ] ]
   </synopsis>
 
   <refsect2 id="R2-SQL-CREATEDATABASE-1">
@@ -48,8 +51,30 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO
       <term><replaceable class="parameter">dbpath</replaceable></term>
       <listitem>
        <para>
-	An alternate location where to store the new database in the filesystem.
-        See below for caveats.
+	An alternate filesystem location in which to store the new database,
+	specified as a string literal;
+	or <literal>DEFAULT</literal> to use the default location.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><replaceable class="parameter">template</replaceable></term>
+      <listitem>
+       <para>
+        Name of template from which to create the new database,
+	or <literal>DEFAULT</literal> to use the default template
+	(<literal>template1</literal>).
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><replaceable class="parameter">encoding</replaceable></term>
+      <listitem>
+       <para>
+        Multibyte encoding method to use in the new database.  Specify
+	a string literal name (e.g., <literal>'SQL_ASCII'</literal>),
+	or an integer encoding number, or <literal>DEFAULT</literal>
+	to use the default encoding.
        </para>
       </listitem>
      </varlistentry>
@@ -98,11 +123,10 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO
      </varlistentry>
 
      <varlistentry>
-      <term><computeroutput>ERROR:  Single quotes are not allowed in database names.</computeroutput></term>
-      <term><computeroutput>ERROR:  Single quotes are not allowed in database paths.</computeroutput></term>
+      <term><computeroutput>ERROR:  database path may not contain single quotes</computeroutput></term>
       <listitem>
        <para>
-	The database <replaceable class="parameter">name</replaceable> and
+	The database location
         <replaceable class="parameter">dbpath</replaceable> cannot contain
         single quotes. This is required so that the shell commands that
         create the database directory can execute safely.
@@ -111,18 +135,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO
      </varlistentry>
 
      <varlistentry>
-      <term><computeroutput>ERROR:  The path 'xxx' is invalid.</computeroutput></term>
-      <listitem>
-       <para>
-        The expansion of the specified <replaceable class="parameter">dbpath</replaceable>
-        (see below) failed. Check the path you entered or make sure that the
-        environment variable you are referencing does exist.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><computeroutput>ERROR:  createdb: May not be called in a transaction block.</computeroutput></term>
+      <term><computeroutput>ERROR:  CREATE DATABASE: may not be called in a transaction block</computeroutput></term>
       <listitem>
        <para>
         If you have an explicit transaction block in progress you cannot call
@@ -133,6 +146,9 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO
 
      <varlistentry>
       <term><computeroutput>ERROR:  Unable to create database directory '<replaceable>path</replaceable>'.</computeroutput></term>
+     </varlistentry>
+
+     <varlistentry>
       <term><computeroutput>ERROR:  Could not initialize database directory.</computeroutput></term>
       <listitem>
        <para>
@@ -169,10 +185,10 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO
    command.
   </para>
   <para>
-   If the path contains a slash, the leading part is interpreted
-   as an environment variable, which must be known to the
+   If the path name does not contain a slash, it is interpreted
+   as an environment variable name, which must be known to the
    server process. This way the database administrator can
-   exercise control over at which locations databases can be created.
+   exercise control over locations in which databases can be created.
    (A customary choice is, e.g., '<envar>PGDATA2</envar>'.)
    If the server is compiled with <literal>ALLOW_ABSOLUTE_DBPATHS</literal>
    (not so by default), absolute path names, as identified by
@@ -181,6 +197,29 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO
    are allowed as well.
   </para>
 
+  <para>
+   By default, the new database will be created by cloning the standard
+   system database <literal>template1</>.  A different template can be
+   specified by writing <literal>TEMPLATE =</>
+   <replaceable class="parameter">name</replaceable>.  In particular,
+   by writing <literal>TEMPLATE = template0</>, you can create a virgin
+   database containing only the standard objects predefined by your
+   version of Postgres.  This is useful if you wish to avoid copying
+   any installation-local objects that may have been added to template1.
+  </para>
+
+  <para>
+   The optional encoding parameter allows selection of the database encoding,
+   if your server was compiled with multibyte encoding support.  When not
+   specified, it defaults to the encoding used by the selected template
+   database.
+  </para>
+
+  <para>
+   Optional parameters can be written in any order, not only the order
+   illustrated above.
+  </para>
+
   <refsect2 id="R2-SQL-CREATEDATABASE-3">
    <refsect2info>
     <date>1999-12-11</date>
@@ -221,6 +260,33 @@ comment from Olly; response from Thomas...
    Not sure if the dump/reload would guarantee that
    the alternate data area gets refreshed though...
 -->
+
+  <para>
+   Although it is possible to copy a database other than template1 by
+   specifying its name as the template, this is not (yet) intended as
+   a general-purpose COPY DATABASE facility.  In particular, it is
+   essential that the source database be idle (no data-altering transactions
+   in progress)
+   for the duration of the copying operation.  CREATE DATABASE will check
+   that no backend processes (other than itself) are connected to
+   the source database at the start of the operation, but this does not
+   guarantee that changes cannot be made while the copy proceeds.  Therefore,
+   we recommend that databases used as templates be treated as read-only.
+  </para>
+
+  <para>
+   Two useful flags exist in <literal>pg_database</literal> for each
+   database: <literal>datistemplate</literal> and
+   <literal>datallowconn</literal>.  <literal>datistemplate</literal>
+   may be set to indicate that a database is intended as a template for
+   CREATE DATABASE.  If this flag is set, the database may be cloned by
+   any user with CREATEDB privileges; if it is not set, only superusers
+   and the owner of the database may clone it.
+   If <literal>datallowconn</literal> is false, then no new connections
+   to that database will be allowed (but existing sessions are not killed
+   simply by setting the flag false).  The <literal>template0</literal>
+   database is normally marked this way to prevent modification of it.
+  </para>
   </refsect2>
  </refsect1>
 

src/backend/nodes/copyfuncs.c

@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.131 2000/11/12 00:36:57 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.132 2000/11/14 18:37:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2231,6 +2231,8 @@ _copyCreatedbStmt(CreatedbStmt *from)
 		newnode->dbname = pstrdup(from->dbname);
 	if (from->dbpath)
 		newnode->dbpath = pstrdup(from->dbpath);
+	if (from->dbtemplate)
+		newnode->dbtemplate = pstrdup(from->dbtemplate);
 	newnode->encoding = from->encoding;
 
 	return newnode;

src/backend/nodes/equalfuncs.c

@@ -20,7 +20,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.81 2000/11/12 00:36:57 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.82 2000/11/14 18:37:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1087,6 +1087,8 @@ _equalCreatedbStmt(CreatedbStmt *a, CreatedbStmt *b)
 		return false;
 	if (!equalstr(a->dbpath, b->dbpath))
 		return false;
+	if (!equalstr(a->dbtemplate, b->dbtemplate))
+		return false;
 	if (a->encoding != b->encoding)
 		return false;
 

src/backend/parser/gram.y

@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.208 2000/11/08 22:09:58 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.209 2000/11/14 18:37:49 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -56,8 +56,8 @@
 #include "miscadmin.h"
 #include "mb/pg_wchar.h"
 #else
-#define GetTemplateEncoding()	0		/* SQL_ASCII */
-#define GetTemplateEncodingName()	"SQL_ASCII"
+#define GetStandardEncoding()	0		/* SQL_ASCII */
+#define GetStandardEncodingName()	"SQL_ASCII"
 #endif
 
 extern List *parsetree;			/* final parse result is delivered here */
@@ -146,8 +146,7 @@ static void doNegateFloat(Value *v);
 %type <node>    alter_column_action
 %type <ival>    drop_behavior
 
-%type <str>		createdb_opt_location
-%type <ival>    createdb_opt_encoding
+%type <list>	createdb_opt_list, createdb_opt_item
 
 %type <ival>	opt_lock, lock_type
 %type <boolean>	opt_lmode, opt_force
@@ -347,7 +346,7 @@ static void doNegateFloat(Value *v);
 		OFFSET, OIDS, OPERATOR, OWNER, PASSWORD, PROCEDURAL,
 		REINDEX, RENAME, RESET, RETURNS, ROW, RULE,
 		SEQUENCE, SERIAL, SETOF, SHARE, SHOW, START, STATEMENT, STDIN, STDOUT, SYSID,
-		TEMP, TOAST, TRUNCATE, TRUSTED, 
+		TEMP, TEMPLATE, TOAST, TRUNCATE, TRUSTED, 
 		UNLISTEN, UNTIL, VACUUM, VALID, VERBOSE, VERSION
 
 /* The grammar thinks these are keywords, but they are not in the keywords.c
@@ -687,7 +686,8 @@ CreateSchemaStmt:  CREATE SCHEMA UserId
 					CreatedbStmt *n = makeNode(CreatedbStmt);
 					n->dbname = $3;
 					n->dbpath = NULL;
-					n->encoding = GetTemplateEncoding();
+					n->dbtemplate = NULL;
+					n->encoding = -1;
 					$$ = (Node *)n;
 				}
 		;
@@ -2924,16 +2924,34 @@ LoadStmt:  LOAD file_name
  *
  *****************************************************************************/
 
-CreatedbStmt:  CREATE DATABASE database_name WITH createdb_opt_location createdb_opt_encoding
+CreatedbStmt:  CREATE DATABASE database_name WITH createdb_opt_list
 				{
 					CreatedbStmt *n = makeNode(CreatedbStmt);
-
-					if ($5 == NULL && $6 == -1)
-						elog(ERROR, "CREATE DATABASE WITH requires at least one option");
+					List   *l;
 
 					n->dbname = $3;
-					n->dbpath = $5;
-					n->encoding = ($6 == -1) ? GetTemplateEncoding() : $6;
+					/* set default options */
+					n->dbpath = NULL;
+					n->dbtemplate = NULL;
+					n->encoding = -1;
+					/* process additional options */
+					foreach(l, $5)
+					{
+						List   *optitem = (List *) lfirst(l);
+
+						switch (lfirsti(optitem))
+						{
+							case 1:
+								n->dbpath = (char *) lsecond(optitem);
+								break;
+							case 2:
+								n->dbtemplate = (char *) lsecond(optitem);
+								break;
+							case 3:
+								n->encoding = lfirsti(lnext(optitem));
+								break;
+						}
+					}
 					$$ = (Node *)n;
 				}
 		| CREATE DATABASE database_name
@@ -2941,27 +2959,51 @@ CreatedbStmt:  CREATE DATABASE database_name WITH createdb_opt_location createdb
 					CreatedbStmt *n = makeNode(CreatedbStmt);
 					n->dbname = $3;
 					n->dbpath = NULL;
-					n->encoding = GetTemplateEncoding();
+					n->dbtemplate = NULL;
+					n->encoding = -1;
 					$$ = (Node *)n;
 				}
 		;
 
-createdb_opt_location:  LOCATION '=' Sconst		{ $$ = $3; }
-		| LOCATION '=' DEFAULT					{ $$ = NULL; }
-		| /*EMPTY*/								{ $$ = NULL; }
+createdb_opt_list:  createdb_opt_item
+				{ $$ = makeList1($1); }
+		| createdb_opt_list createdb_opt_item
+				{ $$ = lappend($1, $2); }
 		;
 
-createdb_opt_encoding:  ENCODING '=' Sconst
+/*
+ * createdb_opt_item returns 2-element lists, with the first element
+ * being an integer code to indicate which item was specified.
+ */
+createdb_opt_item:  LOCATION '=' Sconst
 				{
+					$$ = lconsi(1, makeList1($3));
+				}
+		| LOCATION '=' DEFAULT
+				{
+					$$ = lconsi(1, makeList1((char *) NULL));
+				}
+		| TEMPLATE '=' name
+				{
+					$$ = lconsi(2, makeList1($3));
+				}
+		| TEMPLATE '=' DEFAULT
+				{
+					$$ = lconsi(2, makeList1((char *) NULL));
+				}
+		| ENCODING '=' Sconst
+				{
+					int		encoding;
 #ifdef MULTIBYTE
-					$$ = pg_char_to_encoding($3);
-					if ($$ == -1)
+					encoding = pg_char_to_encoding($3);
+					if (encoding == -1)
 						elog(ERROR, "%s is not a valid encoding name", $3);
 #else
-					if (strcasecmp($3, GetTemplateEncodingName()) != 0)
+					if (strcasecmp($3, GetStandardEncodingName()) != 0)
 						elog(ERROR, "Multi-byte support is not enabled");
-					$$ = GetTemplateEncoding();
+					encoding = GetStandardEncoding();
 #endif
+					$$ = lconsi(3, makeListi1(encoding));
 				}
 		| ENCODING '=' Iconst
 				{
@@ -2969,18 +3011,14 @@ createdb_opt_encoding:  ENCODING '=' Sconst
 					if (!pg_get_encent_by_encoding($3))
 						elog(ERROR, "%d is not a valid encoding code", $3);
 #else
-					if ($3 != GetTemplateEncoding())
+					if ($3 != GetStandardEncoding())
 						elog(ERROR, "Multi-byte support is not enabled");
 #endif
-					$$ = $3;
+					$$ = lconsi(3, makeListi1($3));
 				}
 		| ENCODING '=' DEFAULT
 				{
-					$$ = GetTemplateEncoding();
-				}
-		| /*EMPTY*/
-				{
-					$$ = -1;
+					$$ = lconsi(3, makeListi1(-1));
 				}
 		;
 
@@ -5495,6 +5533,7 @@ TokenId:  ABSOLUTE						{ $$ = "absolute"; }
 		| STDOUT						{ $$ = "stdout"; }
 		| SYSID							{ $$ = "sysid"; }
 		| TEMP							{ $$ = "temp"; }
+		| TEMPLATE						{ $$ = "template"; }
 		| TEMPORARY						{ $$ = "temporary"; }
 		| TIMEZONE_HOUR					{ $$ = "timezone_hour"; }
 		| TIMEZONE_MINUTE				{ $$ = "timezone_minute"; }

src/backend/parser/keywords.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.84 2000/11/08 21:28:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.85 2000/11/14 18:37:49 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -247,6 +247,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"sysid", SYSID},
 	{"table", TABLE},
 	{"temp", TEMP},
+	{"template", TEMPLATE},
 	{"temporary", TEMPORARY},
 	{"then", THEN},
 	{"time", TIME},

src/backend/postmaster/postmaster.c

@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.186 2000/11/14 18:11:31 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.187 2000/11/14 18:37:42 tgl Exp $
  *
  * NOTES
  *
@@ -279,14 +279,8 @@ checkDataDir(const char *checkdir)
 		exit(2);
 	}
 
-#ifdef OLD_FILE_NAMING
-	snprintf(path, sizeof(path), "%s%cbase%ctemplate1%cpg_class",
-			 checkdir, SEP_CHAR, SEP_CHAR, SEP_CHAR);
-#else
-	snprintf(path, sizeof(path), "%s%cbase%c%u%c%u",
-			 checkdir, SEP_CHAR, SEP_CHAR, 
-			 TemplateDbOid, SEP_CHAR, RelOid_pg_class);
-#endif
+	snprintf(path, sizeof(path), "%s%cglobal%cpg_control",
+			 checkdir, SEP_CHAR, SEP_CHAR);
 
 	fp = AllocateFile(path, PG_BINARY_R);
 	if (fp == NULL)

src/backend/tcop/utility.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.101 2000/11/08 16:31:06 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.102 2000/11/14 18:37:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -604,7 +604,8 @@ ProcessUtility(Node *parsetree,
 
 				set_ps_display(commandTag = "CREATE DATABASE");
 
-				createdb(stmt->dbname, stmt->dbpath, stmt->encoding);
+				createdb(stmt->dbname, stmt->dbpath,
+						 stmt->dbtemplate, stmt->encoding);
 			}
 			break;
 

src/backend/utils/init/postinit.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.70 2000/11/12 20:51:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.71 2000/11/14 18:37:44 tgl Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -79,6 +79,7 @@ ReverifyMyDatabase(const char *name)
 	HeapScanDesc pgdbscan;
 	ScanKeyData key;
 	HeapTuple	tup;
+	Form_pg_database dbform;
 
 	/*
 	 * Because we grab AccessShareLock here, we can be sure that destroydb
@@ -106,25 +107,24 @@ ReverifyMyDatabase(const char *name)
 		 */
 		DropBuffers(MyDatabaseId);
 		/* Now I can commit hara-kiri with a clear conscience... */
-		elog(FATAL, "Database '%s', OID %u, has disappeared from pg_database",
+		elog(FATAL, "Database \"%s\", OID %u, has disappeared from pg_database",
 			 name, MyDatabaseId);
 	}
 
+	/*
+	 * Also check that the database is currently allowing connections.
+	 */
+	dbform = (Form_pg_database) GETSTRUCT(tup);
+	if (! dbform->datallowconn)
+		elog(FATAL, "Database \"%s\" is not currently accepting connections",
+			 name);
+
 	/*
 	 * OK, we're golden.  Only other to-do item is to save the MULTIBYTE
-	 * encoding info out of the pg_database tuple.	Note we also set the
-	 * "template encoding", which is the default encoding for any CREATE
-	 * DATABASE commands executed in this backend; essentially, you get
-	 * the same encoding of the database you connected to as the default.
-	 * (This replaces code that unreliably grabbed template1's encoding
-	 * out of pg_database.	We could do an extra scan to find template1's
-	 * tuple, but for 99.99% of all backend startups it'd be wasted cycles
-	 * --- and the 'createdb' script connects to template1 anyway, so
-	 * there's no difference.)
+	 * encoding info out of the pg_database tuple.
 	 */
 #ifdef MULTIBYTE
-	SetDatabaseEncoding(((Form_pg_database) GETSTRUCT(tup))->encoding);
-	SetTemplateEncoding(((Form_pg_database) GETSTRUCT(tup))->encoding);
+	SetDatabaseEncoding(dbform->encoding);
 #endif
 
 	heap_endscan(pgdbscan);

src/backend/utils/mb/mbutils.c

@@ -3,7 +3,7 @@
  * client encoding and server internal encoding.
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
- * $Id: mbutils.c,v 1.13 2000/10/30 10:40:28 ishii Exp $ */
+ * $Id: mbutils.c,v 1.14 2000/11/14 18:37:44 tgl Exp $ */
 
 
 #include "postgres.h"
@@ -271,6 +271,7 @@ pg_mbcliplen(const unsigned char *mbstr, int len, int limit)
  * fuctions for utils/init
  */
 static int	DatabaseEncoding = MULTIBYTE;
+
 void
 SetDatabaseEncoding(int encoding)
 {
@@ -289,17 +290,3 @@ getdatabaseencoding(PG_FUNCTION_ARGS)
 {
 	PG_RETURN_NAME(pg_encoding_to_char(DatabaseEncoding));
 }
-
-/* set and get template1 database encoding */
-static int	templateEncoding;
-void
-SetTemplateEncoding(int encoding)
-{
-	templateEncoding = encoding;
-}
-
-int
-GetTemplateEncoding()
-{
-	return (templateEncoding);
-}

src/backend/utils/misc/database.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.40 2000/10/16 14:52:19 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.41 2000/11/14 18:37:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -186,7 +186,7 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
 		max = PageGetMaxOffsetNumber(pg);
 
 		/* look at each tuple on the page */
-		for (i = 0; i <= max; i++)
+		for (i = 0; i < max; i++)
 		{
 			int			offset;
 
@@ -221,8 +221,11 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
 			 * database OID from a flat file, handled the same way we
 			 * handle the password relation?
 			 */
-			if (TransactionIdIsValid((TransactionId) tup.t_data->t_xmax))
-				continue;
+			if (tup.t_data->t_infomask & HEAP_XMIN_INVALID)
+				continue;		/* inserting xact known aborted */
+			if (TransactionIdIsValid((TransactionId) tup.t_data->t_xmax) &&
+				!(tup.t_data->t_infomask & HEAP_XMAX_INVALID))
+				continue;		/* deleting xact happened, not known aborted */
 
 			/*
 			 * Okay, see if this is the one we want.
@@ -241,6 +244,10 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
 		}
 	}
 
+	/* failed to find it... */
+	*db_id = InvalidOid;
+	*path = '\0';
+
 done:
 	close(dbfd);
 	pfree(pg);

src/bin/initdb/initdb.sh

@@ -7,15 +7,16 @@
 #
 # To create the database cluster, we create the directory that contains
 # all its data, create the files that hold the global tables, create
-# a few other control files for it, and create one database:  the
-# template database.
+# a few other control files for it, and create two databases: the
+# template0 and template1 databases.
 #
-# The template database is an ordinary PostgreSQL database.  Its data
-# never changes, though.  It exists to make it easy for PostgreSQL to 
-# create other databases -- it just copies.
+# The template databases are ordinary PostgreSQL databases.  template0
+# is never supposed to change after initdb, whereas template1 can be
+# changed to add site-local standard data.  Either one can be copied
+# to produce a new database.
 #
 # Optionally, we can skip creating the complete database cluster and
-# just create (or replace) the template database.
+# just create (or replace) the template databases.
 #
 # To create all those things, we run the postgres (backend) program and
 # feed it data from the bki files that were installed.
@@ -23,7 +24,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.113 2000/11/11 22:59:46 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.114 2000/11/14 18:37:45 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -203,7 +204,7 @@ do
                 ;;
         --template|-t)
                 template_only=yes
-                echo "Updating template1 database only."
+                echo "Updating template0 and template1 databases only."
                 ;;
 # The sysid of the database superuser. Can be freely changed.
         --sysid|-i)
@@ -277,7 +278,7 @@ if [ "$usage" ]; then
     echo "  -i, --sysid SYSID           Database sysid for the superuser"
     echo "Less commonly used options: "
     echo "  -L DIRECTORY                Where to find the input files"
-    echo "  -t, --template              Re-initialize template database only"
+    echo "  -t, --template              Re-initialize template databases only"
     echo "  -d, --debug                 Generate lots of debugging output"
     echo "  -n, --noclean               Do not clean up after errors"
     echo
@@ -451,7 +452,7 @@ fi
 BACKENDARGS="-boot -C -F -D$PGDATA $BACKEND_TALK_ARG"
 FIRSTRUN="-boot -x1 -C -F -D$PGDATA $BACKEND_TALK_ARG"
 
-echo "Creating template database in $PGDATA/base/1"
+echo "Creating template1 database in $PGDATA/base/1"
 [ "$debug" = yes ] && echo "Running: $PGPATH/postgres $FIRSTRUN template1"
 
 cat "$TEMPLATE1_BKI" \
@@ -465,6 +466,10 @@ echo $short_version > "$PGDATA"/base/1/PG_VERSION || exit_nicely
 ##########################################################################
 #
 # CREATE GLOBAL TABLES
+#
+# XXX --- I do not believe the "template_only" option can actually work.
+# With this coding, it'll fail to make entries for pg_shadow etc. in
+# template1 ... tgl 11/2000
 
 if [ "$template_only" != yes ]
 then
@@ -491,7 +496,7 @@ fi
 #
 # CREATE VIEWS and other things
 
-echo
+echo "Initializing pg_shadow."
 
 PGSQL_OPT="-o /dev/null -O -F -D$PGDATA"
 
@@ -532,6 +537,7 @@ fi
 
 
 echo "Enabling unlimited row width for system tables."
+
 echo "ALTER TABLE pg_attrdef CREATE TOAST TABLE" \
         | "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 echo "ALTER TABLE pg_description CREATE TOAST TABLE" \
@@ -546,7 +552,8 @@ echo "ALTER TABLE pg_statistic CREATE TOAST TABLE" \
         | "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 
 
-echo "Creating view pg_user."
+echo "Creating system views."
+
 echo "CREATE VIEW pg_user AS \
         SELECT \
             usename, \
@@ -560,7 +567,6 @@ echo "CREATE VIEW pg_user AS \
         FROM pg_shadow" \
         | "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 
-echo "Creating view pg_rules."
 echo "CREATE VIEW pg_rules AS \
         SELECT \
             C.relname AS tablename, \
@@ -571,7 +577,6 @@ echo "CREATE VIEW pg_rules AS \
             AND C.oid = R.ev_class;" \
 	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 
-echo "Creating view pg_views."
 echo "CREATE VIEW pg_views AS \
         SELECT \
             C.relname AS viewname, \
@@ -585,7 +590,6 @@ echo "CREATE VIEW pg_views AS \
             )" \
 	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 
-echo "Creating view pg_tables."
 echo "CREATE VIEW pg_tables AS \
         SELECT \
             C.relname AS tablename, \
@@ -601,7 +605,6 @@ echo "CREATE VIEW pg_tables AS \
             )" \
 	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 
-echo "Creating view pg_indexes."
 echo "CREATE VIEW pg_indexes AS \
         SELECT \
             C.relname AS tablename, \
@@ -622,14 +625,27 @@ cat $TEMPFILE \
 rm -f "$TEMPFILE" || exit_nicely
 
 echo "Setting lastsysoid."
-echo "Update pg_database Set datlastsysoid = (Select max(oid) From pg_description) \
-        Where datname = 'template1'" \
+echo "UPDATE pg_database SET \
+	datistemplate = 't', \
+	datlastsysoid = (SELECT max(oid) FROM pg_description) \
+        WHERE datname = 'template1'" \
 		| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 
 echo "Vacuuming database."
 echo "VACUUM ANALYZE" \
 	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 
+echo "Copying template1 to template0."
+echo "CREATE DATABASE template0" \
+	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
+echo "UPDATE pg_database SET \
+	datistemplate = 't', \
+	datallowconn = 'f' \
+        WHERE datname = 'template0'" \
+		| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
+echo "VACUUM pg_database" \
+	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
+
 
 ##########################################################################
 #

src/bin/pg_dump/pg_dump.c

@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.179 2000/11/13 23:37:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.180 2000/11/14 18:37:45 tgl Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -129,6 +129,8 @@
 #include "pg_dump.h"
 #include "pg_backup.h"
 
+#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
+
 static void dumpComment(Archive *outfile, const char *target, const char *oid);
 static void dumpSequence(Archive *fout, TableInfo tbinfo);
 static void dumpACL(Archive *fout, TableInfo tbinfo);
@@ -140,7 +142,7 @@ static char *checkForQuote(const char *s);
 static void clearTableInfo(TableInfo *, int);
 static void dumpOneFunc(Archive *fout, FuncInfo *finfo, int i,
 			TypeInfo *tinfo, int numTypes);
-static int	findLastBuiltinOid(const char*);
+static Oid	findLastBuiltinOid(const char*);
 static void setMaxOid(Archive *fout);
 
 static void AddAcl(char *aclbuf, const char *keyword);
@@ -156,7 +158,7 @@ extern int	optind,
 /* global decls */
 bool		g_verbose;			/* User wants verbose narration of our
 								 * activities. */
-int			g_last_builtin_oid; /* value of the last builtin oid */
+Oid			g_last_builtin_oid; /* value of the last builtin oid */
 Archive	   *g_fout;				/* the script file */
 PGconn	   *g_conn;				/* the database connection */
 
@@ -2784,7 +2786,7 @@ dumpTypes(Archive *fout, FuncInfo *finfo, int numFuncs,
 	{
 
 		/* skip all the builtin types */
-		if (atoi(tinfo[i].oid) < g_last_builtin_oid)
+		if (atooid(tinfo[i].oid) <= g_last_builtin_oid)
 			continue;
 
 		/* skip relation types */
@@ -2899,7 +2901,7 @@ dumpProcLangs(Archive *fout, FuncInfo *finfo, int numFuncs,
 
 	for (i = 0; i < ntups; i++)
 	{
-		lanoid = atoi(PQgetvalue(res, i, i_oid));
+		lanoid = atooid(PQgetvalue(res, i, i_oid));
 		if (lanoid <= g_last_builtin_oid)
 			continue;
 
@@ -3127,7 +3129,7 @@ dumpOprs(Archive *fout, OprInfo *oprinfo, int numOperators,
 		resetPQExpBuffer(sort2);
 
 		/* skip all the builtin oids */
-		if (atoi(oprinfo[i].oid) < g_last_builtin_oid)
+		if (atooid(oprinfo[i].oid) <= g_last_builtin_oid)
 			continue;
 
 		/*
@@ -3222,7 +3224,7 @@ dumpAggs(Archive *fout, AggInfo *agginfo, int numAggs,
 		resetPQExpBuffer(details);
 
 		/* skip all the builtin oids */
-		if (atoi(agginfo[i].oid) < g_last_builtin_oid)
+		if (atooid(agginfo[i].oid) <= g_last_builtin_oid)
 			continue;
 
 		appendPQExpBuffer(details,
@@ -3907,12 +3909,12 @@ setMaxOid(Archive *fout)
  * we do this by retrieving datlastsysoid from the pg_database entry for this database,
  */
 
-static int
+static Oid
 findLastBuiltinOid(const char* dbname)
 {
 	PGresult   *res;
 	int			ntups;
-	int			last_oid;
+	Oid			last_oid;
 	PQExpBuffer query = createPQExpBuffer();
 
 	resetPQExpBuffer(query);

src/bin/pg_dump/pg_dump.h

@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_dump.h,v 1.53 2000/10/10 13:55:28 pjw Exp $
+ * $Id: pg_dump.h,v 1.54 2000/11/14 18:37:46 tgl Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -177,7 +177,7 @@ typedef struct _oprInfo
 /* global decls */
 extern bool g_force_quotes;		/* double-quotes for identifiers flag */
 extern bool g_verbose;			/* verbose flag */
-extern int	g_last_builtin_oid; /* value of the last builtin oid */
+extern Oid	g_last_builtin_oid; /* value of the last builtin oid */
 extern Archive *g_fout;			/* the script file */
 
 /* placeholders for comment starting and ending delimiters */

src/bin/pg_dump/pg_dumpall.sh

@@ -6,7 +6,7 @@
 # and "pg_group" tables, which belong to the whole installation rather
 # than any one individual database.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.7 2000/11/08 18:23:44 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.8 2000/11/14 18:37:46 tgl Exp $
 
 CMDNAME=`basename $0`
 
@@ -151,7 +151,7 @@ echo "${BS}connect template1"
 #
 # Dump users (but not the user created by initdb)
 #
-echo "DELETE FROM pg_shadow WHERE usesysid NOT IN (SELECT datdba FROM pg_database WHERE datname = 'template1');"
+echo "DELETE FROM pg_shadow WHERE usesysid <> (SELECT datdba FROM pg_database WHERE datname = 'template0');"
 echo
 
 $PSQL -d template1 -At <<__END__
@@ -163,7 +163,7 @@ SELECT
   || CASE WHEN valuntil IS NOT NULL THEN ' VALID UNTIL '''::text
     || CAST(valuntil AS TIMESTAMP) || '''' ELSE '' END || ';'
 FROM pg_shadow
-WHERE usesysid <> (SELECT datdba FROM pg_database WHERE datname = 'template1');
+WHERE usesysid <> (SELECT datdba FROM pg_database WHERE datname = 'template0');
 __END__
 echo
 
@@ -187,46 +187,33 @@ done
 test "$accounts_only" = yes && exit 0
 
 
-# First we dump the template in case there are local extensions.
-
-echo
-echo "--"
-echo "-- Database template1"
-echo "--"
-echo "${BS}connect template1"
-$PGDUMP "template1"
-if [ "$?" -ne 0 ] ; then
-    echo "pg_dump failed on template1, exiting" 1>&2
-    exit 1
-fi
-
-
 # For each database, run pg_dump to dump the contents of that database.
+# We skip databases marked not datallowconn, since we'd be unable to
+# connect to them anyway (and besides, we don't want to dump template0).
 
 $PSQL -d template1 -At -F ' ' \
-  -c "SELECT d.datname, u.usename, pg_encoding_to_char(d.encoding), d.datpath FROM pg_database d, pg_shadow u WHERE d.datdba = u.usesysid AND datname <> 'template1';" | \
-while read DATABASE DBOWNER ENCODING DBPATH; do
+  -c "SELECT datname, usename, pg_encoding_to_char(d.encoding), datistemplate, datpath FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) WHERE datallowconn;" | \
+while read DATABASE DBOWNER ENCODING ISTEMPLATE DBPATH; do
     echo
     echo "--"
     echo "-- Database $DATABASE"
     echo "--"
     echo "${BS}connect template1 $DBOWNER"
 
-    if [ "$cleanschema" = yes ] ; then
+    if [ "$cleanschema" = yes -a "$DATABASE" != template1 ] ; then
         echo "DROP DATABASE \"$DATABASE\";"
     fi
 
-    createdbcmd="CREATE DATABASE \"$DATABASE\""
-    if [ x"$DBPATH" != x"" ] || [ x"$MULTIBYTE" != x"" ]; then
-        createdbcmd="$createdbcmd WITH"
-    fi
-    if [ x"$DBPATH" != x"" ] ; then
-        createdbcmd="$createdbcmd LOCATION = '$DBPATH'"
+    if [ "$DATABASE" != template1 ] ; then
+	createdbcmd="CREATE DATABASE \"$DATABASE\" WITH TEMPLATE = template0"
+	if [ x"$DBPATH" != x"" ] ; then
+	    createdbcmd="$createdbcmd LOCATION = '$DBPATH'"
+	fi
+	if [ x"$MULTIBYTE" != x"" ] ; then
+	    createdbcmd="$createdbcmd ENCODING = '$ENCODING'"
+	fi
+	echo "$createdbcmd;"
     fi
-    if [ x"$MULTIBYTE" != x"" ] ; then
-        createdbcmd="$createdbcmd ENCODING = '$ENCODING'"
-    fi
-    echo "$createdbcmd;"
 
     echo "${BS}connect $DATABASE $DBOWNER"
     $PGDUMP "$DATABASE"
@@ -234,6 +221,9 @@ while read DATABASE DBOWNER ENCODING DBPATH; do
         echo "pg_dump failed on $DATABASE, exiting" 1>&2
         exit 1
     fi
+    if [ x"$ISTEMPLATE" = xt ] ; then
+        echo "UPDATE pg_database SET datistemplate = 't' WHERE datname = '$DATABASE';"
+    fi
 done
 
 exit 0

src/include/catalog/catversion.h

@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.59 2000/11/12 00:37:00 tgl Exp $
+ * $Id: catversion.h,v 1.60 2000/11/14 18:37:46 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*                        	yyyymmddN */
-#define CATALOG_VERSION_NO	200011112
+#define CATALOG_VERSION_NO	200011131
 
 #endif

src/include/catalog/pg_attribute.h

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_attribute.h,v 1.66 2000/10/22 17:55:49 pjw Exp $
+ * $Id: pg_attribute.h,v 1.67 2000/11/14 18:37:46 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -281,8 +281,10 @@ DATA(insert OID = 0 ( 1247 tableoid			26 0  4  -7 0 -1 -1 t p f i f f));
 DATA(insert OID = 0 ( 1262 datname			19 0 NAMEDATALEN   1 0 -1 -1 f p f i f f));
 DATA(insert OID = 0 ( 1262 datdba			23 0  4   2 0 -1 -1 t p f i f f));
 DATA(insert OID = 0 ( 1262 encoding			23 0  4   3 0 -1 -1 t p f i f f));
-DATA(insert OID = 0 ( 1262 datlastsysoid    26 0  4   4 0 -1 -1 t p f i f f));
-DATA(insert OID = 0 ( 1262 datpath			25 0 -1   5 0 -1 -1 f x f i f f));
+DATA(insert OID = 0 ( 1262 datistemplate    16 0  1   4 0 -1 -1 t p f c f f));
+DATA(insert OID = 0 ( 1262 datallowconn     16 0  1   5 0 -1 -1 t p f c f f));
+DATA(insert OID = 0 ( 1262 datlastsysoid    26 0  4   6 0 -1 -1 t p f i f f));
+DATA(insert OID = 0 ( 1262 datpath			25 0 -1   7 0 -1 -1 f x f i f f));
 DATA(insert OID = 0 ( 1262 ctid				27 0  6  -1 0 -1 -1 f p f i f f));
 DATA(insert OID = 0 ( 1262 oid				26 0  4  -2 0 -1 -1 t p f i f f));
 DATA(insert OID = 0 ( 1262 xmin				28 0  4  -3 0 -1 -1 t p f i f f));

src/include/catalog/pg_class.h

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_class.h,v 1.44 2000/10/24 01:38:41 tgl Exp $
+ * $Id: pg_class.h,v 1.45 2000/11/14 18:37:46 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -142,7 +142,7 @@ DATA(insert OID = 1260 (  pg_shadow 86		  PGUID 0 1260 0 0 0 0 f t r 8  0 0 0 0
 DESCR("");
 DATA(insert OID = 1261 (  pg_group 87		  PGUID 0 1261 0 0 0 0 f t r 3  0 0 0 0 0 f f f _null_ ));
 DESCR("");
-DATA(insert OID = 1262 (  pg_database 88	  PGUID 0 1262 0 0 0 0 f t r 5  0 0 0 0 0 f f f _null_ ));
+DATA(insert OID = 1262 (  pg_database 88	  PGUID 0 1262 0 0 0 0 f t r 7  0 0 0 0 0 f f f _null_ ));
 DESCR("");
 DATA(insert OID = 1264 (  pg_variable 90	  PGUID 0 1264 0 0 0 0 f t s 1  0 0 0 0 0 f f f _null_ ));
 DESCR("");

src/include/catalog/pg_database.h

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_database.h,v 1.14 2000/11/08 16:59:50 petere Exp $
+ * $Id: pg_database.h,v 1.15 2000/11/14 18:37:46 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -36,6 +36,8 @@ CATALOG(pg_database) BOOTSTRAP
 	NameData	datname;
 	int4		datdba;
 	int4		encoding;
+	bool		datistemplate;	/* allowed as template for CREATE DATABASE? */
+	bool		datallowconn;	/* new connections allowed? */
 	Oid			datlastsysoid;
 	text		datpath;		/* VARIABLE LENGTH FIELD */
 } FormData_pg_database;
@@ -51,15 +53,17 @@ typedef FormData_pg_database *Form_pg_database;
  *		compiler constants for pg_database
  * ----------------
  */
-#define Natts_pg_database			5	
+#define Natts_pg_database				7
 #define Anum_pg_database_datname		1
 #define Anum_pg_database_datdba			2
 #define Anum_pg_database_encoding		3
-#define Anum_pg_database_datlastsysoid  4
-#define Anum_pg_database_datpath		5
+#define Anum_pg_database_datistemplate  4
+#define Anum_pg_database_datallowconn	5
+#define Anum_pg_database_datlastsysoid  6
+#define Anum_pg_database_datpath		7
 
-DATA(insert OID = 1 (  template1 PGUID ENCODING 0 "" ));
-DESCR("");
+DATA(insert OID = 1 (  template1 PGUID ENCODING t t 0 "" ));
+DESCR("Default template database");
 
 #define TemplateDbOid			1
 

src/include/commands/dbcommands.h

@@ -7,14 +7,15 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dbcommands.h,v 1.13 2000/01/26 05:58:00 momjian Exp $
+ * $Id: dbcommands.h,v 1.14 2000/11/14 18:37:47 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DBCOMMANDS_H
 #define DBCOMMANDS_H
 
-extern void createdb(const char *dbname, const char *dbpath, int encoding);
+extern void createdb(const char *dbname, const char *dbpath,
+					 const char *dbtemplate, int encoding);
 extern void dropdb(const char *dbname);
 
 #endif	 /* DBCOMMANDS_H */

src/include/mb/pg_wchar.h

-/* $Id: pg_wchar.h,v 1.22 2000/10/30 10:41:05 ishii Exp $ */
+/* $Id: pg_wchar.h,v 1.23 2000/11/14 18:37:48 tgl Exp $ */
 
 #ifndef PG_WCHAR_H
 #define PG_WCHAR_H
@@ -152,8 +152,6 @@ extern int	pg_char_to_encoding(const char *);
 
 extern int	GetDatabaseEncoding(void);
 extern void SetDatabaseEncoding(int);
-extern void SetTemplateEncoding(int);
-extern int	GetTemplateEncoding(void);
 extern unsigned short BIG5toCNS(unsigned short, unsigned char *);
 extern unsigned short CNStoBIG5(unsigned short, unsigned char);
 

src/include/nodes/parsenodes.h

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.120 2000/11/12 00:37:01 tgl Exp $
+ * $Id: parsenodes.h,v 1.121 2000/11/14 18:37:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -645,9 +645,10 @@ typedef struct LoadStmt
 typedef struct CreatedbStmt
 {
 	NodeTag		type;
-	char	   *dbname;			/* database to create */
-	char	   *dbpath;			/* location of database */
-	int			encoding;		/* default encoding (see regex/pg_wchar.h) */
+	char	   *dbname;			/* name of database to create */
+	char	   *dbpath;			/* location of database (NULL = default) */
+	char	   *dbtemplate;		/* template to use (NULL = default) */
+	int			encoding;		/* MULTIBYTE encoding (-1 = use default) */
 } CreatedbStmt;
 
 /* ----------------------

src/test/regress/expected/opr_sanity.out

@@ -482,8 +482,8 @@ WHERE p1.aggtransfn = p2.oid AND
           (p2.pronargs = 1 AND p1.aggbasetype = 0)));
   oid  | aggname | oid |   proname   
 -------+---------+-----+-------------
- 16996 | max     | 768 | int4larger
- 17010 | min     | 769 | int4smaller
+ 16998 | max     | 768 | int4larger
+ 17012 | min     | 769 | int4smaller
 (2 rows)
 
 -- Cross-check finalfn (if present) against its entry in pg_proc.