Finish pgindent run for 9.6: Perl files.
authorNoah Misch <noah@leadboat.com>
Sun, 12 Jun 2016 08:19:56 +0000 (04:19 -0400)
committerNoah Misch <noah@leadboat.com>
Sun, 12 Jun 2016 08:19:56 +0000 (04:19 -0400)
31 files changed:
contrib/bloom/t/001_wal.pl
src/backend/storage/lmgr/generate-lwlocknames.pl
src/backend/utils/Gen_dummy_probes.pl
src/backend/utils/mb/Unicode/UCS_to_SJIS.pl
src/bin/pg_basebackup/t/010_pg_basebackup.pl
src/bin/pg_dump/t/001_basic.pl
src/bin/pg_dump/t/002_pg_dump.pl
src/bin/pg_rewind/RewindTest.pm
src/interfaces/ecpg/preproc/parse.pl
src/test/modules/commit_ts/t/001_base.pl
src/test/modules/commit_ts/t/002_standby.pl
src/test/modules/commit_ts/t/003_standby_2.pl
src/test/modules/test_pg_dump/t/001_base.pl
src/test/perl/PostgresNode.pm
src/test/perl/RecursiveCopy.pm
src/test/perl/TestLib.pm
src/test/recovery/t/001_stream_rep.pl
src/test/recovery/t/002_archiving.pl
src/test/recovery/t/003_recovery_targets.pl
src/test/recovery/t/004_timeline_switch.pl
src/test/recovery/t/005_replay_delay.pl
src/test/recovery/t/007_sync_rep.pl
src/tools/copyright.pl
src/tools/git_changelog
src/tools/msvc/Install.pm
src/tools/msvc/Mkvcbuild.pm
src/tools/msvc/Solution.pm
src/tools/msvc/build.pl
src/tools/msvc/config_default.pl
src/tools/msvc/pgflex.pl
src/tools/msvc/vcregress.pl

index dbb6a905b6097d9b3c7f92bcdc978cd0c3588d2b..56c6618d3d1570fe23edaa4a3773d717ade5b3d2 100644 (file)
@@ -16,7 +16,7 @@ sub test_index_replay
        # Wait for standby to catch up
        my $applname = $node_standby->name;
        my $caughtup_query =
-               "SELECT pg_current_xlog_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname';";
+"SELECT pg_current_xlog_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname';";
        $node_master->poll_query_until('postgres', $caughtup_query)
          or die "Timed out while waiting for standby 1 to catch up";
 
@@ -56,20 +56,25 @@ $node_standby->start;
 # Create some bloom index on master
 $node_master->psql("postgres", "CREATE EXTENSION bloom;");
 $node_master->psql("postgres", "CREATE TABLE tst (i int4, t text);");
-$node_master->psql("postgres", "INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,100000) i;");
-$node_master->psql("postgres", "CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3);");
+$node_master->psql("postgres",
+"INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,100000) i;"
+);
+$node_master->psql("postgres",
+       "CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3);");
 
 # Test that queries give same result
 test_index_replay('initial');
 
 # Run 10 cycles of table modification. Run test queries after each modification.
-for my $i (1..10)
+for my $i (1 .. 10)
 {
        $node_master->psql("postgres", "DELETE FROM tst WHERE i = $i;");
        test_index_replay("delete $i");
        $node_master->psql("postgres", "VACUUM tst;");
        test_index_replay("vacuum $i");
        my ($start, $end) = (100001 + ($i - 1) * 10000, 100000 + $i * 10000);
-       $node_master->psql("postgres", "INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series($start,$end) i;");
+       $node_master->psql("postgres",
+"INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series($start,$end) i;"
+       );
        test_index_replay("insert $i");
 }
index c22fbb6cbb2b6658c57a326bfe80fe18a9f3338f..f79d17ca7034b60ec08247dac52ed537cc2acc41 100644 (file)
@@ -7,7 +7,7 @@ use warnings;
 use strict;
 
 my $lastlockidx = -1;
-my $continue = "\n";
+my $continue    = "\n";
 
 open my $lwlocknames, $ARGV[0] or die;
 
@@ -18,7 +18,7 @@ open H, '>', $htmp or die "Could not open $htmp: $!";
 open C, '>', $ctmp or die "Could not open $ctmp: $!";
 
 my $autogen =
-       "/* autogenerated from src/backend/storage/lmgr/lwlocknames.txt, do not edit */\n";
+"/* autogenerated from src/backend/storage/lmgr/lwlocknames.txt, do not edit */\n";
 print H $autogen;
 print H "/* there is deliberately not an #ifndef LWLOCKNAMES_H here */\n\n";
 print C $autogen, "\n";
@@ -38,7 +38,7 @@ while (<$lwlocknames>)
 
        (my $lockname, my $lockidx) = ($1, $2);
 
-       die "lwlocknames.txt not in order" if $lockidx < $lastlockidx;
+       die "lwlocknames.txt not in order"   if $lockidx < $lastlockidx;
        die "lwlocknames.txt has duplicates" if $lockidx == $lastlockidx;
 
        while ($lastlockidx < $lockidx - 1)
@@ -49,7 +49,7 @@ while (<$lwlocknames>)
        }
        printf C "%s    \"%s\"", $continue, $lockname;
        $lastlockidx = $lockidx;
-       $continue = ",\n";
+       $continue    = ",\n";
 
        print H "#define $lockname (&MainLWLockArray[$lockidx].lock)\n";
 }
index 0499a4cbc97241675e16fb626cd5c4749cfc7e40..318d828c2992de65c2f98a87e7cee774c2abe1a8 100644 (file)
@@ -224,6 +224,7 @@ sub printQ()
        {
                if (ref($q))
                {
+
                        # flush open w files so that reading this file gets it all
                        if (exists($wFiles{$$q}) && $wFiles{$$q} ne '')
                        {
index de05649a33e331137fcd2a5e40c3760ef9d757e7..10e54b157d266199cd8b2a9ebfdcdaa712ae3217 100755 (executable)
@@ -54,8 +54,8 @@ while (<FILE>)
                        || (   ($code >= 0x879a)
                                && ($code <= 0x879c)))
                {
-                       printf STDERR
-                         "Warning: duplicate UTF8: UCS=0x%04x SJIS=0x%04x\n", $ucs,
+                       printf STDERR "Warning: duplicate UTF8: UCS=0x%04x SJIS=0x%04x\n",
+                         $ucs,
                          $code;
                        next;
                }
index f4769bf535d725118681b9a9644f3c02ceba92dd..6c33936d25f02a1d34e3ceabb3c620641ebea10c 100644 (file)
@@ -114,7 +114,8 @@ SKIP:
        mkdir "$tempdir/tblspc1";
        $node->safe_psql('postgres',
                "CREATE TABLESPACE tblspc1 LOCATION '$shorter_tempdir/tblspc1';");
-       $node->safe_psql('postgres', "CREATE TABLE test1 (a int) TABLESPACE tblspc1;");
+       $node->safe_psql('postgres',
+               "CREATE TABLE test1 (a int) TABLESPACE tblspc1;");
        $node->command_ok([ 'pg_basebackup', '-D', "$tempdir/tarbackup2", '-Ft' ],
                'tar format with tablespaces');
        ok(-f "$tempdir/tarbackup2/base.tar", 'backup tar was created');
index 1411ef7a271535d44d4f26e17eb56b59c26af45c..6d545b29e21d44980b399ffe26b32e2f061c1aa6 100644 (file)
@@ -23,14 +23,22 @@ program_options_handling_ok('pg_dump');
 command_exit_is([ 'pg_dump', 'qqq', 'abc' ],
        1, 'pg_dump: too many command-line arguments (first is "asd")');
 
-command_exit_is([ 'pg_dump', '-s', '-a' ],
-       1, 'pg_dump: options -s/--schema-only and -a/--data-only cannot be used together');
-
-command_exit_is([ 'pg_dump', '-c', '-a' ],
-       1, 'pg_dump: options -c/--clean and -a/--data-only cannot be used together');
-
-command_exit_is([ 'pg_dump', '--inserts', '-o' ],
-       1, 'pg_dump: options --inserts/--column-inserts and -o/--oids cannot be used together');
+command_exit_is(
+       [ 'pg_dump', '-s', '-a' ],
+       1,
+'pg_dump: options -s/--schema-only and -a/--data-only cannot be used together'
+);
+
+command_exit_is(
+       [ 'pg_dump', '-c', '-a' ],
+       1,
+       'pg_dump: options -c/--clean and -a/--data-only cannot be used together');
+
+command_exit_is(
+       [ 'pg_dump', '--inserts', '-o' ],
+       1,
+'pg_dump: options --inserts/--column-inserts and -o/--oids cannot be used together'
+);
 
 command_exit_is([ 'pg_dump', '--if-exists' ],
        1, 'pg_dump: option --if-exists requires option -c/--clean');
index 3c6859912f34708eaadd9efefbff5f044936d72b..fd4b9e80a2437aafa693e353c19e6a1ff337c47d 100644 (file)
@@ -42,242 +42,146 @@ my %pgdump_runs = (
                        '-f', "$tempdir/binary_upgrade.sql",
                        '--schema-only',
                        '--binary-upgrade',
-                       '-d', 'postgres', # alternative way to specify database
-               ],
-       },
+                       '-d', 'postgres',    # alternative way to specify database
+               ], },
        clean => {
                dump_cmd => [
                        'pg_dump',
                        '-f', "$tempdir/clean.sql",
                        '-c',
-                       '-d', 'postgres', # alternative way to specify database
-               ],
-       },
+                       '-d', 'postgres',    # alternative way to specify database
+               ], },
        clean_if_exists => {
                dump_cmd => [
                        'pg_dump',
                        '-f', "$tempdir/clean_if_exists.sql",
                        '-c',
                        '--if-exists',
-                       '-E', 'UTF8', # no-op, just tests that option is accepted
-                       'postgres',
-               ],
-       },
+                       '-E', 'UTF8',        # no-op, just tests that option is accepted
+                       'postgres', ], },
        column_inserts => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/column_inserts.sql",
