Skip to content

Commit

Permalink
Minor fix in agtype_volatile_wrapper function (#1172)
Browse files Browse the repository at this point in the history
Fixed duplicated IF-STATEMENT of INT4OID in agtype_volatile_wrapper
function changing it to INT2OID
  • Loading branch information
WendelLana authored Aug 23, 2023
1 parent 3899f68 commit 90e0d16
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 1 deletion.
24 changes: 24 additions & 0 deletions regress/expected/agtype.out
Original file line number Diff line number Diff line change
Expand Up @@ -3192,6 +3192,30 @@ SELECT agtype_btree_cmp(
-1
(1 row)

--Int2 to Agtype in agtype_volatile_wrapper
SELECT ag_catalog.agtype_volatile_wrapper(1::int2);
agtype_volatile_wrapper
-------------------------
1
(1 row)

SELECT ag_catalog.agtype_volatile_wrapper(32767::int2);
agtype_volatile_wrapper
-------------------------
32767
(1 row)

SELECT ag_catalog.agtype_volatile_wrapper(-32767::int2);
agtype_volatile_wrapper
-------------------------
-32767
(1 row)

-- These should fail
SELECT ag_catalog.agtype_volatile_wrapper(32768::int2);
ERROR: smallint out of range
SELECT ag_catalog.agtype_volatile_wrapper(-32768::int2);
ERROR: smallint out of range
--
-- Cleanup
--
Expand Down
9 changes: 9 additions & 0 deletions regress/sql/agtype.sql
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,15 @@ SELECT agtype_btree_cmp(
'[{"id":1, "label":"test", "properties":{"id":100}}::vertex,
{"id":2, "start_id":1, "end_id": 3, "label":"elabel", "properties":{}}::edge,
{"id":4, "label":"vlabel", "properties":{}}::vertex]::path'::agtype);

--Int2 to Agtype in agtype_volatile_wrapper
SELECT ag_catalog.agtype_volatile_wrapper(1::int2);
SELECT ag_catalog.agtype_volatile_wrapper(32767::int2);
SELECT ag_catalog.agtype_volatile_wrapper(-32767::int2);

-- These should fail
SELECT ag_catalog.agtype_volatile_wrapper(32768::int2);
SELECT ag_catalog.agtype_volatile_wrapper(-32768::int2);
--
-- Cleanup
--
Expand Down
2 changes: 1 addition & 1 deletion src/backend/utils/adt/agtype.c
Original file line number Diff line number Diff line change
Expand Up @@ -10876,7 +10876,7 @@ Datum agtype_volatile_wrapper(PG_FUNCTION_ARGS)
{
agtv_result.val.int_value = (int64) DatumGetInt32(arg);
}
else if (type == INT4OID)
else if (type == INT2OID)
{
agtv_result.val.int_value = (int64) DatumGetInt16(arg);
}
Expand Down

0 comments on commit 90e0d16

Please sign in to comment.