2020 *
2121 *
2222 * IDENTIFICATION
23- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.14 1996/11/10 01:35:39 bryanh Exp $
23+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.15 1996/11/17 04:56:01 momjian Exp $
2424 *
2525 * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
2626 *
@@ -84,18 +84,15 @@ usage(const char* progname)
8484fprintf (stderr ,"\t -H hostname \t\t server host name\n" );
8585fprintf (stderr ,"\t -p port \t\t server port number\n" );
8686fprintf (stderr ,"\t -v \t\t verbose\n" );
87- fprintf (stderr ,"\t -d[a] \t\t dump data as proper insert strings\n" );
88- fprintf (stderr ,"\t(if 'a' then attribute names also) \n" );
87+ fprintf (stderr ,"\t -d );
88+ fprintf (stderr ,"\t-D \t\tdump data as inserts with attribute names\n" );
8989fprintf (stderr ,"\t -S \t\t dump out only the schema, no data\n" );
9090fprintf (stderr ,"\t -a \t\t dump out only the data, no schema\n" );
9191fprintf (stderr ,"\t -t table \t\t dump for this table only\n" );
9292fprintf (stderr ,"\t -o \t\t dump object id's (oids)\n" );
93- fprintf (stderr ,"\n if dbname is not supplied, then the DATABASE environment name is used\n" );
93+ fprintf (stderr ,"\nIf dbname is not supplied, then the DATABASE environment name is used. \n" );
9494fprintf (stderr ,"\n" );
9595
96- fprintf (stderr ,"\tpg_dump dumps out postgres databases and produces a script file\n" );
97- fprintf (stderr ,"\tof SQL commands to regenerate the schema\n" );
98- fprintf (stderr ,"\tThe SQL output is designed for import into Postgres95\n" );
9996exit (1 );
10097}
10198
@@ -137,7 +134,7 @@ main(int argc, char** argv)
137134
138135progname = * argv ;
139136
140- while ((c = getopt (argc ,argv ,"f:H:p:t:vSDd:ao " ))!= EOF ) {
137+ while ((c = getopt (argc ,argv ,"f:H:p:t:vSDdDao " ))!= EOF ) {
141138switch (c ) {
142139case 'f' :/* output file name */
143140filename = optarg ;
@@ -156,7 +153,10 @@ main(int argc, char** argv)
156153break ;
157154case 'd' :/* dump data as proper insert strings */
158155dumpData = 1 ;
159- attrNames = strstr (optarg ,"a" ) ?1 :0 ;
156+ break ;
157+ case 'D' :/* dump data as proper insert strings with attr names */
158+ dumpData = 1 ;
159+ attrNames = 1 ;
160160break ;
161161case 't' :/* Dump data for this table only */
162162tablename = optarg ;