Merge PG13 version 1.3.0 into the master branch

.github/workflows/go-driver.yml

@@ -2,10 +2,10 @@ name: Go Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
   pull_request:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
 jobs:
   build:
@@ -26,14 +26,14 @@ jobs:
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         fi
 

.github/workflows/installcheck.yaml

@@ -2,45 +2,45 @@ name: Build / Regression
 
 on:
   push:
-    branches: [ 'master', 'PG12' ]
+    branches: [ 'master', 'PG13' ]
   pull_request:
-    branches: [ 'master', 'PG12' ]
+    branches: [ 'master', 'PG13' ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Get latest commit id of PostgreSQL 12
+      - name: Get latest commit id of PostgreSQL 13
         run: |
-          echo "PG_COMMIT_HASH=$(git ls-remote git://git.postgresql.org/git/postgresql.git refs/heads/REL_12_STABLE | awk '{print $1}')" >> $GITHUB_ENV
+          echo "PG_COMMIT_HASH=$(git ls-remote git://git.postgresql.org/git/postgresql.git refs/heads/REL_13_STABLE | awk '{print $1}')" >> $GITHUB_ENV
 
-      - name: Cache PostgreSQL 12
+      - name: Cache PostgreSQL 13
         uses: actions/cache@v3
-        id: pg12cache
+        id: pg13cache
         with:
-          path: ~/pg12
-          key: ${{ runner.os }}-v1-pg12-${{ env.PG_COMMIT_HASH }}
+          path: ~/pg13
+          key: ${{ runner.os }}-v1-pg13-${{ env.PG_COMMIT_HASH }}
 
-      - name: Install PostgreSQL 12
-        if: steps.pg12cache.outputs.cache-hit != 'true'
+      - name: Install PostgreSQL 13
+        if: steps.pg13cache.outputs.cache-hit != 'true'
         run: |
-          git clone --depth 1 --branch REL_12_STABLE git://git.postgresql.org/git/postgresql.git ~/pg12source
-          cd ~/pg12source
-          ./configure --prefix=$HOME/pg12 CFLAGS="-std=gnu99 -ggdb -O0" --enable-cassert
+          git clone --depth 1 --branch REL_13_STABLE git://git.postgresql.org/git/postgresql.git ~/pg13source
+          cd ~/pg13source
+          ./configure --prefix=$HOME/pg13 CFLAGS="-std=gnu99 -ggdb -O0" --enable-cassert
           make install -j$(nproc) > /dev/null
 
       - uses: actions/checkout@v3
 
       - name: Build
         id: build
         run: |
-          make PG_CONFIG=$HOME/pg12/bin/pg_config install -j$(nproc)
+          make PG_CONFIG=$HOME/pg13/bin/pg_config install -j$(nproc)
 
       - name: Regression tests
         id: regression_tests
         run: |
-          make PG_CONFIG=$HOME/pg12/bin/pg_config installcheck
+          make PG_CONFIG=$HOME/pg13/bin/pg_config installcheck
         continue-on-error: true
 
       - name: Dump regression test errors

.github/workflows/jdbc-driver.yaml

@@ -2,10 +2,10 @@ name: JDBC Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
   pull_request:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
 jobs:
   build:
@@ -28,14 +28,14 @@ jobs:
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         fi
 

.github/workflows/nodejs-driver.yaml

@@ -2,10 +2,10 @@ name: Nodejs Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
   pull_request:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
 jobs:
   build:
@@ -23,14 +23,14 @@ jobs:
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         fi
 

.github/workflows/python-driver.yaml

@@ -2,10 +2,10 @@ name: Python Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
   pull_request:
-    branches: [ "master", "PG12" ]
+    branches: [ "master", "PG13" ]
 
 jobs:
   build:
@@ -23,14 +23,14 @@ jobs:
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
-            echo "TAG=PG12_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG13" ]]; then
+            echo "TAG=PG13_latest" >> $GITHUB_ENV
           fi
         fi
 

Dockerfile

@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-FROM postgres:12
+FROM postgres:13
 
 RUN apt-get update
 RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests \
   bison \
   build-essential \
   flex \
-  postgresql-server-dev-12
+  postgresql-server-dev-13
 
 COPY . /age
 RUN cd /age && make install

Makefile

@@ -133,3 +133,5 @@ src/backend/parser/cypher_parser.o: src/backend/parser/cypher_gram.c
 src/backend/parser/cypher_keywords.o: src/backend/parser/cypher_gram.c
 
 src/backend/parser/ag_scanner.c: FLEX_NO_BACKUP=yes
+
+installcheck: export LC_COLLATE=C

README.md

@@ -33,8 +33,8 @@
     <img src="https://img.shields.io/badge/Release-v1.3.0-FFA500?labelColor=gray&style=flat&link=https://github.com/apache/age/releases"/>
   </a>
   &nbsp;
-  <a href="https://www.postgresql.org/docs/12/index.html">
-    <img src="https://img.shields.io/badge/Version-PostgreSQL 12-00008B?labelColor=gray&style=flat&link=https://www.postgresql.org/docs/12/index.html"/>
+  <a href="https://www.postgresql.org/docs/13/index.html">
+    <img src="https://img.shields.io/badge/Version-PostgreSQL 13-00008B?labelColor=gray&style=flat&link=https://www.postgresql.org/docs/13/index.html"/>
   </a>
   &nbsp;
   <a href="https://github.com/apache/age/issues">

RELEASE

@@ -15,13 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-Release Notes for Apache AGE release v1.3.0 for PG 12
+Release Notes for Apache AGE release v1.3.0 for PG 13
 
 Apache AGE 1.3.0 - Release Notes
 
