|
5 | 5 | # It also dumps the pg_shadow and pg_group tables, which belong to the |
6 | 6 | # whole installation rather than any one individual database. |
7 | 7 | # |
8 | | -# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall,v 1.26 2000/05/05 17:50:38 tgl Exp $ |
| 8 | +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall,v 1.27 2000/05/25 20:18:15 tgl Exp $ |
9 | 9 | # |
10 | 10 | # to adapt to System V vs. BSD 'echo' |
11 | 11 | ifecho'\\'| grep'\\\\'>/dev/null2>&1 |
@@ -65,9 +65,9 @@ echo "${BS}." |
65 | 65 | # |
66 | 66 | # For each database, run pg_dump to dump the contents of that database. |
67 | 67 | # |
68 | | -psql -A -q -t -c"select* from pg_database" template1 | grep '|' | tr '|' ' ' |\ |
| 68 | +psql -A -q -t -c"selectdatname,datdba,encoding from pg_database" template1 | grep '|' | tr '|' ' ' |\ |
69 | 69 | grep -v '^template1 ' |\ |
70 | | -while read DATABASE DBUSERID ENCODING DATAPATH |
| 70 | +while read DATABASE DBUSERID ENCODING |
71 | 71 | do |
72 | 72 | DBUSERNAME="`echo\" \ |
73 | 73 | selectusename \ |
|
79 | 79 |
|
80 | 80 | if sh -c"pg_encoding$ENCODING" >/dev/null 2>&1 |
81 | 81 | then |
82 | | -echo"create database$DATABASE with encoding='`pg_encoding $ENCODING`';" |
| 82 | +echo"create database\"$DATABASE\" with encoding='`pg_encoding $ENCODING`';" |
83 | 83 | else |
84 | | -echo"create database$DATABASE;" |
| 84 | +echo"create database\"$DATABASE\";" |
85 | 85 | fi |
86 | 86 |
|
87 | | -echo"${BS}connect$DATABASE$POSTGRES_USER" |
88 | | -pg_dump${1+"$@"}$DATABASE |
| 87 | +echo"${BS}connect$DATABASE$DBUSERNAME" |
| 88 | +pg_dump${1+"$@"}"$DATABASE" |
89 | 89 | if ["$?" -ne 0 ] |
90 | 90 | thenecho"pg_dump failed on$DATABASE, exiting" 1>&2 |
91 | 91 | exit 1 |
|