|
22 | 22 | *
|
23 | 23 | *
|
24 | 24 | * IDENTIFICATION
|
25 |
| - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.243 2002/03/06 20:48:42 momjian Exp $ |
| 25 | + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.244 2002/03/21 05:47:14 momjian Exp $ |
26 | 26 | *
|
27 | 27 | *-------------------------------------------------------------------------
|
28 | 28 | */
|
@@ -141,71 +141,71 @@ help(const char *progname)
|
141 | 141 | #ifdefHAVE_GETOPT_LONG
|
142 | 142 | puts(gettext(
|
143 | 143 | " -a, --data-only dump only the data, not the schema\n"
|
144 |
| -" -b, --blobs include large objects in dump\n" |
145 |
| -" -c, --clean clean (drop) schema prior to create\n" |
146 |
| -" -C, --create include commands to create database in dump\n" |
147 |
| -" -d, --inserts dump data as INSERT, rather than COPY, commands\n" |
148 |
| -" -D, --column-inserts dump data as INSERT commands with column names\n" |
149 |
| -" -f, --file=FILENAME output file name\n" |
150 |
| -" -F, --format {c|t|p} output file format (custom, tar, plain text)\n" |
151 |
| -" -h, --host=HOSTNAME database server host name\n" |
152 |
| -" -i, --ignore-version proceed even when server version mismatches\n" |
153 |
| -" pg_dump version\n" |
154 |
| -" -n, --no-quotes suppress most quotes around identifiers\n" |
155 |
| -" -N, --quotes enable most quotes around identifiers\n" |
156 |
| -" -o, --oids include oids in dump\n" |
157 |
| -" -O, --no-owner do not output \\connect commands in plain\n" |
158 |
| -" text format\n" |
159 |
| -" -p, --port=PORT database server port number\n" |
160 |
| -" -R, --no-reconnect disable ALL reconnections to the database in\n" |
161 |
| -" plain text format\n" |
162 |
| -" -s, --schema-only dump only the schema, no data\n" |
163 |
| -" -S, --superuser=NAME specify the superuser user name to use in\n" |
164 |
| -" plain text format\n" |
165 |
| -" -t, --table=TABLE dump this table only (* for all)\n" |
| 144 | +" -b, --blobs include large objects in dump\n" |
| 145 | +" -c, --clean clean (drop) schema prior to create\n" |
| 146 | +" -C, --create include commands to create database in dump\n" |
| 147 | +" -d, --inserts dump data as INSERT, rather than COPY, commands\n" |
| 148 | +" -D, --column-inserts dump data as INSERT commands with column names\n" |
| 149 | +" -f, --file=FILENAME output file name\n" |
| 150 | +" -F, --format {c|t|p} output file format (custom, tar, plain text)\n" |
| 151 | +" -h, --host=HOSTNAME database server host name\n" |
| 152 | +" -i, --ignore-version proceed even when server version mismatches\n" |
| 153 | +" pg_dump version\n" |
| 154 | +" -n, --no-quotes suppress most quotes around identifiers\n" |
| 155 | +" -N, --quotes enable most quotes around identifiers\n" |
| 156 | +" -o, --oids include oids in dump\n" |
| 157 | +" -O, --no-owner do not output \\connect commands in plain\n" |
| 158 | +" text format\n" |
| 159 | +" -p, --port=PORT database server port number\n" |
| 160 | +" -R, --no-reconnect disable ALL reconnections to the database in\n" |
| 161 | +" plain text format\n" |
| 162 | +" -s, --schema-only dump only the schema, no data\n" |
| 163 | +" -S, --superuser=NAME specify the superuser user name to use in\n" |
| 164 | +" plain text format\n" |
| 165 | +" -t, --table=TABLE dump this table only (* for all)\n" |
166 | 166 | " -U, --username=NAME connect as specified database user\n"
|
167 |
| -" -v, --verbose verbose mode\n" |
168 |
| -" -W, --password force password prompt (should happen automatically)\n" |
169 |
| -" -x, --no-privileges do not dump privileges (grant/revoke)\n" |
170 |
| -" -X use-set-session-authorization, --use-set-session-authorization\n" |
171 |
| -" output SET SESSION AUTHORIZATION commands rather\n" |
172 |
| -" than \\connect commands\n" |
173 |
| -" -Z, --compress {0-9} compression level for compressed formats\n" |
174 |
| -)); |
| 167 | +" -v, --verbose verbose mode\n" |
| 168 | +" -W, --password force password prompt (should happen automatically)\n" |
| 169 | +" -x, --no-privileges do not dump privileges (grant/revoke)\n" |
| 170 | +" -X use-set-session-authorization, --use-set-session-authorization\n" |
| 171 | +" output SET SESSION AUTHORIZATION commands rather\n" |
| 172 | +" than \\connect commands\n" |
| 173 | +" -Z, --compress {0-9} compression level for compressed formats\n" |
| 174 | +)); |
175 | 175 | #else
|
176 | 176 | puts(gettext(
|
177 | 177 | " -a dump only the data, not the schema\n"
|
178 |
| -" -b include large objects in dump\n" |
179 |
| -" -c clean (drop) schema prior to create\n" |
180 |
| -" -C include commands to create database in dump\n" |
181 |
| -" -d dump data as INSERT, rather than COPY, commands\n" |
182 |
| -" -D dump data as INSERT commands with column names\n" |
183 |
| -" -f FILENAME output file name\n" |
184 |
| -" -F {c|t|p} output file format (custom, tar, plain text)\n" |
185 |
| -" -h HOSTNAME database server host name\n" |
186 |
| -" -i proceed even when server version mismatches\n" |
187 |
| -" pg_dump version\n" |
188 |
| -" -n suppress most quotes around identifiers\n" |
189 |
| -" -N enable most quotes around identifiers\n" |
190 |
| -" -o include oids in dump\n" |
191 |
| -" -O do not output \\connect commands in plain\n" |
192 |
| -" text format\n" |
193 |
| -" -p PORT database server port number\n" |
194 |
| -" -R disable ALL reconnections to the database in\n" |
195 |
| -" plain text format\n" |
196 |
| -" -s dump only the schema, no data\n" |
197 |
| -" -S NAME specify the superuser user name to use in\n" |
198 |
| -" plain text format\n" |
199 |
| -" -t TABLE dump this table only (* for all)\n" |
| 178 | +" -b include large objects in dump\n" |
| 179 | +" -c clean (drop) schema prior to create\n" |
| 180 | +" -C include commands to create database in dump\n" |
| 181 | +" -d dump data as INSERT, rather than COPY, commands\n" |
| 182 | +" -D dump data as INSERT commands with column names\n" |
| 183 | +" -f FILENAME output file name\n" |
| 184 | +" -F {c|t|p} output file format (custom, tar, plain text)\n" |
| 185 | +" -h HOSTNAME database server host name\n" |
| 186 | +" -i proceed even when server version mismatches\n" |
| 187 | +" pg_dump version\n" |
| 188 | +" -n suppress most quotes around identifiers\n" |
| 189 | +" -N enable most quotes around identifiers\n" |
| 190 | +" -o include oids in dump\n" |
| 191 | +" -O do not output \\connect commands in plain\n" |
| 192 | +" text format\n" |
| 193 | +" -p PORT database server port number\n" |
| 194 | +" -R disable ALL reconnections to the database in\n" |
| 195 | +" plain text format\n" |
| 196 | +" -s dump only the schema, no data\n" |
| 197 | +" -S NAME specify the superuser user name to use in\n" |
| 198 | +" plain text format\n" |
| 199 | +" -t TABLE dump this table only (* for all)\n" |
200 | 200 | " -U NAME connect as specified database user\n"
|
201 |
| -" -v verbose mode\n" |
202 |
| -" -W force password prompt (should happen automatically)\n" |
203 |
| -" -x do not dump privileges (grant/revoke)\n" |
204 |
| -" -X use-set-session-authorization\n" |
205 |
| -" output SET SESSION AUTHORIZATION commands rather\n" |
206 |
| -" than \\connect commands\n" |
207 |
| -" -Z {0-9} compression level for compressed formats\n" |
208 |
| -)); |
| 201 | +" -v verbose mode\n" |
| 202 | +" -W force password prompt (should happen automatically)\n" |
| 203 | +" -x do not dump privileges (grant/revoke)\n" |
| 204 | +" -X use-set-session-authorization\n" |
| 205 | +" output SET SESSION AUTHORIZATION commands rather\n" |
| 206 | +" than \\connect commands\n" |
| 207 | +" -Z {0-9} compression level for compressed formats\n" |
| 208 | +)); |
209 | 209 | #endif
|
210 | 210 | puts(gettext("If no database name is not supplied, then the PGDATABASE environment\n"
|
211 | 211 | "variable value is used.\n\n"
|
@@ -4081,7 +4081,6 @@ dumpACL(Archive *fout, TableInfo tbinfo)
|
4081 | 4081 | objoid=tbinfo.oid;
|
4082 | 4082 |
|
4083 | 4083 | ArchiveEntry(fout,objoid,tbinfo.relname,"ACL",NULL,sql,"","","",NULL,NULL);
|
4084 |
| - |
4085 | 4084 | }
|
4086 | 4085 |
|
4087 | 4086 | staticvoid
|
|