rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge the loading of shared object descriptions with regular descriptions, 

both in code and in the messages emitted to the user.
This commit is contained in:
Alvaro Herrera 2006-03-21 17:54:28 +00:00
parent af00c04c42
commit c4826cf0b0
1 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.113 2006/03/05 15:58:50 momjian Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.114 2006/03/21 17:54:28 alvherre Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -178,7 +178,6 @@ static void unlimit_systables(void);
static void setup_depend(void); static void setup_depend(void);
static void setup_sysviews(void); static void setup_sysviews(void);
static void setup_description(void); static void setup_description(void);
static void setup_shared_description(void);
static void setup_conversion(void); static void setup_conversion(void);
static void setup_privileges(void); static void setup_privileges(void);
static void set_info_version(void); static void set_info_version(void);
@ -1725,7 +1724,7 @@ setup_description(void)
{ {
PG_CMD_DECL; PG_CMD_DECL;
fputs(_("loading pg_description ... "), stdout); fputs(_("loading system objects' descriptions ... "), stdout);
fflush(stdout); fflush(stdout);
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
@ -1749,41 +1748,18 @@ setup_description(void)
" FROM tmp_pg_description t, pg_class c " " FROM tmp_pg_description t, pg_class c "
" WHERE c.relname = t.classname;\n"); " WHERE c.relname = t.classname;\n");
PG_CMD_CLOSE;
check_ok();
}
/*
* load shared description data
*/
static void
setup_shared_description(void)
{
PG_CMD_DECL;
fputs(_("loading pg_shdescription ... "), stdout);
fflush(stdout);
snprintf(cmd, sizeof(cmd),
"\"%s\" %s template1 >%s",
backend_exec, backend_options,
DEVNULL);
PG_CMD_OPEN;
PG_CMD_PUTS("CREATE TEMP TABLE tmp_pg_shdescription ( " PG_CMD_PUTS("CREATE TEMP TABLE tmp_pg_shdescription ( "
" objoid oid, " " objoid oid, "
" classname name, " " classname name, "
" description text) WITHOUT OIDS;\n"); " description text) WITHOUT OIDS;\n");
PG_CMD_PRINTF1("COPY tmp_pg_shdescription FROM '%s';\n", PG_CMD_PRINTF1("COPY tmp_pg_shdescription FROM '%s';\n",
shdesc_file); shdesc_file);
PG_CMD_PUTS("INSERT INTO pg_shdescription " PG_CMD_PUTS("INSERT INTO pg_shdescription "
" SELECT t.objoid, c.oid, t.description " " SELECT t.objoid, c.oid, t.description "
" FROM tmp_pg_shdescription t, pg_class c " " FROM tmp_pg_shdescription t, pg_class c "
" WHERE c.relname = t.classname;\n"); " WHERE c.relname = t.classname;\n");
PG_CMD_CLOSE; PG_CMD_CLOSE;
@ -2960,8 +2936,6 @@ main(int argc, char *argv[])
setup_description(); setup_description();
setup_shared_description();
setup_conversion(); setup_conversion();
setup_privileges(); setup_privileges();