[age] branch PG12 updated: Fix issue 1043: ERROR: container must be an array or object (#1046) (#1057)

[dehowef]

This is an automated email from the ASF dual-hosted git repository.

dehowef pushed a commit to branch PG12
in repository https://gitbox.apache.org/repos/asf/age.git


The following commit(s) were added to refs/heads/PG12 by this push:
     new 62ef3913 Fix issue 1043: ERROR:  container must be an array or object 
(#1046) (#1057)
62ef3913 is described below

commit 62ef3913b73e56f1a13ae5d61fd2a4add9158cd4
Author: John Gemignani <jrgemign...@gmail.com>
AuthorDate: Tue Jul 18 14:46:00 2023 -0700

    Fix issue 1043: ERROR:  container must be an array or object (#1046) (#1057)
    
    Fixed issue 1043 -
    
    ERROR:  container must be an array or object
    
    This was cause by agtype_access_operator not recognizing and
    decoding a VLE path container.
    
    Added regression tests.
---
 regress/expected/cypher_vle.out | 44 +++++++++++++++++++++++++++++++++++++++++
 regress/sql/cypher_vle.sql      |  9 +++++++++
 src/backend/utils/adt/agtype.c  | 19 +++++++++++++++++-
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/regress/expected/cypher_vle.out b/regress/expected/cypher_vle.out
index 71f520de..d9c2091d 100644
--- a/regress/expected/cypher_vle.out
+++ b/regress/expected/cypher_vle.out
@@ -1000,6 +1000,50 @@ NOTICE:  graph "access" has been dropped
  
 (1 row)
 
+-- issue 1043
+SELECT create_graph('issue_1043');
+NOTICE:  graph "issue_1043" has been created
+ create_graph 
+--------------
+ 
+(1 row)
+
+SELECT * FROM cypher('issue_1043', $$ CREATE (n)-[:KNOWS 
{n:'hello'}]->({n:'hello'}) $$) as (a agtype);
+ a 
+---
+(0 rows)
+
+SELECT * FROM cypher('issue_1043', $$ MATCH (x)<-[y *]-(),({n:y[0].n}) RETURN 
x $$) as (a agtype);
+                                     a                                      
+----------------------------------------------------------------------------
+ {"id": 281474976710658, "label": "", "properties": {"n": "hello"}}::vertex
+(1 row)
+
+SELECT * FROM cypher('issue_1043', $$ CREATE (n)-[:KNOWS 
{n:'hello'}]->({n:'hello'}) $$) as (a agtype);
+ a 
+---
+(0 rows)
+
+SELECT * FROM cypher('issue_1043', $$ MATCH (x)<-[y *]-(),({n:y[0].n}) RETURN 
x $$) as (a agtype);
+                                     a                                      
+----------------------------------------------------------------------------
+ {"id": 281474976710658, "label": "", "properties": {"n": "hello"}}::vertex
+ {"id": 281474976710658, "label": "", "properties": {"n": "hello"}}::vertex
+ {"id": 281474976710660, "label": "", "properties": {"n": "hello"}}::vertex
+ {"id": 281474976710660, "label": "", "properties": {"n": "hello"}}::vertex
+(4 rows)
+
+SELECT drop_graph('issue_1043', true);
+NOTICE:  drop cascades to 3 other objects
+DETAIL:  drop cascades to table issue_1043._ag_label_vertex
+drop cascades to table issue_1043._ag_label_edge
+drop cascades to table issue_1043."KNOWS"
+NOTICE:  graph "issue_1043" has been dropped
+ drop_graph 
+------------
+ 
+(1 row)
+
 --
 -- Clean up
 --
diff --git a/regress/sql/cypher_vle.sql b/regress/sql/cypher_vle.sql
index 33cf11da..20fecf0e 100644
--- a/regress/sql/cypher_vle.sql
+++ b/regress/sql/cypher_vle.sql
@@ -330,6 +330,15 @@ SELECT * FROM cypher('access',$$ MATCH ()-[e*]->() RETURN 
e[0].arry[2], e[1].arr
 
 SELECT drop_graph('access', true);
 
+-- issue 1043
+SELECT create_graph('issue_1043');
+SELECT * FROM cypher('issue_1043', $$ CREATE (n)-[:KNOWS 
{n:'hello'}]->({n:'hello'}) $$) as (a agtype);
+SELECT * FROM cypher('issue_1043', $$ MATCH (x)<-[y *]-(),({n:y[0].n}) RETURN 
x $$) as (a agtype);
+SELECT * FROM cypher('issue_1043', $$ CREATE (n)-[:KNOWS 
{n:'hello'}]->({n:'hello'}) $$) as (a agtype);
+SELECT * FROM cypher('issue_1043', $$ MATCH (x)<-[y *]-(),({n:y[0].n}) RETURN 
x $$) as (a agtype);
+
+SELECT drop_graph('issue_1043', true);
+
 --
 -- Clean up
 --
diff --git a/src/backend/utils/adt/agtype.c b/src/backend/utils/adt/agtype.c
index 853cebf5..2226998f 100644
--- a/src/backend/utils/adt/agtype.c
+++ b/src/backend/utils/adt/agtype.c
@@ -3482,8 +3482,25 @@ Datum agtype_access_operator(PG_FUNCTION_ARGS)
     /* get the container argument. It could be an object or array */
     container = DATUM_GET_AGTYPE_P(args[0]);
 
+    /* if it is a binary container, check for a VLE vpc */
+    if (AGT_ROOT_IS_BINARY(container))
+    {
+        if (AGT_ROOT_BINARY_FLAGS(container) == AGT_FBINARY_TYPE_VLE_PATH)
+        {
+            /* retrieve an array of edges from the vpc */
+            container_value = agtv_materialize_vle_edges(container);
+            /* clear the container reference */
+            container = NULL;
+        }
+        else
+        {
+            ereport(ERROR,
+                    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                     errmsg("binary container must be a VLE vpc")));
+        }
+    }
     /* if it is a scalar, open it and pull out the value */
-    if (AGT_ROOT_IS_SCALAR(container))
+    else if (AGT_ROOT_IS_SCALAR(container))
     {
         container_value = get_ith_agtype_value_from_container(&container->root,
                                                               0);