git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

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

author Thomas G. Lockhart <lockhart@fourpalms.org>

Fri, 6 Nov 1998 15:56:42 +0000 (15:56 +0000)

committer Thomas G. Lockhart <lockhart@fourpalms.org>

Fri, 6 Nov 1998 15:56:42 +0000 (15:56 +0000)

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".

src/bin/pg_dump/pg_dump.c patch | blob | blame | history

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c

index 6a2531010b89cad6475412df2fc30bf4034de2cd..b032e6c170727f9563b7520a766ca3f4c0e9c5d3 100644 (file)

--- a/src/bin/pg_dump/pg_dump.c

+++ b/src/bin/pg_dump/pg_dump.c

@@ -21,7 +21,7 @@

* 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.93.2.1 1998年11月06日 15:56:42 thomas Exp $

* 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");

fprintf(stderr,

"\t -n \t\t suppress most quotes around identifiers\n");

+ fprintf(stderr,

+ "\t -N \t\t enable most quotes around identifiers\n");

fprintf(stderr,

"\t -o \t\t dump object id's (oids)\n");

fprintf(stderr,

@@ -560,7 +562,7 @@ main(int argc, char **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)

{

@@ -584,6 +586,9 @@ main(int argc, char **argv)

case 'n': /* Do not force double-quotes on identifiers */

g_force_quotes = false;

break;

+ case 'N': /* Force double-quotes on identifiers */

+ g_force_quotes = true;

+ break;

case 'o': /* Dump oids */

oids = 1;

break;

@@ -2536,14 +2541,18 @@ dumpACL(FILE *fout, TableInfo tbinfo)

ACLlist = ParseACL(tbinfo.relacl, &l);

if (ACLlist == (ACL *) NULL)

+ {

if (l == 0)

+ {

return;

+ }

else

{

fprintf(stderr, "Could not parse ACL list for '%s'...Exiting!\n",

tbinfo.relname);

exit_nicely(g_conn);

}

+ }

/* Revoke Default permissions for PUBLIC */

fprintf(fout,

This is the main PostgreSQL git repository.

RSS Atom