diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.h | 7 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dumpall | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index 424ed9afd40..702fb0ea7e8 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_dump.h,v 1.15 1997/06/02 02:52:06 scrappy Exp $ + * $Id: pg_dump.h,v 1.16 1997/06/21 16:08:15 momjian Exp $ * * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * @@ -38,6 +38,7 @@ typedef struct _typeInfo { char* typdelim; char* typdefault; char* typrelid; + char* usename; int passedbyvalue; int isArray; } TypeInfo; @@ -53,6 +54,7 @@ typedef struct _funcInfo { int retset; /* 1 if the function returns a set, 0 otherwise */ char* prosrc; char* probin; + char* usename; int dumped; /* 1 if already dumped */ } FuncInfo; @@ -78,6 +80,7 @@ typedef struct _tableInfo { not have the same order of attributes as the POSTQUEL tables */ int *attlen; /* attribute lengths */ + char* usename; } TableInfo; @@ -108,6 +111,7 @@ typedef struct _aggInfo { char *aggtranstype2; char *agginitval1; char *agginitval2; + char* usename; } AggInfo; typedef struct _oprInfo { @@ -126,6 +130,7 @@ typedef struct _oprInfo { char *oprcanhash; /* can we use hash join strategy ? */ char *oprlsortop; /* oid's of the left and right sort operators */ char *oprrsortop; + char* usename; } OprInfo; diff --git a/src/bin/pg_dump/pg_dumpall b/src/bin/pg_dump/pg_dumpall index 5e33abff975..88b551f7bb2 100644 --- a/src/bin/pg_dump/pg_dumpall +++ b/src/bin/pg_dump/pg_dumpall @@ -44,12 +44,11 @@ echo "${BS}." psql -l -A -q -t| tr '|' ' ' | grep -v '^template1 ' | \ while read DATABASE PGUSERID DATAPATH do - POSTGRES_USER="`psql -A -q -t template1 <<END -select usename -from pg_user -where usesysid = $PGUSERID; -END`" - + POSTGRES_USER="`echo \" \ + select usename \ + from pg_user \ + where usesysid = $PGUSERID; \" | \ + psql -A -q -t template1`" echo "${BS}connect template1 $POSTGRES_USER" echo "create database $DATABASE;" echo "${BS}connect $DATABASE $POSTGRES_USER" |