Fix pg_dumpall for new psql output.

diff --git a/src/bin/pg_dump/pg_dumpall b/src/bin/pg_dump/pg_dumpall
index 586e75d530ca164ed11361f17996ebb3e48f8c3c..377b296e85027bf251b4ba8fb5484e979b21ba2c 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall
+++ b/src/bin/pg_dump/pg_dumpall
@@ -47,7 +47,7 @@ copy tmp_pg_shadow to stdout;
 drop table tmp_pg_shadow;
 END
 echo "${BS}."
-psql -l -A -q -t | grep '|' | tr '|' ' ' | \
+psql -A -q -t -c "select * from pg_database" template1 | grep '|' | tr '|' ' ' | \
 grep -v '^template1 ' | \
 while read DATABASE DBUSERID ENCODING DATAPATH
 do
@@ -55,7 +55,7 @@ do
 
    if pg_encoding $ENCODING >/dev/null 2>&1
    then
-       echo "create database $DATABASE with encoding='$ENCODING';"
+       echo "create database $DATABASE with encoding='`pg_encoding $ENCODING`';"
    else
        echo "create database $DATABASE;"
    fi