Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ matrix:
- env: PGVERSION=11
- env: PGVERSION=12
- env: PGVERSION=13
- env: PGVERSION=14
before_install:
- git clone -b v0.7.13 --depth 1 https://github.com/citusdata/tools.git
- sudo make -C tools install
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ Compatibility

This module has been tested on:

* **Postgres 9.4, 9.5, 9.6, 10, 11, 12, 13**
* **Postgres 9.4, 9.5, 9.6, 10, 11, 12, 13, 14**

If you end up needing to change something to get this running on another system, send us the diff and we'll try to work it in!

Expand Down
16 changes: 8 additions & 8 deletions expected/disable_hashagg.out
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
-- ----------------------------------------------------------------
-- Since we get different results for 3 different PG version sets, add following
-- queries to specify version of the output easier.
SHOW server_version \gset
SELECT substring(:'server_version', '\d+\.\d+')::float > 9.5 as version_above_nine_five;
SHOW server_version_num \gset
SELECT :'server_version_num' >= 90600 as version_above_nine_five;
version_above_nine_five
-------------------------
t
(1 row)

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

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

Expand Down
16 changes: 8 additions & 8 deletions expected/disable_hashagg_0.out
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
-- ----------------------------------------------------------------
-- Since we get different results for 3 different PG version sets, add following
-- queries to specify version of the output easier.
SHOW server_version \gset
SELECT substring(:'server_version', '\d+\.\d+')::float > 9.5 as version_above_nine_five;
SHOW server_version_num \gset
SELECT :'server_version_num' >= 90600 as version_above_nine_five;
version_above_nine_five
-------------------------
f
(1 row)

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

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

Expand Down
16 changes: 8 additions & 8 deletions expected/disable_hashagg_1.out
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
-- ----------------------------------------------------------------
-- Since we get different results for 3 different PG version sets, add following
-- queries to specify version of the output easier.
SHOW server_version \gset
SELECT substring(:'server_version', '\d+\.\d+')::float > 9.5 as version_above_nine_five;
SHOW server_version_num \gset
SELECT :'server_version_num' >= 90600 as version_above_nine_five;
version_above_nine_five
-------------------------
f
(1 row)

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

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

Expand Down
8 changes: 4 additions & 4 deletions sql/disable_hashagg.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

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

SELECT hll_set_output_version(1);

Expand Down
10 changes: 9 additions & 1 deletion src/hll.c
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,18 @@ FunctionOid(const char *schemaName, const char *functionName, int argumentCount,
List *argumentList = NIL;
const bool findVariadics = false;
const bool findDefaults = false;
#if PG_VERSION_NUM >= 140000
const bool includeOutArguments = false;

functionList = FuncnameGetCandidates(qualifiedFunctionNameList, argumentCount,
argumentList, findVariadics,
findDefaults, true);
findDefaults, includeOutArguments,
true);
#else
functionList = FuncnameGetCandidates(qualifiedFunctionNameList, argumentCount,
argumentList, findVariadics,
findDefaults, true);
#endif

if (functionList == NULL)
{
Expand Down