Add --no-blobs option to pg_dump

Add an option to exclude blobs when running pg_dump.  By default, blobs
are included but this option can be used to exclude them while keeping
the rest of the dump.

Commment updates and regression tests from me.

Author: Guillaume Lelarge
Reviewed-by: Amul Sul
Discussion: https://postgr.es/m/VisenaEmail.48.49926ea6f91dceb6.15355a48249@tc7-visena

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 04b312445da55420a1e3350dbee3e0219af42309..f6225d23c800f4e2ef540c7caacba3475d427d25 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -147,6 +147,22 @@ PostgreSQL documentation
       </listitem>
      </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, when data is being dumped, see the
+        <option>-b</> documentation.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-c</option></term>
       <term><option>--clean</option></term>

diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index cfdfae5e1208dcdff1480236756df1e9c3aeb1a5..7241cdfc4494f8f8394c9f2551f21e6f4e70ce75 100644 (file)
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -159,6 +159,7 @@ typedef struct _dumpOptions
        int                     outputClean;
        int                     outputCreateDB;
        bool            outputBlobs;
+       bool            dontOutputBlobs;
        int                     outputNoOwner;
        char       *outputSuperuser;
 

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 9f59f53a7da06f6ceeea26fe944d703895321278..2ff60b9879670a9ab4e6a065581e4fe8fc9adaa2 100644 (file)
--- 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;
@@ -713,10 +718,15 @@ main(int argc, char **argv)
        /* non-matching exclusion patterns aren't an error */
 
        /*
-        * 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.
+        * Dumping blobs is the default for dumps where an inclusion switch is not
+        * used (an "include everything" dump).  -B can be used to exclude blobs
+        * from those dumps.  -b can be used to include blobs even when an
+        * inclusion switch is used.
+        *
+        * -s means "schema only" and blobs are data, not schema, so we never
+        * include blobs when -s is used.
         */
