summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2019-01-23 00:57:19 +0000
committerMichael Paquier2019-01-23 00:57:19 +0000
commitadaaacae658e37a3e3c836266681774395b437fe (patch)
tree04a95e2b677d024d9577ec1b05384f5a6fbda308
parent4a8283d0ec5a6781b9e0d4ba16b44da8a0856d02 (diff)
Make vacuumdb test regex more modular for its query output
This is in preparation for always using a catalog query to discover tables, where the ANALYZE and VACUUM queries get completed with relation names. Author: Nathan Bossart Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/bin/scripts/t/100_vacuumdb.pl16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl
index 7cb2542e47..951202b40e 100644
--- a/src/bin/scripts/t/100_vacuumdb.pl
+++ b/src/bin/scripts/t/100_vacuumdb.pl
@@ -15,35 +15,35 @@ $node->start;
$node->issues_sql_like(
[ 'vacuumdb', 'postgres' ],
- qr/statement: VACUUM;/,
+ qr/statement: VACUUM.*;/,
'SQL VACUUM run');
$node->issues_sql_like(
[ 'vacuumdb', '-f', 'postgres' ],
- qr/statement: VACUUM \(FULL\);/,
+ qr/statement: VACUUM \(FULL\).*;/,
'vacuumdb -f');
$node->issues_sql_like(
[ 'vacuumdb', '-F', 'postgres' ],
- qr/statement: VACUUM \(FREEZE\);/,
+ qr/statement: VACUUM \(FREEZE\).*;/,
'vacuumdb -F');
$node->issues_sql_like(
[ 'vacuumdb', '-zj2', 'postgres' ],
- qr/statement: VACUUM \(ANALYZE\) pg_catalog\./,
+ qr/statement: VACUUM \(ANALYZE\).*;/,
'vacuumdb -zj2');
$node->issues_sql_like(
[ 'vacuumdb', '-Z', 'postgres' ],
- qr/statement: ANALYZE;/,
+ qr/statement: ANALYZE.*;/,
'vacuumdb -Z');
$node->issues_sql_like(
[ 'vacuumdb', '--disable-page-skipping', 'postgres' ],
- qr/statement: VACUUM \(DISABLE_PAGE_SKIPPING\);/,
+ qr/statement: VACUUM \(DISABLE_PAGE_SKIPPING\).*;/,
'vacuumdb --disable-page-skipping');
$node->issues_sql_like(
[ 'vacuumdb', '--skip-locked', 'postgres' ],
- qr/statement: VACUUM \(SKIP_LOCKED\);/,
+ qr/statement: VACUUM \(SKIP_LOCKED\).*;/,
'vacuumdb --skip-locked');
$node->issues_sql_like(
[ 'vacuumdb', '--skip-locked', '--analyze-only', 'postgres' ],
- qr/statement: ANALYZE \(SKIP_LOCKED\);/,
+ qr/statement: ANALYZE \(SKIP_LOCKED\).*;/,
'vacuumdb --skip-locked --analyze-only');
$node->command_fails(
[ 'vacuumdb', '--analyze-only', '--disable-page-skipping', 'postgres' ],