From 97f8302c9c5b7a38e4ea71fd9ff0b0d1889e94b7 Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Fri, 21 Apr 2017 15:49:35 -0600 Subject: [PATCH] Change version-sensitive tests to handle '10' Previously assumed period in version; this makes tests future-proof. --- src/test/regress/expected/multi_explain.out | 2 +- src/test/regress/expected/multi_explain_0.out | 2 +- src/test/regress/input/multi_subquery.source | 2 +- src/test/regress/output/multi_subquery.source | 2 +- src/test/regress/output/multi_subquery_0.source | 2 +- src/test/regress/sql/multi_explain.sql | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out index 2d8193b6a..245fbac88 100644 --- a/src/test/regress/expected/multi_explain.out +++ b/src/test/regress/expected/multi_explain.out @@ -3,7 +3,7 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; -- print major version to make version-specific tests clear -SELECT substring(version(), '\d+\.\d+') AS major_version; +SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version; major_version --------------- 9.6 diff --git a/src/test/regress/expected/multi_explain_0.out b/src/test/regress/expected/multi_explain_0.out index 10798f526..ddba84aa3 100644 --- a/src/test/regress/expected/multi_explain_0.out +++ b/src/test/regress/expected/multi_explain_0.out @@ -3,7 +3,7 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; -- print major version to make version-specific tests clear -SELECT substring(version(), '\d+\.\d+') AS major_version; +SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version; major_version --------------- 9.5 diff --git a/src/test/regress/input/multi_subquery.source b/src/test/regress/input/multi_subquery.source index ee93df63a..736774b18 100644 --- a/src/test/regress/input/multi_subquery.source +++ b/src/test/regress/input/multi_subquery.source @@ -7,7 +7,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 270000; -- print major version to make version-specific tests clear SHOW server_version \gset -SELECT substring(:'server_version', '\d+\.\d+') AS major_version; +SELECT substring(:'server_version', '\d+(?:\.\d+)?') AS major_version; -- Create tables for subquery tests diff --git a/src/test/regress/output/multi_subquery.source b/src/test/regress/output/multi_subquery.source index 58490e03e..6e7648244 100644 --- a/src/test/regress/output/multi_subquery.source +++ b/src/test/regress/output/multi_subquery.source @@ -4,7 +4,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 270000; -- print major version to make version-specific tests clear SHOW server_version \gset -SELECT substring(:'server_version', '\d+\.\d+') AS major_version; +SELECT substring(:'server_version', '\d+(?:\.\d+)?') AS major_version; major_version --------------- 9.6 diff --git a/src/test/regress/output/multi_subquery_0.source b/src/test/regress/output/multi_subquery_0.source index b0f263db8..24b5640f7 100644 --- a/src/test/regress/output/multi_subquery_0.source +++ b/src/test/regress/output/multi_subquery_0.source @@ -4,7 +4,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 270000; -- print major version to make version-specific tests clear SHOW server_version \gset -SELECT substring(:'server_version', '\d+\.\d+') AS major_version; +SELECT substring(:'server_version', '\d+(?:\.\d+)?') AS major_version; major_version --------------- 9.5 diff --git a/src/test/regress/sql/multi_explain.sql b/src/test/regress/sql/multi_explain.sql index e744b1f31..1a79f75bc 100644 --- a/src/test/regress/sql/multi_explain.sql +++ b/src/test/regress/sql/multi_explain.sql @@ -5,7 +5,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; -- print major version to make version-specific tests clear -SELECT substring(version(), '\d+\.\d+') AS major_version; +SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version; \a\t