Skip to content

Commit 029324d

Browse files
committed
Update versioning checks allow PG beta versions
1 parent 1546c22 commit 029324d

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

expected/disable_hashagg.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
-- ----------------------------------------------------------------
44
-- Since we get different results for 3 different PG version sets, add following
55
-- queries to specify version of the output easier.
6-
SHOW server_version \gset
7-
SELECT substring(:'server_version', '\d+\.\d+')::float > 9.5 as version_above_nine_five;
6+
SHOW server_version_num \gset
7+
SELECT :'server_version_num' >= 90600 as version_above_nine_five;
88
version_above_nine_five
99
-------------------------
1010
t
1111
(1 row)
1212

13-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.5 as versiong_nine_five;
14-
versiong_nine_five
15-
--------------------
13+
SELECT :'server_version_num' >= 90500 AND :'server_version_num' < 90600 as version_nine_five;
14+
version_nine_five
15+
-------------------
1616
f
1717
(1 row)
1818

19-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.4 as versiong_nine_four;
20-
versiong_nine_four
21-
--------------------
19+
SELECT :'server_version_num' >= 90400 AND :'server_version_num' < 90500 as version_nine_four;
20+
version_nine_four
21+
-------------------
2222
f
2323
(1 row)
2424

expected/disable_hashagg_0.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
-- ----------------------------------------------------------------
44
-- Since we get different results for 3 different PG version sets, add following
55
-- queries to specify version of the output easier.
6-
SHOW server_version \gset
7-
SELECT substring(:'server_version', '\d+\.\d+')::float > 9.5 as version_above_nine_five;
6+
SHOW server_version_num \gset
7+
SELECT :'server_version_num' >= 90600 as version_above_nine_five;
88
version_above_nine_five
99
-------------------------
1010
f
1111
(1 row)
1212

13-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.5 as versiong_nine_five;
14-
versiong_nine_five
15-
--------------------
13+
SELECT :'server_version_num' >= 90500 AND :'server_version_num' < 90600 as version_nine_five;
14+
version_nine_five
15+
-------------------
1616
t
1717
(1 row)
1818

19-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.4 as versiong_nine_four;
20-
versiong_nine_four
21-
--------------------
19+
SELECT :'server_version_num' >= 90400 AND :'server_version_num' < 90500 as version_nine_four;
20+
version_nine_four
21+
-------------------
2222
f
2323
(1 row)
2424

expected/disable_hashagg_1.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
-- ----------------------------------------------------------------
44
-- Since we get different results for 3 different PG version sets, add following
55
-- queries to specify version of the output easier.
6-
SHOW server_version \gset
7-
SELECT substring(:'server_version', '\d+\.\d+')::float > 9.5 as version_above_nine_five;
6+
SHOW server_version_num \gset
7+
SELECT :'server_version_num' >= 90600 as version_above_nine_five;
88
version_above_nine_five
99
-------------------------
1010
f
1111
(1 row)
1212

13-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.5 as versiong_nine_five;
14-
versiong_nine_five
15-
--------------------
13+
SELECT :'server_version_num' >= 90500 AND :'server_version_num' < 90600 as version_nine_five;
14+
version_nine_five
15+
-------------------
1616
f
1717
(1 row)
1818

19-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.4 as versiong_nine_four;
20-
versiong_nine_four
21-
--------------------
19+
SELECT :'server_version_num' >= 90400 AND :'server_version_num' < 90500 as version_nine_four;
20+
version_nine_four
21+
-------------------
2222
t
2323
(1 row)
2424

sql/disable_hashagg.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
-- Since we get different results for 3 different PG version sets, add following
66
-- queries to specify version of the output easier.
7-
SHOW server_version \gset
8-
SELECT substring(:'server_version', '\d+\.\d+')::float > 9.5 as version_above_nine_five;
9-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.5 as versiong_nine_five;
10-
SELECT substring(:'server_version', '\d+\.\d+')::float = 9.4 as versiong_nine_four;
7+
SHOW server_version_num \gset
8+
SELECT :'server_version_num' >= 90600 as version_above_nine_five;
9+
SELECT :'server_version_num' >= 90500 AND :'server_version_num' < 90600 as version_nine_five;
10+
SELECT :'server_version_num' >= 90400 AND :'server_version_num' < 90500 as version_nine_four;
1111

1212
SELECT hll_set_output_version(1);
1313

0 commit comments

Comments
 (0)