mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add "-N" flag to force double quotes around identifiers.

Browse Source 
This is the default, but the new flag will allow overriding an alias,
 for example. So psql -n -N will put in the double quotes,
 and psql -n can be an alias for psql.
Also, add a few braces around a nested single-line conditional construct
 to suppress compiler warnings about "an ambiguous else".
This commit is contained in:
Thomas G. Lockhart 1998-11-06 15:54:47 +00:00
parent 3d22596fe7
commit 680e4a2950
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/pg_dump/pg_dump.c
View File

@ -21,7 +21,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.93 1998/10/26 01:05:07 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.94 1998/11/06 15:54:47 thomas Exp $
* *
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* *
@ -139,6 +139,8 @@ usage(const char *progname)
"\t -h hostname \t\t server host name\n"); "\t -h hostname \t\t server host name\n");
fprintf(stderr, fprintf(stderr,
"\t -n \t\t suppress most quotes around identifiers\n"); "\t -n \t\t suppress most quotes around identifiers\n");
fprintf(stderr,
"\t -N \t\t enable most quotes around identifiers\n");
fprintf(stderr, fprintf(stderr,
"\t -o \t\t dump object id's (oids)\n"); "\t -o \t\t dump object id's (oids)\n");
fprintf(stderr, fprintf(stderr,
@ -560,7 +562,7 @@ main(int argc, char **argv)
progname = *argv; progname = *argv;
while ((c = getopt(argc, argv, "adDf:h:nop:st:vzu")) != EOF) while ((c = getopt(argc, argv, "adDf:h:nNop:st:vzu")) != EOF)
{ {
switch (c) switch (c)
{ {
@ -584,6 +586,9 @@ main(int argc, char **argv)
case 'n': /* Do not force double-quotes on identifiers */ case 'n': /* Do not force double-quotes on identifiers */
g_force_quotes = false; g_force_quotes = false;
break; break;
case 'N': /* Force double-quotes on identifiers */
g_force_quotes = true;
break;
case 'o': /* Dump oids */ case 'o': /* Dump oids */
oids = 1; oids = 1;
break; break;
@ -2536,14 +2541,18 @@ dumpACL(FILE *fout, TableInfo tbinfo)
ACLlist = ParseACL(tbinfo.relacl, &l); ACLlist = ParseACL(tbinfo.relacl, &l);
if (ACLlist == (ACL *) NULL) if (ACLlist == (ACL *) NULL)
{
if (l == 0) if (l == 0)
{
return; return;
}
else else
{ {
fprintf(stderr, "Could not parse ACL list for '%s'...Exiting!\n", fprintf(stderr, "Could not parse ACL list for '%s'...Exiting!\n",
tbinfo.relname); tbinfo.relname);
exit_nicely(g_conn); exit_nicely(g_conn);
} }
}
/* Revoke Default permissions for PUBLIC */ /* Revoke Default permissions for PUBLIC */
fprintf(fout, fprintf(fout,