aboutsummaryrefslogtreecommitdiff
path: root/src/bin/scripts
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2024-05-14 16:34:50 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2024-05-14 16:34:50 -0400
commitda256a4a7fdcca35fe7ca808686ad3de6ee22306 (patch)
tree863d6a21cd148b40add73ae45bdedcf0acc001ee /src/bin/scripts
parent3ddbac368c205fce1f293de1fe60c1b479800746 (diff)
downloadpostgresql-da256a4a7fdcca35fe7ca808686ad3de6ee22306.tar.gz
postgresql-da256a4a7fdcca35fe7ca808686ad3de6ee22306.zip
Pre-beta mechanical code beautification.
Run pgindent, pgperltidy, and reformat-dat-files. The pgindent part of this is pretty small, consisting mainly of fixing up self-inflicted formatting damage from patches that hadn't bothered to add their new typedefs to typedefs.list. In order to keep it from making anything worse, I manually added a dozen or so typedefs that appeared in the existing typedefs.list but not in the buildfarm's list. Perhaps we should formalize that, or better find a way to get those typedefs into the automatic list. pgperltidy is as opinionated as always, and reformat-dat-files too.
Diffstat (limited to 'src/bin/scripts')
-rw-r--r--src/bin/scripts/t/011_clusterdb_all.pl9
-rw-r--r--src/bin/scripts/t/050_dropdb.pl2
-rw-r--r--src/bin/scripts/t/091_reindexdb_all.pl9
-rw-r--r--src/bin/scripts/t/100_vacuumdb.pl5
-rw-r--r--src/bin/scripts/t/101_vacuumdb_all.pl9
5 files changed, 20 insertions, 14 deletions
diff --git a/src/bin/scripts/t/011_clusterdb_all.pl b/src/bin/scripts/t/011_clusterdb_all.pl
index 3415e1d4f49..e0fd2201e54 100644
--- a/src/bin/scripts/t/011_clusterdb_all.pl
+++ b/src/bin/scripts/t/011_clusterdb_all.pl
@@ -25,13 +25,14 @@ $node->safe_psql(
UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid';
));
$node->command_ok([ 'clusterdb', '-a' ],
- 'invalid database not targeted by clusterdb -a');
+ 'invalid database not targeted by clusterdb -a');
# Doesn't quite belong here, but don't want to waste time by creating an
# invalid database in 010_clusterdb.pl as well.
-$node->command_fails_like([ 'clusterdb', '-d', 'regression_invalid'],
- qr/FATAL: cannot connect to invalid database "regression_invalid"/,
- 'clusterdb cannot target invalid database');
+$node->command_fails_like(
+ [ 'clusterdb', '-d', 'regression_invalid' ],
+ qr/FATAL: cannot connect to invalid database "regression_invalid"/,
+ 'clusterdb cannot target invalid database');
$node->safe_psql('postgres',
'CREATE TABLE test1 (a int); CREATE INDEX test1x ON test1 (a); CLUSTER test1 USING test1x'
diff --git a/src/bin/scripts/t/050_dropdb.pl b/src/bin/scripts/t/050_dropdb.pl
index 93bdad3a7f4..2cfd18ba1e5 100644
--- a/src/bin/scripts/t/050_dropdb.pl
+++ b/src/bin/scripts/t/050_dropdb.pl
@@ -38,6 +38,6 @@ $node->safe_psql(
UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid';
));
$node->command_ok([ 'dropdb', 'regression_invalid' ],
- 'invalid database can be dropped');
+ 'invalid database can be dropped');
done_testing();
diff --git a/src/bin/scripts/t/091_reindexdb_all.pl b/src/bin/scripts/t/091_reindexdb_all.pl
index 8061883f7f1..7f5068667e3 100644
--- a/src/bin/scripts/t/091_reindexdb_all.pl
+++ b/src/bin/scripts/t/091_reindexdb_all.pl
@@ -44,12 +44,13 @@ $node->safe_psql(
UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid';
));
$node->command_ok([ 'reindexdb', '-a' ],
- 'invalid database not targeted by reindexdb -a');
+ 'invalid database not targeted by reindexdb -a');
# Doesn't quite belong here, but don't want to waste time by creating an
# invalid database in 090_reindexdb.pl as well.
-$node->command_fails_like([ 'reindexdb', '-d', 'regression_invalid'],
- qr/FATAL: cannot connect to invalid database "regression_invalid"/,
- 'reindexdb cannot target invalid database');
+$node->command_fails_like(
+ [ 'reindexdb', '-d', 'regression_invalid' ],
+ qr/FATAL: cannot connect to invalid database "regression_invalid"/,
+ 'reindexdb cannot target invalid database');
done_testing();
diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl
index 1d8558c780c..1a2bcb49591 100644
--- a/src/bin/scripts/t/100_vacuumdb.pl
+++ b/src/bin/scripts/t/100_vacuumdb.pl
@@ -168,7 +168,10 @@ $node->issues_sql_like(
qr/^(?!.*VACUUM \(SKIP_DATABASE_STATS\) "Foo".bar).*$/s,
'vacuumdb --exclude-schema');
$node->issues_sql_like(
- [ 'vacuumdb', '--exclude-schema', '"Foo"', '--exclude-schema', '"Bar"', 'postgres' ],
+ [
+ 'vacuumdb', '--exclude-schema', '"Foo"', '--exclude-schema',
+ '"Bar"', 'postgres'
+ ],
qr/^(?!.*VACUUM\ \(SKIP_DATABASE_STATS\)\ "Foo".bar
| VACUUM\ \(SKIP_DATABASE_STATS\)\ "Bar".baz).*$/sx,
'vacuumdb multiple --exclude-schema switches');
diff --git a/src/bin/scripts/t/101_vacuumdb_all.pl b/src/bin/scripts/t/101_vacuumdb_all.pl
index b1d37112b90..9862f0c2082 100644
--- a/src/bin/scripts/t/101_vacuumdb_all.pl
+++ b/src/bin/scripts/t/101_vacuumdb_all.pl
@@ -22,12 +22,13 @@ $node->safe_psql(
UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid';
));
$node->command_ok([ 'vacuumdb', '-a' ],
- 'invalid database not targeted by vacuumdb -a');
+ 'invalid database not targeted by vacuumdb -a');
# Doesn't quite belong here, but don't want to waste time by creating an
# invalid database in 010_vacuumdb.pl as well.
-$node->command_fails_like([ 'vacuumdb', '-d', 'regression_invalid'],
- qr/FATAL: cannot connect to invalid database "regression_invalid"/,
- 'vacuumdb cannot target invalid database');
+$node->command_fails_like(
+ [ 'vacuumdb', '-d', 'regression_invalid' ],
+ qr/FATAL: cannot connect to invalid database "regression_invalid"/,
+ 'vacuumdb cannot target invalid database');
done_testing();