-                       '-a',
-                       '--column-inserts',
-                       'postgres',
-               ],
-       },
+                       'pg_dump',                     '-f',
+                       "$tempdir/column_inserts.sql", '-a',
+                       '--column-inserts',            'postgres', ], },
        createdb => {
                dump_cmd => [
                        'pg_dump',
                        '-f', "$tempdir/createdb.sql",
                        '-C',
-                       '-R', # no-op, just for testing
-                       'postgres',
-               ],
-       },
+                       '-R',                # no-op, just for testing
+                       'postgres', ], },
        data_only => {
                dump_cmd => [
                        'pg_dump',
                        '-f', "$tempdir/data_only.sql",
                        '-a',
-                       '-v', # no-op, just make sure it works
-                       'postgres',
-               ],
-       },
+                       '-v',                # no-op, just make sure it works
+                       'postgres', ], },
        defaults => {
-               dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/defaults.sql",
-                       'postgres',
-               ],
+               dump_cmd => [ 'pg_dump', '-f', "$tempdir/defaults.sql", 'postgres', ],
        },
        defaults_custom_format => {
                test_key => 'defaults',
                dump_cmd => [
-                       'pg_dump',
-                       '-Fc',
-                       '-Z6',
-                       '-f', "$tempdir/defaults_custom_format.dump",
-                       'postgres',
-               ],
+                       'pg_dump', '-Fc', '-Z6', '-f',
+                       "$tempdir/defaults_custom_format.dump", 'postgres', ],
                restore_cmd => [
                        'pg_restore',
-                       '-f', "$tempdir/defaults_custom_format.sql",
-                       "$tempdir/defaults_custom_format.dump",
-               ],
-       },
+                       '-f',
+                       "$tempdir/defaults_custom_format.sql",
+                       "$tempdir/defaults_custom_format.dump", ], },
        defaults_dir_format => {
                test_key => 'defaults',
                dump_cmd => [
-                       'pg_dump',
-                       '-Fd',
-                       '-f', "$tempdir/defaults_dir_format",
-                       'postgres',
-               ],
+                       'pg_dump', '-Fd', '-f', "$tempdir/defaults_dir_format",
+                       'postgres', ],
                restore_cmd => [
                        'pg_restore',
-                       '-f', "$tempdir/defaults_dir_format.sql",
-                       "$tempdir/defaults_dir_format",
-               ],
-       },
+                       '-f',
+                       "$tempdir/defaults_dir_format.sql",
+                       "$tempdir/defaults_dir_format", ], },
        defaults_parallel => {
                test_key => 'defaults',
                dump_cmd => [
-                       'pg_dump',
-                       '-Fd',
-                       '-j2',
-                       '-f', "$tempdir/defaults_parallel",
-                       'postgres',
-               ],
+                       'pg_dump', '-Fd', '-j2', '-f', "$tempdir/defaults_parallel",
+                       'postgres', ],
                restore_cmd => [
-                       'pg_restore',
-                       '-f', "$tempdir/defaults_parallel.sql",
-                       "$tempdir/defaults_parallel",
-               ],
+                       'pg_restore',                     '-f',
+                       "$tempdir/defaults_parallel.sql", "$tempdir/defaults_parallel", ],
        },
        defaults_tar_format => {
                test_key => 'defaults',
                dump_cmd => [
-                       'pg_dump',
-                       '-Ft',
-                       '-f', "$tempdir/defaults_tar_format.tar",
-                       'postgres',
-               ],
+                       'pg_dump', '-Ft', '-f', "$tempdir/defaults_tar_format.tar",
+                       'postgres', ],
                restore_cmd => [
                        'pg_restore',
-                       '-f', "$tempdir/defaults_tar_format.sql",
-                       "$tempdir/defaults_tar_format.tar",
-               ],
-       },
+                       '-f',
+                       "$tempdir/defaults_tar_format.sql",
+                       "$tempdir/defaults_tar_format.tar", ], },
        exclude_dump_test_schema => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/exclude_dump_test_schema.sql",
-                       '-N', 'dump_test',
-                       'postgres',
-               ],
-       },
+                       'pg_dump', '-f', "$tempdir/exclude_dump_test_schema.sql",
+                       '-N', 'dump_test', 'postgres', ], },
        exclude_test_table => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/exclude_test_table.sql",
-                       '-T', 'dump_test.test_table',
-                       'postgres',
-               ],
-       },
+                       'pg_dump',                         '-f',
+                       "$tempdir/exclude_test_table.sql", '-T',
+                       'dump_test.test_table',            'postgres', ], },
        exclude_test_table_data => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/exclude_test_table_data.sql",
-                       '--exclude-table-data=dump_test.test_table',
-                       'postgres',
-               ],
-       },
+                       'pg_dump', '-f',
+                       "$tempdir/exclude_test_table_data.sql",
+                       '--exclude-table-data=dump_test.test_table', 'postgres', ], },
        pg_dumpall_globals => {
-               dump_cmd => [
-                       'pg_dumpall',
-                       '-f', "$tempdir/pg_dumpall_globals.sql",
-                       '-g',
-               ],
-       },
+               dump_cmd =>
+                 [ 'pg_dumpall', '-f', "$tempdir/pg_dumpall_globals.sql", '-g', ], },
        pg_dumpall_globals_clean => {
                dump_cmd => [
-                       'pg_dumpall',
-                       '-f', "$tempdir/pg_dumpall_globals_clean.sql",
-                       '-g',
-                       '-c',
-               ],
-       },
+                       'pg_dumpall', '-f', "$tempdir/pg_dumpall_globals_clean.sql",
+                       '-g', '-c', ], },
        no_privs => {
-               dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/no_privs.sql",
-                       '-x',
-                       'postgres',
-               ],
-       },
+               dump_cmd =>
+                 [ 'pg_dump', '-f', "$tempdir/no_privs.sql", '-x', 'postgres', ], },
        no_owner => {
-               dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/no_owner.sql",
-                       '-O',
-                       'postgres',
-               ],
-       },
+               dump_cmd =>
+                 [ 'pg_dump', '-f', "$tempdir/no_owner.sql", '-O', 'postgres', ], },
        only_dump_test_schema => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/only_dump_test_schema.sql",
