Merge branch 'master' of https://github.com/apache/age into jsonb_ope…

…rators
apache · Aug 24, 2023 · af5a8c2 · af5a8c2
2 parents 3f4aaeb + 0e2c003
commit af5a8c2
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -73,7 +73,7 @@ OBJS = src/backend/age.o \
 
 EXTENSION = age
 
-DATA = age--1.3.0.sql
+DATA = age--1.4.0.sql
 
 # sorted in dependency order
 REGRESS = scan \

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@
   </a>
   &nbsp;
   <a href="https://github.com/apache/age/releases">
-    <img src="https://img.shields.io/badge/Release-v1.3.0-FFA500?labelColor=gray&style=flat&link=https://github.com/apache/age/releases"/>
+    <img src="https://img.shields.io/badge/Release-v1.4.0-FFA500?labelColor=gray&style=flat&link=https://github.com/apache/age/releases"/>
   </a>
   &nbsp;
   <a href="https://www.postgresql.org/docs/15/index.html">

diff --git a/RELEASE b/RELEASE
@@ -15,14 +15,42 @@
 # specific language governing permissions and limitations
 # under the License.
 
-Release Notes for Apache AGE release 0.0.0 for PG 15
+Release Notes for Apache AGE release 1.4.0 for PostgreSQL version 15
 
-Apache AGE 0.0.0 - Release Notes
+Apache AGE 1.4.0 - Release Notes
 
-NOTE: This is an initial release of PG15. There are no upgrade
-      scripts to this release.
+NOTE: This is an initial release of Apache AGE for PostgreSQL version
+      15. There are no upgrade scripts to this release.
 
-**************************************************************
-***** THIS IS THE MASTER BRANCH TEMPLATE FOR THE RELEASE *****
-***** FILE. MODIFY AS NECESSARY FOR THE SPECIFIC RELEASE *****
-**************************************************************
+Added license in Python driver README.md (#956)
+Added the toStringList() function (#1128)
+Added toBooleanList() (#1165)
+Added toFloatList() function (#1016)
+Added toIntegerList() function (#1025)
+Added regression tests for MATCH clause using labels only (#1019)
+Added REGTYPEOID to toString function (#1036)
+Added Dockerfile.dev & move docker-related files to "docker/" (#943)
+Fixed complex MERGE causes crash (#897) (#961)
+Fixed docker build files (#1104)
+Fixed case sensitivity on label usage of reserved keyword (#1040)
+Fixed issue 1000: Indexes created on WHERE (#1133)
+Fixed issue 1002: Invalid reuse of variables in MATCH clause (#1003)
+Fixed issue 1033: access operator on vle edge lists (#1037)
+Fixed issue 1043: ERROR:  container must be an array or object (#1046)
+Fixed issue 1124: Segmentation fault when using specific tables (#1125)
+Fixed issue 395: ERROR: container is not an agtype array (#1039)
+Fixed issue 870: regarding orderability and added regression tests (#994)
+Fixed issue 876: column reference "_age_default_alias_0" is ambiguous (#931)
+Fixed issue 975: Invalid reuse of variables in CREATE clause (#977)
+Fixed issue 989: Impossible to create array with > 100 items (#1001)
+Fixed memory leak issues with age_load (#1142)
+Fixed memory leaks in MERGE (merge_edge & merge_vertex) (#958)
+Fixed MERGE crashes due to incorrect label type (#957)
+Fixed MERGE variable reuse (#997)
+Fixed misspellings in many AGE files (#985)
+Fixed warning messages in DockerHub builds. (#1075)
+Modified test_agtypes to view useful testing message (#992)
+Optimised Antlr4ResultHandler initialization (#1169)
+Updated CIs to pull correct image based on branch (#1105)
+Updated files, format, and version information (#1063)
+Updated README.
diff --git a/age--1.3.0.sql → age--1.4.0.sql b/age--1.3.0.sql → age--1.4.0.sql
diff --git a/age.control b/age.control
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-default_version = '1.3.0'
+default_version = '1.4.0'
 comment = 'AGE database extension'
 module_pathname = '$libdir/age'
 

diff --git a/regress/expected/agtype.out b/regress/expected/agtype.out
@@ -6402,6 +6402,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
 --

diff --git a/regress/sql/agtype.sql b/regress/sql/agtype.sql
@@ -1614,6 +1614,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
 --

diff --git a/src/backend/utils/adt/agtype.c b/src/backend/utils/adt/agtype.c
@@ -11026,7 +11026,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);
             }