-       if (dopt.include_everything && !dopt.schemaOnly)
+       if (dopt.include_everything && !dopt.schemaOnly && !dopt.dontOutputBlobs)
                dopt.outputBlobs = true;
 
        /*
@@ -876,6 +886,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"));

diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index 35ee85325b86aed5a9674f1ccd34ab1ca9f9f667..7379487471cd99537baad0f5edbf99e43f5caf23 100644 (file)
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -144,6 +144,9 @@ my %pgdump_runs = (
        pg_dumpall_dbprivs => {
                dump_cmd =>
                  [ 'pg_dumpall', '-f', "$tempdir/pg_dumpall_dbprivs.sql", ], },
+       no_blobs => {
+               dump_cmd =>
+                 [ 'pg_dump', '-f', "$tempdir/no_blobs.sql", '-B', 'postgres', ], },
        no_privs => {
                dump_cmd =>
                  [ 'pg_dump', '-f', "$tempdir/no_privs.sql", '-x', 'postgres', ], },
@@ -184,7 +187,7 @@ my %pgdump_runs = (
        test_schema_plus_blobs => {
                dump_cmd => [
                        'pg_dump', '-f', "$tempdir/test_schema_plus_blobs.sql",
-                       '-n', 'dump_test', '-b', 'postgres', ], },);
+                       '-n', 'dump_test', '-b', '-B', 'postgres', ], },);
 
 ###############################################################
 # Definition of the tests to run.
@@ -243,6 +246,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
                        pg_dumpall_dbprivs      => 1,
@@ -283,6 +287,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
@@ -309,6 +314,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        only_dump_test_schema   => 1,
                        pg_dumpall_dbprivs      => 1,
@@ -339,6 +345,7 @@ my %tests = (
                        test_schema_plus_blobs   => 1, },
                unlike => {
                        binary_upgrade           => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
                        only_dump_test_table     => 1,
@@ -362,6 +369,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        schema_only              => 1,
@@ -384,6 +392,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        only_dump_test_schema   => 1,
                        pg_dumpall_dbprivs      => 1,
@@ -408,6 +417,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        role                     => 1,
@@ -430,6 +440,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -463,6 +474,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -494,6 +506,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -520,6 +533,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        only_dump_test_schema   => 1,
                        only_dump_test_table    => 1,
@@ -546,6 +560,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -572,6 +587,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        only_dump_test_schema   => 1,
                        pg_dumpall_dbprivs      => 1,
@@ -596,6 +612,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        role                     => 1,
@@ -655,6 +672,7 @@ my %tests = (
                },
                unlike => {
                        binary_upgrade            => 1,
+                       no_blobs                  => 1,
                        only_dump_test_schema     => 1,
                        only_dump_test_table      => 1,
                        pg_dumpall_globals        => 1,
@@ -691,6 +709,7 @@ my %tests = (
                },
                unlike => {
                        binary_upgrade            => 1,
+                       no_blobs                  => 1,
                        only_dump_test_schema     => 1,
                        only_dump_test_table      => 1,
                        pg_dumpall_globals        => 1,
@@ -715,6 +734,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -737,6 +757,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -762,6 +783,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -790,6 +812,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -819,6 +842,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -860,6 +884,7 @@ my %tests = (
                        createdb               => 1,
                        data_only              => 1,
                        defaults               => 1,
+                       no_blobs               => 1,
                        no_privs               => 1,
                        no_owner               => 1,
                        only_dump_test_schema  => 1,
@@ -891,6 +916,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -936,6 +962,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -967,6 +994,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -1032,6 +1060,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -1067,6 +1096,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
@@ -1094,6 +1124,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
@@ -1127,6 +1158,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
@@ -1153,6 +1185,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -1196,6 +1229,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1236,6 +1270,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1275,6 +1310,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1313,6 +1349,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1351,6 +1388,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1389,6 +1427,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -1425,6 +1464,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1462,6 +1502,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1502,6 +1543,7 @@ my %tests = (
                        defaults                 => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
@@ -1536,6 +1578,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1567,6 +1610,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1604,6 +1648,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1641,6 +1686,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1687,6 +1733,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1726,6 +1773,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1758,6 +1806,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -1789,6 +1838,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -1823,6 +1873,7 @@ my %tests = (
 #                      exclude_dump_test_schema => 1,
 #                      exclude_test_table => 1,
 #                      exclude_test_table_data => 1,
+#                      no_blobs                => 1,
 #                      no_privs => 1,
 #                      no_owner => 1,
 #                      pg_dumpall_dbprivs       => 1,
@@ -1856,6 +1907,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        pg_dumpall_dbprivs      => 1,
@@ -1891,6 +1943,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1927,6 +1980,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1960,6 +2014,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -1993,6 +2048,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2026,6 +2082,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2059,6 +2116,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2092,6 +2150,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2122,6 +2181,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2152,6 +2212,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -2187,6 +2248,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2223,6 +2285,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2260,6 +2323,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2296,6 +2360,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -2329,6 +2394,7 @@ my %tests = (
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2364,6 +2430,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -2397,6 +2464,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
@@ -2577,6 +2645,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_privs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
@@ -2608,6 +2677,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        role                     => 1,
@@ -2638,6 +2708,7 @@ my %tests = (
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
                        only_dump_test_table     => 1,
@@ -2662,6 +2733,7 @@ my %tests = (
                        createdb                => 1,
                        defaults                => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
                        only_dump_test_table    => 1,
@@ -2693,6 +2765,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        role                     => 1,
@@ -2723,6 +2796,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        role                     => 1,
@@ -2752,6 +2826,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
                        pg_dumpall_dbprivs      => 1,
@@ -2782,6 +2857,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        schema_only              => 1,
@@ -2871,6 +2947,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        schema_only              => 1,
@@ -2904,6 +2981,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2937,6 +3015,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        defaults                => 1,
                        exclude_test_table      => 1,
                        exclude_test_table_data => 1,
+                       no_blobs                => 1,
                        no_privs                => 1,
                        no_owner                => 1,
                        only_dump_test_schema   => 1,
@@ -2976,6 +3055,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        only_dump_test_schema    => 1,
                        only_dump_test_table     => 1,
@@ -3006,6 +3086,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        schema_only              => 1,
@@ -3032,6 +3113,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        schema_only              => 1,
@@ -3061,6 +3143,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        schema_only              => 1,
@@ -3087,6 +3170,7 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                        exclude_dump_test_schema => 1,
                        exclude_test_table       => 1,
                        exclude_test_table_data  => 1,
+                       no_blobs                 => 1,
                        no_owner                 => 1,
                        pg_dumpall_dbprivs       => 1,
                        schema_only              => 1,