2016-11-08 6:01 GMT+01:00 amul sul <sula...@gmail.com>: > On Tue, Nov 8, 2016 at 5:36 AM, Andreas Joseph Krogh <andr...@visena.com> > wrote: > > > > > > I don't see what you mean. It forces dump of Blobs if we didn't use -B > and > > if we include everything in the dump, which seems good to me. What did > you > > try that didn't work as expected? > > > > > > I guess what he means is that if -B is given, the following code sets > > dopt.outputBlobs = false > > > > + case 'B': /* Don't dump blobs */ > > + dopt.outputBlobs = false; > > + break; > > > > > > Then this IF sets it back to TRUE: > > > > + if (dopt.include_everything && !dopt.schemaOnly && > !dopt.outputBlobs) > > dopt.outputBlobs = true; > > > > > > ...making it impossible to turn off dumping of blobs. > > > > Yes, thats the reason v4 patch was not as expected. > > It took me some time but I finally understand.
Behaviour fix in v6. -- Guillaume. http://blog.guillaume.lelarge.info http://www.dalibo.com
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index 371a614..a891b6e 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -145,6 +145,21 @@ PostgreSQL documentation </varlistentry> <varlistentry> + <term><option>-B</></term> + <term><option>--no-blobs</></term> + <listitem> + <para> + Exclude large objects in the dump. + </para> + + <para> + When both <option>-b</> and <option>-B</> are given, the behavior + is to output large objects. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>-c</option></term> <term><option>--clean</option></term> <listitem> diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index 0a28124..00ecde3 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -158,6 +158,7 @@ typedef struct _dumpOptions int outputClean; int outputCreateDB; bool outputBlobs; + bool dontOutputBlobs; int outputNoOwner; char *outputSuperuser; } DumpOptions; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 4da297f..a91cbd9 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -291,6 +291,7 @@ main(int argc, char **argv) static struct option long_options[] = { {"data-only", no_argument, NULL, 'a'}, {"blobs", no_argument, NULL, 'b'}, + {"no-blobs", no_argument, NULL, 'B'}, {"clean", no_argument, NULL, 'c'}, {"create", no_argument, NULL, 'C'}, {"dbname", required_argument, NULL, 'd'}, @@ -379,7 +380,7 @@ main(int argc, char **argv) InitDumpOptions(&dopt); - while ((c = getopt_long(argc, argv, "abcCd:E:f:F:h:j:n:N:oOp:RsS:t:T:U:vwWxZ:", + while ((c = getopt_long(argc, argv, "abBcCd:E:f:F:h:j:n:N:oOp:RsS:t:T:U:vwWxZ:", long_options, &optindex)) != -1) { switch (c) @@ -392,6 +393,10 @@ main(int argc, char **argv) dopt.outputBlobs = true; break; + case 'B': /* Don't dump blobs */ + dopt.dontOutputBlobs = true; + break; + case 'c': /* clean (i.e., drop) schema prior to create */ dopt.outputClean = 1; break; @@ -708,7 +713,7 @@ main(int argc, char **argv) * Dumping blobs is now default unless we saw an inclusion switch or -s * ... but even if we did see one of these, -b turns it back on. */ - if (dopt.include_everything && !dopt.schemaOnly) + if (dopt.include_everything && !dopt.schemaOnly && !dopt.dontOutputBlobs) dopt.outputBlobs = true; /* @@ -864,6 +869,7 @@ help(const char *progname) printf(_("\nOptions controlling the output content:\n")); printf(_(" -a, --data-only dump only the data, not the schema\n")); printf(_(" -b, --blobs include large objects in dump\n")); + printf(_(" -B, --no-blobs exclude large objects in dump\n")); printf(_(" -c, --clean clean (drop) database objects before recreating\n")); printf(_(" -C, --create include commands to create database in dump\n")); printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n"));
-- Sent via pgsql-general mailing list (pgsql-general@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-general