Current master merge into PG12

.github/workflows/go-driver.yml

@@ -2,32 +2,54 @@ name: Go Driver Tests
 
 on:
   push:
-    branches: [ "PG12" ]
-    
+    branches: [ "master", "PG12" ]
+
   pull_request:
-    branches: [ "PG12" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         go-version: [ '1.18', '1.19' ]
+
     defaults:
       run:
         working-directory: drivers/golang/age/
-  
+
     steps:
     - uses: actions/checkout@v3
-
+
+    - name: Set tag based on branch
+      run: |
+        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
+          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
+          fi
+        fi
+
     - name: Run apache/age docker image
-      run: docker-compose up -d
+      run: |
+        export TAG=$TAG
+        docker-compose up -d
 
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
 
+    - name: Generate
+      run: go generate ./../...
+
     - name: Build
       run: go build -v ./...
 

.github/workflows/installcheck.yaml

@@ -0,0 +1,52 @@
+name: Build / Regression
+
+on:
+  push:
+    branches: [ 'master', 'PG12' ]
+  pull_request:
+    branches: [ 'master', 'PG12' ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get latest commit id of PostgreSQL 12
+        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
+
+      - name: Cache PostgreSQL 12
+        uses: actions/cache@v3
+        id: pg12cache
+        with:
+          path: ~/pg12
+          key: ${{ runner.os }}-v1-pg12-${{ env.PG_COMMIT_HASH }}
+
+      - name: Install PostgreSQL 12
+        if: steps.pg12cache.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
+          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)
+
+      - name: Regression tests
+        id: regression_tests
+        run: |
+          make PG_CONFIG=$HOME/pg12/bin/pg_config installcheck
+        continue-on-error: true
+
+      - name: Dump regression test errors
+        if: steps.regression_tests.outcome != 'success'
+        run: |
+          echo "Dump section begin."
+          cat $HOME/work/age/age/regress/regression.diffs
+          echo "Dump section end."
+          exit 1

.github/workflows/jdbc-driver.yaml

@@ -2,19 +2,14 @@ name: JDBC Driver Tests
 
 on:
   push:
-    branches: [ "PG12" ]
-      
+    branches: [ "master", "PG12" ]
+
   pull_request:
-    branches: [ "PG12" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        distributions: ['zulu', 'temurin', 'microsoft']
-
     defaults:
       run:
         working-directory: drivers/jdbc
@@ -25,8 +20,26 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v3
       with:
-        distribution: ${{ matrix.distributions }}
+        distribution: 'zulu'
         java-version: '17'
 
+    - name: Set tag based on branch
+      run: |
+        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
+          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
+          fi
+        fi
+
     - name: Build and Test
-      run: gradle build
+      run: |
+        export TAG=$TAG
+        gradle build

.github/workflows/nodejs-driver.yaml

@@ -2,10 +2,10 @@ name: Nodejs Driver Tests
 
 on:
   push:
-    branches: [ "PG12" ]
+    branches: [ "master", "PG12" ]
 
   pull_request:
-    branches: [ "PG12" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
@@ -14,12 +14,30 @@ jobs:
     defaults:
       run:
         working-directory: drivers/nodejs/
-  
+
     steps:
     - uses: actions/checkout@v3
-
+
+    - name: Set tag based on branch
+      run: |
+        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
+          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
+          fi
+        fi
+
     - name: Run apache/age docker image
-      run: docker-compose up -d
+      run: |
+        export TAG=$TAG
+        docker-compose up -d
 
     - name: Set up Node
       uses: actions/setup-node@v3
@@ -33,4 +51,4 @@ jobs:
       run: npm run build
 
     - name: Test
-      run: npm test
+      run: npm test

.github/workflows/python-driver.yaml

@@ -2,10 +2,10 @@ name: Python Driver Tests
 
 on:
   push:
-    branches: [ "PG12" ]
-      
+    branches: [ "master", "PG12" ]
+
   pull_request:
-    branches: [ "PG12" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
@@ -14,12 +14,30 @@ jobs:
     defaults:
       run:
         working-directory: drivers/python
-  
+
     steps:
     - uses: actions/checkout@v3
-
+
+    - name: Set tag based on branch
+      run: |
+        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
+          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
+          fi
+        fi
+
     - name: Run apache/age docker image
-      run: docker-compose up -d
+      run: |
+        export TAG=$TAG
+        docker-compose up -d
 
     - name: Set up python
       uses: actions/setup-python@v4
@@ -37,5 +55,5 @@ jobs:
 
     - name: Test
       run: |
-        python -m unittest -v test_age_py.py
+        python test_age_py.py -db "postgres" -u "postgres" -pass "agens"
         python -m unittest -v test_agtypes.py

Dockerfile

@@ -16,19 +16,18 @@
 # limitations under the License.
 #
 
-
 FROM postgres:12
 
-RUN apt-get update 
+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-12
 
-COPY . /age 
-RUN cd /age && make install 
+COPY . /age
+RUN cd /age && make install
 
 COPY docker-entrypoint-initdb.d/00-create-extension-age.sql /docker-entrypoint-initdb.d/00-create-extension-age.sql
 
-CMD ["postgres", "-c", "shared_preload_libraries=age"]
+CMD ["postgres", "-c", "shared_preload_libraries=age"]

META.json

@@ -2,17 +2,17 @@
    "name": "ApacheAGE",
    "abstract": "Apache AGE is a PostgreSQL Extension that provides graph database functionality",
    "description": "Apache AGE is a PostgreSQL Extension that provides graph database functionality. AGE is an acronym for A Graph Extension, and is inspired by Bitnine's fork of PostgreSQL 10, AgensGraph, which is a multi-model database. The goal of the project is to create single storage that can handle both relational and graph model data so that users can use standard ANSI SQL along with openCypher, the Graph query language. A graph consists of a set of vertices (also called nodes) and edges, where each individual vertex and edge possesses a map of properties. A vertex is the basic object of a graph, that can exist independently of everything else in the graph. An edge creates a directed connection between two vertices. A graph database is simply composed of vertices and edges. This type of database is useful when the meaning is in the relationships between the data. Relational databases can easily handle direct relationships, but indirect relationships are more difficult to deal with in relational databases. A graph database stores relationship information as a first-class entity. Apache AGE gives you the best of both worlds, simultaneously.",
-   "version": "1.1.0",
+   "version": "1.3.0",
    "maintainer": [
       "users@age.apache.org"
    ],
    "license": "apache_2_0",
    "provides": {
       "ApacheAGE": {
          "abstract": "Apache AGE is a PostgreSQL Extension that provides graph database functionality",
-         "file": "age--1.1.0.sql",
+         "file": "age--1.3.0.sql",
          "docfile": "README.md",
-         "version": "1.1.0"
+         "version": "1.3.0"
       }
    },
    "prereqs": {
@@ -23,7 +23,7 @@
       }
    },
    "resources": {
-      "homepage": "https://github.com/apache/age/tree/AGE_PG12.1.0_ALPHA",
+      "homepage": "https://github.com/apache/age/tree/PG12",
       "bugtracker": {
          "web": "https://github.com/apache/age/issues"
       },

Makefile

@@ -18,7 +18,6 @@
 MODULE_big = age
 
 
-
 OBJS = src/backend/age.o \
        src/backend/catalog/ag_catalog.o \
        src/backend/catalog/ag_graph.o \