-                       '-n', 'dump_test',
-                       'postgres',
-               ],
-       },
+                       'pg_dump', '-f', "$tempdir/only_dump_test_schema.sql",
+                       '-n', 'dump_test', 'postgres', ], },
        only_dump_test_table => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/only_dump_test_table.sql",
-                       '-t', 'dump_test.test_table',
-                       '--lock-wait-timeout=1000000',
-                       'postgres',
-               ],
-       },
+                       'pg_dump', '-f', "$tempdir/only_dump_test_table.sql",
+                       '-t', 'dump_test.test_table', '--lock-wait-timeout=1000000',
+                       'postgres', ], },
        role => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/role.sql",
-                       '--role=dump_test',
-                       '--schema=dump_test_second_schema',
-                       'postgres',
-               ],
-       },
+                       'pg_dump',                          '-f',
+                       "$tempdir/role.sql",                '--role=dump_test',
+                       '--schema=dump_test_second_schema', 'postgres', ], },
        schema_only => {
-               dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/schema_only.sql",
-                       '-s',
-                       'postgres',
-               ],
+               dump_cmd =>
+                 [ 'pg_dump', '-f', "$tempdir/schema_only.sql", '-s', 'postgres', ],
        },
        section_pre_data => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/section_pre_data.sql",
-                       '--section=pre-data',
-                       'postgres',
-               ],
-       },
+                       'pg_dump', '-f', "$tempdir/section_pre_data.sql",
+                       '--section=pre-data', 'postgres', ], },
        section_data => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/section_data.sql",
-                       '--section=data',
-                       'postgres',
-               ],
-       },
+                       'pg_dump',                   '-f',
+                       "$tempdir/section_data.sql", '--section=data',
+                       'postgres', ], },
        section_post_data => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/section_post_data.sql",
-                       '--section=post-data',
-                       'postgres',
-               ],
-       },
+                       'pg_dump', '-f', "$tempdir/section_post_data.sql",
+                       '--section=post-data', 'postgres', ], },
        test_schema_plus_blobs => {
                dump_cmd => [
-                       'pg_dump',
-                       '-f', "$tempdir/test_schema_plus_blobs.sql",
-                       '-n', 'dump_test',
-                       '-b',
-                       'postgres',
-               ],
-       },
-);
+                       'pg_dump', '-f', "$tempdir/test_schema_plus_blobs.sql",
+                       '-n', 'dump_test', '-b', 'postgres', ], },);
 
 ###############################################################
 # Definition of the tests to run.
@@ -319,7 +223,7 @@ my %pgdump_runs = (
 my %tests = (
        'ALTER DEFAULT PRIVILEGES FOR ROLE dump_test' => {
                create_order => 14,
-               create_sql => 'ALTER DEFAULT PRIVILEGES
+               create_sql   => 'ALTER DEFAULT PRIVILEGES
                                           FOR ROLE dump_test IN SCHEMA dump_test
                                           GRANT SELECT ON TABLES TO dump_test;',
                regexp => qr/^
@@ -328,28 +232,25 @@ my %tests = (
                        \QGRANT SELECT ON TABLES  TO dump_test;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       no_privs => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       no_privs                 => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_pre_data => 1,
-                       section_data => 1,
-               },
-       },
+                       section_pre_data         => 1,
+                       section_data             => 1, }, },
        'ALTER ROLE dump_test' => {
                regexp => qr/^
                        \QALTER ROLE dump_test WITH \E
@@ -357,483 +258,427 @@ my %tests = (
                        \QNOREPLICATION NOBYPASSRLS;\E
                        /xm,
                like => {
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-               unlike => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, },
+               unlike => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1,
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'ALTER FUNCTION dump_test.pltestlang_call_handler() OWNER TO' => {
                regexp => qr/^
                        \QALTER FUNCTION dump_test.pltestlang_call_handler() \E
                        \QOWNER TO \E
                        .*;/xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+                       only_dump_test_table     => 1, }, },
        'ALTER PROCEDURAL LANGUAGE pltestlang OWNER TO' => {
                regexp => qr/^ALTER PROCEDURAL LANGUAGE pltestlang OWNER TO .*;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       test_schema_plus_blobs => 1, }, },
        'ALTER SCHEMA dump_test OWNER TO' => {
                regexp => qr/^ALTER SCHEMA dump_test OWNER TO .*;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       only_dump_test_table     => 1, }, },
        'ALTER SCHEMA dump_test_second_schema OWNER TO' => {
                regexp => qr/^ALTER SCHEMA dump_test_second_schema OWNER TO .*;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       test_schema_plus_blobs => 1, }, },
        'ALTER TABLE ONLY test_table ADD CONSTRAINT ... PRIMARY KEY' => {
                regexp => qr/^
                        \QALTER TABLE ONLY test_table\E \n^\s+
                        \QADD CONSTRAINT test_table_pkey PRIMARY KEY (col1);\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       section_pre_data => 1,
-                       section_data => 1,
-               },
-       },
+                       exclude_test_table       => 1,
+                       section_pre_data         => 1,
+                       section_data             => 1, }, },
        'ALTER TABLE test_table OWNER TO' => {
                regexp => qr/^ALTER TABLE test_table OWNER TO .*;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1, }, },
        'ALTER TABLE test_table ENABLE ROW LEVEL SECURITY' => {
                create_order => 23,
-               create_sql => 'ALTER TABLE dump_test.test_table
+               create_sql   => 'ALTER TABLE dump_test.test_table
                                           ENABLE ROW LEVEL SECURITY;',
                regexp => qr/^ALTER TABLE test_table ENABLE ROW LEVEL SECURITY;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1, }, },
        'ALTER TABLE test_second_table OWNER TO' => {
                regexp => qr/^ALTER TABLE test_second_table OWNER TO .*;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       only_dump_test_table     => 1, }, },
        'ALTER TABLE test_third_table OWNER TO' => {
                regexp => qr/^ALTER TABLE test_third_table OWNER TO .*;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       test_schema_plus_blobs => 1, }, },