-NOTE: Due to additions to core tables, there is no upgrade path from the
-      previous version.
-
 Implement CALL ...[YIELD] for cypher functions. (#630)
 Graph names with the empty string '' are no more allowed. (#251)
 Fix typos at multiple locations. (#470)
@@ -46,7 +43,7 @@ Implement plus-equal operator in SET clause. (#638)
 Implement CI test for python driver. (#587)
 Move from travis CI to github actions for build. (#673)
 Update all driver CIs to Github actions.
-Fix build warnings.
+Fix build warnings. (#709)
 Updated Readme for drivers folder. (#642)
 Removed async from function definitions. (#680)
 Barbell graph generation (#648) and Barbell regress tests. (#708)
@@ -62,6 +59,6 @@ Fix property constraints against resolved variables. (#724) (#751) (#701) (#747)
 Include invalid labels in reused variables. (#751) (#762)
 Fix update_entity_tuple to use correct CommandId. (#769)
 Remove check for scalar agtypes in unwind. (#736)
-Update PG12 CI workflows. (#776)
+Update PG13 CI workflows. (#775)
 Update readme and version for python driver. (#780)
 Update README.md

age--1.3.0.sql

@@ -74,6 +74,7 @@ CREATE UNIQUE INDEX ag_label_relation_index ON ag_label USING btree (relation);
 CREATE UNIQUE INDEX ag_label_seq_name_graph_index
 ON ag_label
 USING btree (seq_name, graph);
+
 --
 -- catalog lookup functions
 --
@@ -109,21 +110,22 @@ CREATE FUNCTION ag_catalog.create_elabel(graph_name name, label_name name)
     LANGUAGE c
 AS 'MODULE_PATHNAME';
 
-CREATE FUNCTION ag_catalog.alter_graph(graph_name name, operation cstring, new_value name)
+CREATE FUNCTION ag_catalog.alter_graph(graph_name name, operation cstring,
+                                       new_value name)
 RETURNS void
 LANGUAGE c
 AS 'MODULE_PATHNAME';
 
 CREATE FUNCTION ag_catalog.drop_label(graph_name name, label_name name,
-                           force boolean = false)
+                                      force boolean = false)
 RETURNS void
 LANGUAGE c
 AS 'MODULE_PATHNAME';
 
 CREATE FUNCTION ag_catalog.load_labels_from_file(graph_name name,
-                                            label_name name,
-                                            file_path text,
-                                            id_field_exists bool default true)
+                                                 label_name name,
+                                                 file_path text,
+                                                 id_field_exists bool default true)
     RETURNS void
     LANGUAGE c
     AS 'MODULE_PATHNAME';
@@ -1389,7 +1391,6 @@ CREATE OPERATOR ^ (
   RIGHTARG = agtype
 );
 
-
 CREATE FUNCTION ag_catalog.graphid_hash_cmp(graphid)
 RETURNS INTEGER
 LANGUAGE c
@@ -3086,7 +3087,6 @@ CREATE CAST (agtype AS graphid)
 WITH FUNCTION ag_catalog.agtype_to_graphid(agtype)
 AS IMPLICIT;
 
-
 --
 -- agtype - path
 --
@@ -3425,6 +3425,7 @@ AS 'MODULE_PATHNAME';
 --
 -- Scalar Functions
 --
+
 CREATE FUNCTION ag_catalog.age_id(agtype)
 RETURNS agtype
 LANGUAGE c
@@ -4109,7 +4110,6 @@ CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
-
 -- function to create an AGTV_PATH from a VLE_path_container
 CREATE FUNCTION ag_catalog.age_materialize_vle_path(agtype)
 RETURNS agtype
@@ -4136,7 +4136,6 @@ RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
-
 CREATE FUNCTION ag_catalog.age_match_two_vle_edges(agtype, agtype)
 RETURNS boolean
 LANGUAGE C
@@ -4204,20 +4203,22 @@ STABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
-CREATE FUNCTION ag_catalog.create_complete_graph(graph_name name, nodes int, edge_label name, node_label name = NULL)
+CREATE FUNCTION ag_catalog.create_complete_graph(graph_name name, nodes int,
+                                                 edge_label name,
+                                                 node_label name = NULL)
 RETURNS void
 LANGUAGE c
 CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
 CREATE FUNCTION ag_catalog.age_create_barbell_graph(graph_name name,
-                                                graph_size int,
-                                                bridge_size int,
-                                                node_label name = NULL,
-                                                node_properties agtype = NULL,
-                                                edge_label name = NULL,
-                                                edge_properties agtype = NULL)
+                                                    graph_size int,
+                                                    bridge_size int,
+                                                    node_label name = NULL,
+                                                    node_properties agtype = NULL,
+                                                    edge_label name = NULL,
+                                                    edge_properties agtype = NULL)
 RETURNS void
 LANGUAGE c
 CALLED ON NULL INPUT

drivers/golang/age/builder.go

@@ -24,7 +24,6 @@ import (
 	"math/big"
 	"strconv"
 	"strings"
-
 	"github.com/antlr/antlr4/runtime/Go/antlr/v4"
 	"github.com/apache/age/drivers/golang/parser"
 )

drivers/golang/age/mapper.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
-
 	"github.com/antlr/antlr4/runtime/Go/antlr/v4"
 	"github.com/apache/age/drivers/golang/parser"
 )

regress/sql/cypher_call.sql

@@ -38,7 +38,6 @@ CREATE FUNCTION call_stmt_test.add_agtype(agtype, agtype) RETURNS agtype
 /*
  * CALL (solo)
  */
-
 SELECT * FROM cypher('cypher_call', $$CALL sqrt(64)$$) as (sqrt agtype);
 /*  CALL RETURN, should fail */
 SELECT * FROM cypher('cypher_call', $$CALL sqrt(64) RETURN sqrt$$) as (sqrt agtype);