git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Make vacuumdb test regex more modular for its query output

author Michael Paquier <michael@paquier.xyz>

2019年1月23日 00:57:19 +0000 (09:57 +0900)

committer Michael Paquier <michael@paquier.xyz>

2019年1月23日 00:57:19 +0000 (09:57 +0900)

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/20190122060730.GD8719@paquier.xyz

src/bin/scripts/t/100_vacuumdb.pl patch | blob | blame | history

diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl

index 7cb2542e4735aa43d419c7e7c560fb0a6b770619..951202b40e3444abc775085ac4f37b0b34a9be9c 100644 (file)

--- 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' ],

This is the main PostgreSQL git repository.

RSS Atom