+
        # catch-all for ALTER ... OWNER (except LARGE OBJECTs)
        'ALTER ... OWNER commands (except LARGE OBJECTs)' => {
                regexp => qr/^ALTER (?!LARGE OBJECT)(.*) OWNER TO .*;/m,
-               like => { }, # use more-specific options above
+               like   => {},    # use more-specific options above
                unlike => {
                        column_inserts => 1,
-                       data_only => 1,
-                       section_data => 1,
-               },
-       },
+                       data_only      => 1,
+                       section_data   => 1, }, },
+
        # catch-all for ALTER TABLE ...
        'ALTER TABLE ... commands' => {
                regexp => qr/^ALTER TABLE .*;/m,
-               like => { }, # use more-specific options above
+               like   => {},                      # use more-specific options above
                unlike => {
-                       column_inserts => 1,
-                       data_only => 1,
-                       pg_dumpall_globals => 1,
+                       column_inserts           => 1,
+                       data_only                => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_data => 1,
-               },
-       },
+                       section_data             => 1, }, },
+
        # catch-all for ALTER ... OWNER
        'ALTER ... OWNER commands' => {
                regexp => qr/^ALTER .* OWNER TO .*;/m,
-               like => { }, # use more-specific options above
+               like   => {},                      # use more-specific options above
                unlike => {
-                       no_owner => 1,
-                       pg_dumpall_globals => 1,
+                       no_owner                 => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
-#      'BLOB load (contents are of test_table)' => {
-#              create_order => 14,
-#              create_sql =>
-#                  "\\o '$tempdir/large_object_test.sql'\n"
-#                . "table dump_test.test_table;\n"
-#                . "\\o\n"
-#                . "\\lo_import '$tempdir/large_object_test.sql'\n",
-#              regexp => qr/^
-#                      \QSELECT pg_catalog.lo_open\E \('\d+',\ \d+\);\n
-#                      \QSELECT pg_catalog.lowrite(0, \E
-#                      \Q'\x310a320a330a340a350a360a370a380a390a');\E\n
-#                      \QSELECT pg_catalog.lo_close(0);\E
-#                      /xm,
-#              like => {
-#                      clean => 1,
-#                      clean_if_exists => 1,
-#                      createdb => 1,
-#                      defaults => 1,
-#                      exclude_dump_test_schema => 1,
-#                      exclude_test_table => 1,
-#                      exclude_test_table_data => 1,
-#                      no_privs => 1,
-#                      section_data => 1,
-#                      test_schema_plus_blobs => 1,
-#              },
-#              unlike => {
-#                      binary_upgrade => 1,
-#                      only_dump_test_schema => 1,
-#                      only_dump_test_table => 1,
-#                      pg_dumpall_globals => 1,
-#                      schema_only => 1,
-#                      section_post_data => 1,
-#              },
-#      },
+                       section_post_data        => 1, }, },
+
+       #       'BLOB load (contents are of test_table)' => {
+       #               create_order => 14,
+       #               create_sql =>
+       #                   "\\o '$tempdir/large_object_test.sql'\n"
+       #                 . "table dump_test.test_table;\n"
+       #                 . "\\o\n"
+       #                 . "\\lo_import '$tempdir/large_object_test.sql'\n",
+       #               regexp => qr/^
+       #                       \QSELECT pg_catalog.lo_open\E \('\d+',\ \d+\);\n
+       #                       \QSELECT pg_catalog.lowrite(0, \E
+       #                       \Q'\x310a320a330a340a350a360a370a380a390a');\E\n
+       #                       \QSELECT pg_catalog.lo_close(0);\E
+       #                       /xm,
+       #               like => {
+       #                       clean => 1,
+       #                       clean_if_exists => 1,
+       #                       createdb => 1,
+       #                       defaults => 1,
+       #                       exclude_dump_test_schema => 1,
+       #                       exclude_test_table => 1,
+       #                       exclude_test_table_data => 1,
+       #                       no_privs => 1,
+       #                       section_data => 1,
+       #                       test_schema_plus_blobs => 1,
+       #               },
+       #               unlike => {
+       #                       binary_upgrade => 1,
+       #                       only_dump_test_schema => 1,
+       #                       only_dump_test_table => 1,
+       #                       pg_dumpall_globals => 1,
+       #                       schema_only => 1,
+       #                       section_post_data => 1,
+       #               },
+       #       },
        'COMMENT ON DATABASE postgres' => {
                regexp => qr/^COMMENT ON DATABASE postgres IS .*;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema => 1,
+                       only_dump_test_table  => 1, }, },
        'COMMENT ON EXTENSION plpgsql' => {
                regexp => qr/^COMMENT ON EXTENSION plpgsql IS .*;/m,
-               like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       binary_upgrade => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+               like   => {
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       binary_upgrade        => 1,
+                       only_dump_test_schema => 1,
+                       only_dump_test_table  => 1, }, },
        'COMMENT ON TABLE dump_test.test_table' => {
                create_order => 36,
-               create_sql => 'COMMENT ON TABLE dump_test.test_table
+               create_sql   => 'COMMENT ON TABLE dump_test.test_table
                                           IS \'comment on table\';',
                regexp => qr/^COMMENT ON TABLE test_table IS 'comment on table';/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1, }, },
        'COMMENT ON COLUMN dump_test.test_table.col1' => {
                create_order => 36,
-               create_sql => 'COMMENT ON COLUMN dump_test.test_table.col1
+               create_sql   => 'COMMENT ON COLUMN dump_test.test_table.col1
                                           IS \'comment on column\';',
                regexp => qr/^
                        \QCOMMENT ON COLUMN test_table.col1 IS 'comment on column';\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-               },
-       },
+                       exclude_test_table       => 1, }, },
        'COMMENT ON COLUMN dump_test.composite.f1' => {
                create_order => 44,
-               create_sql => 'COMMENT ON COLUMN dump_test.composite.f1
+               create_sql   => 'COMMENT ON COLUMN dump_test.composite.f1
                                           IS \'comment on column of type\';',
                regexp => qr/^
                        \QCOMMENT ON COLUMN composite.f1 IS 'comment on column of type';\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+                       only_dump_test_table     => 1, }, },
+
        # catch-all for COMMENTs
        'COMMENT commands' => {
                regexp => qr/^COMMENT ON /m,
-               like => { }, # use more-specific options above
+               like   => {},                  # use more-specific options above
                unlike => {
-                       column_inserts => 1,
-                       data_only => 1,
-                       pg_dumpall_globals => 1,
+                       column_inserts           => 1,
+                       data_only                => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_data => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_data             => 1,
+                       section_post_data        => 1, }, },
        'COPY test_table' => {
                create_order => 4,
-               create_sql =>
-                   'INSERT INTO dump_test.test_table (col1) '
+               create_sql   => 'INSERT INTO dump_test.test_table (col1) '
                  . 'SELECT generate_series FROM generate_series(1,9);',
                regexp => qr/^
                        \QCOPY test_table (col1) FROM stdin;\E
                        \n(?:\d\n){9}\\\.\n
                        /xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       section_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-               },
-       },
+                       clean                  => 1,
+                       clean_if_exists        => 1,
+                       createdb               => 1,
+                       data_only              => 1,
+                       defaults               => 1,
+                       no_privs               => 1,
+                       no_owner               => 1,
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       section_data           => 1,
+                       test_schema_plus_blobs => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1, }, },
        'COPY fk_reference_test_table' => {
                create_order => 22,
-               create_sql =>
-                   'INSERT INTO dump_test.fk_reference_test_table (col1) '
+               create_sql => 'INSERT INTO dump_test.fk_reference_test_table (col1) '
                  . 'SELECT generate_series FROM generate_series(1,5);',
                regexp => qr/^
                        \QCOPY fk_reference_test_table (col1) FROM stdin;\E
                        \n(?:\d\n){5}\\\.\n
                        /xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       data_only               => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       section_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       section_data            => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+                       only_dump_test_table     => 1, }, },
        'COPY fk_reference_test_table second' => {
                regexp => qr/^
                        \QCOPY test_table (col1) FROM stdin;\E
@@ -841,19 +686,14 @@ my %tests = (
                        \QCOPY fk_reference_test_table (col1) FROM stdin;\E
                        \n(?:\d\n){5}\\\.\n
                        /xms,
-               like => {
-                       data_only => 1,
-               },
+               like   => { data_only => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-               },
-       },
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1, }, },
        'COPY test_second_table' => {
                create_order => 7,
-               create_sql =>
-                   'INSERT INTO dump_test.test_second_table (col1, col2) '
+               create_sql => 'INSERT INTO dump_test.test_second_table (col1, col2) '
                  . 'SELECT generate_series, generate_series::text '
                  . 'FROM generate_series(1,9);',
                regexp => qr/^
@@ -861,220 +701,190 @@ my %tests = (
                        \n(?:\d\t\d\n){9}\\\.\n
                        /xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       data_only               => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       section_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       section_data            => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-               },
-       },
+                       only_dump_test_table     => 1, }, },
        'COPY test_third_table' => {
                create_order => 12,
                create_sql =>
-                       'INSERT INTO dump_test_second_schema.test_third_table (col1) '
+                 'INSERT INTO dump_test_second_schema.test_third_table (col1) '
                  . 'SELECT generate_series FROM generate_series(1,9);',
                regexp => qr/^
                        \QCOPY test_third_table (col1) FROM stdin;\E
                        \n(?:\d\n){9}\\\.\n
                        /xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       section_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       data_only                => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       section_data             => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       test_schema_plus_blobs => 1, }, },
        'INSERT INTO test_table' => {
                regexp => qr/^
                        (?:INSERT\ INTO\ test_table\ \(col1\)\ VALUES\ \(\d\);\n){9}
                        /xm,
-               like => {
-                       column_inserts => 1,
-               },
-               unlike => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       section_data => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+               like   => { column_inserts => 1, },
+               unlike => {
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       data_only                => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       section_data             => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'INSERT INTO test_second_table' => {
                regexp => qr/^
                        (?:INSERT\ INTO\ test_second_table\ \(col1,\ col2\)
                           \ VALUES\ \(\d,\ '\d'\);\n){9}/xm,
-               like => {
-                       column_inserts => 1,
-               },
-               unlike => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       section_data => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+               like   => { column_inserts => 1, },
+               unlike => {
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       data_only                => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       section_data             => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'INSERT INTO test_third_table' => {
                regexp => qr/^
                        (?:INSERT\ INTO\ test_third_table\ \(col1\)
                           \ VALUES\ \(\d\);\n){9}/xm,
-               like => {
-                       column_inserts => 1,
-               },
-               unlike => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       section_data => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
-       'COPY ... commands' => { # catch-all for COPY
+               like   => { column_inserts => 1, },
+               unlike => {
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       data_only                => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       section_data             => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       test_schema_plus_blobs   => 1, }, },
+       'COPY ... commands' => {    # catch-all for COPY
                regexp => qr/^COPY /m,
-               like => { }, # use more-specific options above
+               like   => {},            # use more-specific options above
                unlike => {
-                       binary_upgrade => 1,
-                       column_inserts => 1,
-                       pg_dumpall_globals => 1,
+                       binary_upgrade           => 1,
+                       column_inserts           => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-               },
-       },
+                       schema_only              => 1,
+                       section_post_data        => 1, }, },
        'CREATE ROLE dump_test' => {
                create_order => 1,
-               create_sql => 'CREATE ROLE dump_test;',
-               regexp => qr/^CREATE ROLE dump_test;/m,
-               like => {
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-               unlike => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+               create_sql   => 'CREATE ROLE dump_test;',
+               regexp       => qr/^CREATE ROLE dump_test;/m,
+               like         => {
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, },
+               unlike => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1,
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE DATABASE postgres' => {
                regexp => qr/^
                        \QCREATE DATABASE postgres WITH TEMPLATE = template0 \E
                        .*;/xm,
-               like => {
-                       createdb => 1,
-               },
-               unlike => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+               like   => { createdb => 1, },
+               unlike => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       schema_only              => 1,
+                       section_pre_data         => 1,
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE EXTENSION ... plpgsql' => {
                regexp => qr/^
                        \QCREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;\E
                        /xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       binary_upgrade => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       binary_upgrade           => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE AGGREGATE dump_test.newavg' => {
                create_order => 25,
-               create_sql => 'CREATE AGGREGATE dump_test.newavg (
+               create_sql   => 'CREATE AGGREGATE dump_test.newavg (
                                                  sfunc = int4_avg_accum,
                                                  basetype = int4,
                                                  stype = _int8,
@@ -1089,31 +899,28 @@ my %tests = (
                        \n\s+\QFINALFUNC = int8_avg\E
                        \n\);/xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE DOMAIN dump_test.us_postal_code' => {
                create_order => 29,
-               create_sql => 'CREATE DOMAIN dump_test.us_postal_code AS TEXT
+               create_sql   => 'CREATE DOMAIN dump_test.us_postal_code AS TEXT
                                           CHECK(VALUE ~ \'^\d{5}$\' OR
                                                         VALUE ~ \'^\d{5}-\d{4}$\');',
                regexp => qr/^
@@ -1125,31 +932,28 @@ my %tests = (
                        \Q'::text)));\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE FUNCTION dump_test.pltestlang_call_handler' => {
                create_order => 17,
-               create_sql => 'CREATE FUNCTION dump_test.pltestlang_call_handler()
+               create_sql   => 'CREATE FUNCTION dump_test.pltestlang_call_handler()
                                           RETURNS LANGUAGE_HANDLER AS \'$libdir/plpgsql\',
                                           \'plpgsql_call_handler\' LANGUAGE C;',
                regexp => qr/^
@@ -1160,31 +964,28 @@ my %tests = (
                        \Qlibdir\/plpgsql', 'plpgsql_call_handler';\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE FUNCTION dump_test.trigger_func' => {
                create_order => 30,
-               create_sql => 'CREATE FUNCTION dump_test.trigger_func()
+               create_sql   => 'CREATE FUNCTION dump_test.trigger_func()
                                           RETURNS trigger LANGUAGE plpgsql
                                           AS $$ BEGIN RETURN NULL; END;$$;',
                regexp => qr/^
@@ -1194,31 +995,28 @@ my %tests = (
                        \Q BEGIN RETURN NULL; END;\E
                        \$\$;/xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE FUNCTION dump_test.event_trigger_func' => {
                create_order => 32,
-               create_sql => 'CREATE FUNCTION dump_test.event_trigger_func()
+               create_sql   => 'CREATE FUNCTION dump_test.event_trigger_func()
                                           RETURNS event_trigger LANGUAGE plpgsql
                                           AS $$ BEGIN RETURN; END;$$;',
                regexp => qr/^
@@ -1228,31 +1026,28 @@ my %tests = (
                        \Q BEGIN RETURN; END;\E
                        \$\$;/xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE EVENT TRIGGER test_event_trigger' => {
                create_order => 33,
-               create_sql => 'CREATE EVENT TRIGGER test_event_trigger
+               create_sql   => 'CREATE EVENT TRIGGER test_event_trigger
                                           ON ddl_command_start
                                           EXECUTE PROCEDURE dump_test.event_trigger_func();',
                regexp => qr/^
@@ -1261,31 +1056,28 @@ my %tests = (
                        \n\s+\QEXECUTE PROCEDURE dump_test.event_trigger_func();\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_post_data        => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE TRIGGER test_trigger' => {
                create_order => 31,
-               create_sql => 'CREATE TRIGGER test_trigger
+               create_sql   => 'CREATE TRIGGER test_trigger
                                           BEFORE INSERT ON dump_test.test_table
                                           FOR EACH ROW WHEN (NEW.col1 > 10)
                                           EXECUTE PROCEDURE dump_test.trigger_func();',
@@ -1295,31 +1087,28 @@ my %tests = (
                        \QEXECUTE PROCEDURE trigger_func();\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-       },
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, }, },
        'CREATE TYPE dump_test.planets AS ENUM' => {
                create_order => 37,
-               create_sql => 'CREATE TYPE dump_test.planets
+               create_sql   => 'CREATE TYPE dump_test.planets
                                           AS ENUM ( \'venus\', \'earth\', \'mars\' );',
                regexp => qr/^
                        \QCREATE TYPE planets AS ENUM (\E
@@ -1328,27 +1117,24 @@ my %tests = (
                        \n\s+'mars'
                        \n\);/xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TYPE dump_test.planets AS ENUM pg_upgrade' => {
                regexp => qr/^
                        \QCREATE TYPE planets AS ENUM (\E
@@ -1359,32 +1145,28 @@ my %tests = (
                        \n.*^
                        \QALTER TYPE dump_test.planets ADD VALUE 'mars';\E
                        \n/xms,
-               like => {
-                       binary_upgrade => 1,
-               },
-               unlike => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-                       exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+               like   => { binary_upgrade => 1, },
+               unlike => {
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       only_dump_test_schema    => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1,
+                       test_schema_plus_blobs   => 1,
+                       exclude_dump_test_schema => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TYPE dump_test.textrange AS RANGE' => {
                create_order => 38,
-               create_sql => 'CREATE TYPE dump_test.textrange
+               create_sql   => 'CREATE TYPE dump_test.textrange
                                           AS RANGE (subtype=text, collation="C");',
                regexp => qr/^
                        \QCREATE TYPE textrange AS RANGE (\E
@@ -1392,56 +1174,50 @@ my %tests = (
                        \n\s+\Qcollation = pg_catalog."C"\E
                        \n\);/xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TYPE dump_test.int42' => {
                create_order => 39,
-               create_sql => 'CREATE TYPE dump_test.int42;',
-               regexp => qr/^CREATE TYPE int42;/m,
-               like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+               create_sql   => 'CREATE TYPE dump_test.int42;',
+               regexp       => qr/^CREATE TYPE int42;/m,
+               like         => {
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE FUNCTION dump_test.int42_in' => {
                create_order => 40,
-               create_sql => 'CREATE FUNCTION dump_test.int42_in(cstring)
+               create_sql   => 'CREATE FUNCTION dump_test.int42_in(cstring)
                                           RETURNS dump_test.int42 AS \'int4in\'
                                           LANGUAGE internal STRICT IMMUTABLE;',
                regexp => qr/^
@@ -1450,31 +1226,28 @@ my %tests = (
                        \n\s+AS\ \$\$int4in\$\$;
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE FUNCTION dump_test.int42_out' => {
                create_order => 41,
-               create_sql => 'CREATE FUNCTION dump_test.int42_out(dump_test.int42)
+               create_sql   => 'CREATE FUNCTION dump_test.int42_out(dump_test.int42)
                                           RETURNS cstring AS \'int4out\'
                                           LANGUAGE internal STRICT IMMUTABLE;',
                regexp => qr/^
@@ -1483,31 +1256,28 @@ my %tests = (
                        \n\s+AS\ \$\$int4out\$\$;
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TYPE dump_test.int42 populated' => {
                create_order => 42,
-               create_sql => 'CREATE TYPE dump_test.int42 (
+               create_sql   => 'CREATE TYPE dump_test.int42 (
                                                   internallength = 4,
                                                   input = dump_test.int42_in,
                                                   output = dump_test.int42_out,
@@ -1525,30 +1295,27 @@ my %tests = (
                        \n\s+PASSEDBYVALUE\n\);
                        /xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TYPE dump_test.composite' => {
                create_order => 43,
-               create_sql => 'CREATE TYPE dump_test.composite AS (
+               create_sql   => 'CREATE TYPE dump_test.composite AS (
                                                   f1 int,
                                                   f2 dump_test.int42
                                           );',
@@ -1559,83 +1326,74 @@ my %tests = (
                        \n\);
                        /xm,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE FOREIGN DATA WRAPPER dummy' => {
                create_order => 35,
-               create_sql => 'CREATE FOREIGN DATA WRAPPER dummy;',
-               regexp => qr/CREATE FOREIGN DATA WRAPPER dummy;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+               create_sql   => 'CREATE FOREIGN DATA WRAPPER dummy;',
+               regexp       => qr/CREATE FOREIGN DATA WRAPPER dummy;/m,
+               like         => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE SERVER s1 FOREIGN DATA WRAPPER dummy' => {
                create_order => 36,
-               create_sql => 'CREATE SERVER s1 FOREIGN DATA WRAPPER dummy;',
-               regexp => qr/CREATE SERVER s1 FOREIGN DATA WRAPPER dummy;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+               create_sql   => 'CREATE SERVER s1 FOREIGN DATA WRAPPER dummy;',
+               regexp       => qr/CREATE SERVER s1 FOREIGN DATA WRAPPER dummy;/m,
+               like         => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
 #######################################
-# Currently broken.
+       # Currently broken.
 #######################################
 #
 #      'CREATE TRANSFORM FOR int' => {
@@ -1666,38 +1424,35 @@ my %tests = (
 #      },
        'CREATE LANGUAGE pltestlang' => {
                create_order => 18,
-               create_sql => 'CREATE LANGUAGE pltestlang
+               create_sql   => 'CREATE LANGUAGE pltestlang
                                           HANDLER dump_test.pltestlang_call_handler;',
                regexp => qr/^
                        \QCREATE PROCEDURAL LANGUAGE pltestlang \E
                        \QHANDLER pltestlang_call_handler;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-                       only_dump_test_schema => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       section_post_data        => 1,
+                       only_dump_test_schema    => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE MATERIALIZED VIEW matview' => {
                create_order => 20,
-               create_sql => 'CREATE MATERIALIZED VIEW dump_test.matview (col1) AS
+               create_sql   => 'CREATE MATERIALIZED VIEW dump_test.matview (col1) AS
                                           SELECT * FROM dump_test.test_table;',
                regexp => qr/^
                        \QCREATE MATERIALIZED VIEW matview AS\E
@@ -1706,31 +1461,28 @@ my %tests = (
                        \n\s+\QWITH NO DATA;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE MATERIALIZED VIEW matview_second' => {
                create_order => 21,
-               create_sql => 'CREATE MATERIALIZED VIEW
+               create_sql   => 'CREATE MATERIALIZED VIEW
                                                   dump_test.matview_second (col1) AS
                                                   SELECT * FROM dump_test.matview;',
                regexp => qr/^
@@ -1740,31 +1492,28 @@ my %tests = (
                        \n\s+\QWITH NO DATA;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE POLICY p1 ON test_table' => {
                create_order => 22,
-               create_sql => 'CREATE POLICY p1 ON dump_test.test_table
+               create_sql   => 'CREATE POLICY p1 ON dump_test.test_table
                                                   USING (true)
                                                   WITH CHECK (true);',
                regexp => qr/^
@@ -1772,209 +1521,188 @@ my %tests = (
                        \QUSING (true) WITH CHECK (true);\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-       },
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, }, },
        'CREATE POLICY p2 ON test_table FOR SELECT' => {
                create_order => 24,
-               create_sql => 'CREATE POLICY p2 ON dump_test.test_table
+               create_sql   => 'CREATE POLICY p2 ON dump_test.test_table
                                                   FOR SELECT TO dump_test USING (true);',
                regexp => qr/^
                        \QCREATE POLICY p2 ON test_table FOR SELECT TO dump_test \E
                        \QUSING (true);\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-       },
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, }, },
        'CREATE POLICY p3 ON test_table FOR INSERT' => {
                create_order => 25,
-               create_sql => 'CREATE POLICY p3 ON dump_test.test_table
+               create_sql   => 'CREATE POLICY p3 ON dump_test.test_table
                                                   FOR INSERT TO dump_test WITH CHECK (true);',
                regexp => qr/^
                        \QCREATE POLICY p3 ON test_table FOR INSERT \E
                        \QTO dump_test WITH CHECK (true);\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-       },
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, }, },
        'CREATE POLICY p4 ON test_table FOR UPDATE' => {
                create_order => 26,
-               create_sql => 'CREATE POLICY p4 ON dump_test.test_table FOR UPDATE
+               create_sql   => 'CREATE POLICY p4 ON dump_test.test_table FOR UPDATE
                                                   TO dump_test USING (true) WITH CHECK (true);',
                regexp => qr/^
                        \QCREATE POLICY p4 ON test_table FOR UPDATE TO dump_test \E
                        \QUSING (true) WITH CHECK (true);\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-       },
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, }, },
        'CREATE POLICY p5 ON test_table FOR DELETE' => {
                create_order => 27,
-               create_sql => 'CREATE POLICY p5 ON dump_test.test_table
+               create_sql   => 'CREATE POLICY p5 ON dump_test.test_table
                                                   FOR DELETE TO dump_test USING (true);',
                regexp => qr/^
                        \QCREATE POLICY p5 ON test_table FOR DELETE \E
                        \QTO dump_test USING (true);\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       section_pre_data => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-       },
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_post_data       => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       section_pre_data         => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1,
+                       pg_dumpall_globals_clean => 1, }, },
        'CREATE SCHEMA dump_test' => {
                create_order => 2,
-               create_sql => 'CREATE SCHEMA dump_test;',
-               regexp => qr/^CREATE SCHEMA dump_test;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+               create_sql   => 'CREATE SCHEMA dump_test;',
+               regexp       => qr/^CREATE SCHEMA dump_test;/m,
+               like         => {
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE SCHEMA dump_test_second_schema' => {
                create_order => 9,
-               create_sql => 'CREATE SCHEMA dump_test_second_schema;',
-               regexp => qr/^CREATE SCHEMA dump_test_second_schema;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+               create_sql   => 'CREATE SCHEMA dump_test_second_schema;',
+               regexp       => qr/^CREATE SCHEMA dump_test_second_schema;/m,
+               like         => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE TABLE test_table' => {
                create_order => 3,
-               create_sql => 'CREATE TABLE dump_test.test_table (
+               create_sql   => 'CREATE TABLE dump_test.test_table (
                                                   col1 serial primary key,
                                                   CHECK (col1 <= 1000)
                                           );',
@@ -1985,31 +1713,28 @@ my %tests = (
                        \Q((col1 <= 1000))\E
                        \n\);/xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TABLE fk_reference_test_table' => {
                create_order => 21,
-               create_sql => 'CREATE TABLE dump_test.fk_reference_test_table (
+               create_sql   => 'CREATE TABLE dump_test.fk_reference_test_table (
                                                   col1 int primary key references dump_test.test_table
                                           );',
                regexp => qr/^
@@ -2018,31 +1743,28 @@ my %tests = (
                        \n\);
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TABLE test_second_table' => {
                create_order => 6,
-               create_sql => 'CREATE TABLE dump_test.test_second_table (
+               create_sql   => 'CREATE TABLE dump_test.test_second_table (
                                                   col1 int,
                                                   col2 text
                                           );',
@@ -2053,28 +1775,25 @@ my %tests = (
                        \n\);
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE TABLE test_third_table' => {
                create_order => 11,
                create_sql => 'CREATE TABLE dump_test_second_schema.test_third_table (
@@ -2086,28 +1805,25 @@ my %tests = (
                        \n\);
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE SEQUENCE test_table_col1_seq' => {
                regexp => qr/^
                        \QCREATE SEQUENCE test_table_col1_seq\E
@@ -2118,28 +1834,25 @@ my %tests = (
                        \n\s+\QCACHE 1;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       pg_dumpall_globals => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-               },
-       },
+                       section_post_data        => 1, }, },
        'CREATE SEQUENCE test_third_table_col1_seq' => {
                regexp => qr/^
                        \QCREATE SEQUENCE test_third_table_col1_seq\E
@@ -2150,430 +1863,311 @@ my %tests = (
                        \n\s+\QCACHE 1;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       section_post_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       section_post_data        => 1,
+                       test_schema_plus_blobs   => 1, }, },
        'CREATE UNIQUE INDEX test_third_table_idx ON test_third_table' => {
                create_order => 13,
-               create_sql => 'CREATE UNIQUE INDEX test_third_table_idx
+               create_sql   => 'CREATE UNIQUE INDEX test_third_table_idx
                                           ON dump_test_second_schema.test_third_table (col1);',
                regexp => qr/^
                        \QCREATE UNIQUE INDEX test_third_table_idx \E
                        \QON test_third_table USING btree (col1);\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_post_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_post_data        => 1, },
+               unlike => {
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
                        pg_dumpall_globals_clean => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
-       'CREATE ... commands' => { # catch-all for CREATE
+                       test_schema_plus_blobs   => 1, }, },
+       'CREATE ... commands' => {    # catch-all for CREATE
                regexp => qr/^CREATE /m,
-               like => { }, # use more-specific options above
+               like   => {},              # use more-specific options above
                unlike => {
                        column_inserts => 1,
-                       data_only => 1,
-                       section_data => 1,
-               },
-       },
+                       data_only      => 1,
+                       section_data   => 1, }, },
        'DROP EXTENSION plpgsql' => {
                regexp => qr/^DROP EXTENSION plpgsql;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP FUNCTION dump_test.pltestlang_call_handler()' => {
                regexp => qr/^DROP FUNCTION dump_test\.pltestlang_call_handler\(\);/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP LANGUAGE pltestlang' => {
                regexp => qr/^DROP PROCEDURAL LANGUAGE pltestlang;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP SCHEMA dump_test' => {
                regexp => qr/^DROP SCHEMA dump_test;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP SCHEMA dump_test_second_schema' => {
                regexp => qr/^DROP SCHEMA dump_test_second_schema;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP TABLE test_table' => {
                regexp => qr/^DROP TABLE dump_test\.test_table;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP TABLE fk_reference_test_table' => {
                regexp => qr/^DROP TABLE dump_test\.fk_reference_test_table;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP TABLE test_second_table' => {
                regexp => qr/^DROP TABLE dump_test\.test_second_table;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP TABLE test_third_table' => {
                regexp => qr/^DROP TABLE dump_test_second_schema\.test_third_table;/m,
-               like => {
-                       clean => 1,
-               },
-               unlike => {
-                       clean_if_exists => 1,
-               },
-       },
+               like   => { clean => 1, },
+               unlike => { clean_if_exists => 1, }, },
        'DROP EXTENSION IF EXISTS plpgsql' => {
                regexp => qr/^DROP EXTENSION IF EXISTS plpgsql;/m,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean => 1, }, },
        'DROP FUNCTION IF EXISTS dump_test.pltestlang_call_handler()' => {
                regexp => qr/^
                        \QDROP FUNCTION IF EXISTS dump_test.pltestlang_call_handler();\E
                        /xm,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean           => 1, }, },
        'DROP LANGUAGE IF EXISTS pltestlang' => {
                regexp => qr/^DROP PROCEDURAL LANGUAGE IF EXISTS pltestlang;/m,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean => 1, }, },
        'DROP SCHEMA IF EXISTS dump_test' => {
                regexp => qr/^DROP SCHEMA IF EXISTS dump_test;/m,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean => 1, }, },
        'DROP SCHEMA IF EXISTS dump_test_second_schema' => {
                regexp => qr/^DROP SCHEMA IF EXISTS dump_test_second_schema;/m,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean => 1, }, },
        'DROP TABLE IF EXISTS test_table' => {
                regexp => qr/^DROP TABLE IF EXISTS dump_test\.test_table;/m,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean => 1, }, },
        'DROP TABLE IF EXISTS test_second_table' => {
                regexp => qr/^DROP TABLE IF EXISTS dump_test\.test_second_table;/m,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean => 1, }, },
        'DROP TABLE IF EXISTS test_third_table' => {
                regexp => qr/^
                        \QDROP TABLE IF EXISTS dump_test_second_schema.test_third_table;\E
                        /xm,
-               like => {
-                       clean_if_exists => 1,
-               },
-               unlike => {
-                       clean => 1,
-               },
-       },
+               like   => { clean_if_exists => 1, },
+               unlike => { clean           => 1, }, },
        'DROP ROLE dump_test' => {
                regexp => qr/^
                        \QDROP ROLE dump_test;\E
                        /xm,
-               like => {
-                       pg_dumpall_globals_clean => 1,
-               },
+               like   => { pg_dumpall_globals_clean => 1, },
                unlike => {
-                       clean => 1,
-                       clean_if_exists => 1,
-               },
-       },
+                       clean           => 1,
+                       clean_if_exists => 1, }, },
        'DROP ROLE pg_' => {
                regexp => qr/^
                        \QDROP ROLE pg_\E.*;
                        /xm,
-               like => {
-               },
+               like   => {},
                unlike => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       pg_dumpall_globals_clean => 1,
-               },
-       },
-       'DROP ... commands' => { # catch-all for DROP
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       pg_dumpall_globals_clean => 1, }, },
+       'DROP ... commands' => {    # catch-all for DROP
                regexp => qr/^DROP /m,
-               like => { }, # use more-specific options above
-               unlike => {
-                       binary_upgrade => 1,
-                       column_inserts => 1,
-                       createdb => 1,
-                       data_only => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       schema_only => 1,
-               },
-       },
+               like   => {},            # use more-specific options above
+               unlike => {
+                       binary_upgrade           => 1,
+                       column_inserts           => 1,
+                       createdb                 => 1,
+                       data_only                => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_privs                 => 1,
+                       no_owner                 => 1,
+                       only_dump_test_schema    => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
+                       schema_only              => 1, }, },
        'GRANT USAGE ON SCHEMA dump_test_second_schema' => {
                create_order => 10,
-               create_sql => 'GRANT USAGE ON SCHEMA dump_test_second_schema
+               create_sql   => 'GRANT USAGE ON SCHEMA dump_test_second_schema
                                                   TO dump_test;',
                regexp => qr/^
                        \QGRANT USAGE ON SCHEMA dump_test_second_schema TO dump_test;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       pg_dumpall_globals     => 1,
+                       test_schema_plus_blobs => 1, }, },
        'GRANT SELECT ON TABLE test_table' => {
                create_order => 5,
-               create_sql => 'GRANT SELECT ON TABLE dump_test.test_table
+               create_sql   => 'GRANT SELECT ON TABLE dump_test.test_table
                                                   TO dump_test;',
                regexp => qr/^GRANT SELECT ON TABLE test_table TO dump_test;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table_data => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
-               unlike => {
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       pg_dumpall_globals => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table_data => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       only_dump_test_table    => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
+               unlike => {
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       pg_dumpall_globals       => 1, }, },
        'GRANT SELECT ON TABLE test_third_table' => {
                create_order => 19,
-               create_sql => 'GRANT SELECT ON
+               create_sql   => 'GRANT SELECT ON
                                                   TABLE dump_test_second_schema.test_third_table
                                                   TO dump_test;',
                regexp => qr/^GRANT SELECT ON TABLE test_third_table TO dump_test;/m,
-               like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+               like   => {
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       pg_dumpall_globals     => 1,
+                       test_schema_plus_blobs => 1, }, },
        'GRANT ALL ON SEQUENCE test_third_table_col1_seq' => {
                create_order => 28,
-               create_sql => 'GRANT ALL ON SEQUENCE
+               create_sql   => 'GRANT ALL ON SEQUENCE
                                                   dump_test_second_schema.test_third_table_col1_seq
                                                   TO dump_test;',
                regexp => qr/^
                        \QGRANT ALL ON SEQUENCE test_third_table_col1_seq TO dump_test;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       pg_dumpall_globals     => 1,
+                       test_schema_plus_blobs => 1, }, },
        'GRANT INSERT(col1) ON TABLE test_second_table' => {
                create_order => 8,
-               create_sql => 'GRANT INSERT (col1) ON TABLE dump_test.test_second_table
+               create_sql =>
+                 'GRANT INSERT (col1) ON TABLE dump_test.test_second_table
                                                   TO dump_test;',
                regexp => qr/^
                        \QGRANT INSERT(col1) ON TABLE test_second_table TO dump_test;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       binary_upgrade          => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-                       test_schema_plus_blobs => 1,
-               },
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       schema_only             => 1,
+                       section_pre_data        => 1,
+                       test_schema_plus_blobs  => 1, },
                unlike => {
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
-               },
-       },
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1, }, },
        'GRANT EXECUTE ON FUNCTION pg_sleep() TO dump_test' => {
                create_order => 16,
-               create_sql => 'GRANT EXECUTE ON FUNCTION pg_sleep(float8)
+               create_sql   => 'GRANT EXECUTE ON FUNCTION pg_sleep(float8)
                                                   TO dump_test;',
                regexp => qr/^
                        \QGRANT ALL ON FUNCTION pg_sleep(double precision) TO dump_test;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       test_schema_plus_blobs => 1, }, },
        'GRANT SELECT (proname ...) ON TABLE pg_proc TO public' => {
                create_order => 46,
-               create_sql => 'GRANT SELECT (
+               create_sql   => 'GRANT SELECT (
                                                   tableoid,
                                                   oid,
                                                   proname,
@@ -2639,58 +2233,50 @@ my %tests = (
                \QGRANT SELECT(proconfig) ON TABLE pg_proc TO PUBLIC;\E\n.*
                \QGRANT SELECT(proacl) ON TABLE pg_proc TO PUBLIC;\E/xms,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
-       'GRANT commands' => { # catch-all for GRANT commands
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+                       exclude_dump_test_schema => 1,
+                       exclude_test_table       => 1,
+                       exclude_test_table_data  => 1,
+                       no_owner                 => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, },
+               unlike => {
+                       only_dump_test_schema  => 1,
+                       only_dump_test_table   => 1,
+                       test_schema_plus_blobs => 1, }, },
+       'GRANT commands' => {    # catch-all for GRANT commands
                regexp => qr/^GRANT /m,
-               like => { }, # use more-specific options above
+               like   => {},             # use more-specific options above
                unlike => {
                        column_inserts => 1,
-                       data_only => 1,
-                       no_privs => 1,
-                       section_data => 1,
-               },
-       },
+                       data_only      => 1,
+                       no_privs       => 1,
+                       section_data   => 1, }, },
        'REFRESH MATERIALIZED VIEW matview' => {
                regexp => qr/^REFRESH MATERIALIZED VIEW matview;/m,
-               like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       test_schema_plus_blobs => 1,
-                       section_post_data => 1,
-               },
-               unlike => {
-                       binary_upgrade => 1,
-                       exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-       },
+               like   => {
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
+                       exclude_test_table_data => 1,
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       test_schema_plus_blobs  => 1,
+                       section_post_data       => 1, },
+               unlike => {
+                       binary_upgrade           => 1,
+                       exclude_dump_test_schema => 1,
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, }, },
        'REFRESH MATERIALIZED VIEW matview_second' => {
                regexp => qr/^
                        \QREFRESH MATERIALIZED VIEW matview;\E
@@ -2698,136 +2284,118 @@ my %tests = (
                        \QREFRESH MATERIALIZED VIEW matview_second;\E
                        /xms,
                like => {
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_test_table => 1,
+                       clean                   => 1,
+                       clean_if_exists         => 1,
+                       createdb                => 1,
+                       defaults                => 1,
+                       exclude_test_table      => 1,
                        exclude_test_table_data => 1,
-                       no_privs => 1,
-                       no_owner => 1,
-                       only_dump_test_schema => 1,
-                       test_schema_plus_blobs => 1,
-                       section_post_data => 1,
-               },
+                       no_privs                => 1,
+                       no_owner                => 1,
+                       only_dump_test_schema   => 1,
+                       test_schema_plus_blobs  => 1,
+                       section_post_data       => 1, },
                unlike => {
-                       binary_upgrade => 1,
+                       binary_upgrade           => 1,
                        exclude_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       pg_dumpall_globals => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-       },
+                       only_dump_test_table     => 1,
+                       pg_dumpall_globals       => 1,
+                       schema_only              => 1,
+                       section_pre_data         => 1, }, },
        'REVOKE EXECUTE ON FUNCTION pg_sleep() FROM public' => {
                create_order => 15,
-               create_sql => 'REVOKE EXECUTE ON FUNCTION pg_sleep(float8)
+               create_sql   => 'REVOKE EXECUTE ON FUNCTION pg_sleep(float8)
                                                   FROM public;',
                regexp => qr/^
                        \QREVOKE ALL ON FUNCTION pg_sleep(double precision) FROM PUBLIC;\E
                        /xm,
                like => {
-                       binary_upgrade => 1,
-                       clean => 1,
-                       clean_if_exists => 1,
-                       createdb => 1,
-                       defaults => 1,
-                       exclude_dump_test_schema => 1,
-                       exclude_test_table => 1,
-                       exclude_test_table_data => 1,
-                       no_owner => 1,
-                       schema_only => 1,
-                       section_pre_data => 1,
-               },
-               unlike => {
-                       only_dump_test_schema => 1,
-                       only_dump_test_table => 1,
-                       test_schema_plus_blobs => 1,
-               },
-       },
+                       binary_upgrade           => 1,
+                       clean                    => 1,
+                       clean_if_exists          => 1,
+                       createdb                 => 1,
+                       defaults                 => 1,
+