Compatibility with pg15 (#47)

CyberDem0n · Jun 17, 2022 · 271c152 · 271c152
1 parent 5d50028
commit 271c152
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -16,30 +16,32 @@ jobs:
       matrix:
         include:
         - postgres-version: '9.3'
-          os: ubuntu-18.04
+          os: ubuntu-22.04
         - postgres-version: '9.4'
-          os: ubuntu-20.04
+          os: ubuntu-18.04
         - postgres-version: '9.5'
-          os: ubuntu-22.04
+          os: ubuntu-20.04
         - postgres-version: '9.6'
-          os: ubuntu-18.04
+          os: ubuntu-22.04
         - postgres-version: '10'
-          os: ubuntu-20.04
+          os: ubuntu-18.04
         - postgres-version: '11'
-          os: ubuntu-22.04
+          os: ubuntu-20.04
         - postgres-version: '12'
-          os: ubuntu-18.04
+          os: ubuntu-22.04
         - postgres-version: '13'
-          os: ubuntu-20.04
+          os: ubuntu-18.04
         - postgres-version: '14'
+          os: ubuntu-20.04
+        - postgres-version: '15'
           os: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v1
     - name: Set up packages
       run: |
         set -e
-        sudo sh -c "echo \"deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main $PG\" > /etc/apt/sources.list.d/pgdg.list"
+        sudo sh -c "echo \"deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg-testing main $PG\" > /etc/apt/sources.list.d/pgdg.list"
         sudo apt-get update
         sudo apt-get install -yq --no-install-suggests --no-install-recommends curl postgresql-common lcov libevent-dev pv brotli libbrotli1 libbrotli-dev
         # forbid creation of a main cluster when package is installed

diff --git a/postgres_stats.c b/postgres_stats.c
@@ -9,6 +9,9 @@
 #include "access/heapam.h"
 #include "access/xact.h"
 #include "access/xlog.h"
+#if PG_VERSION_NUM >= 150000
+#include "access/xlogrecovery.h"
+#endif
 #include "executor/spi.h"
 #include "catalog/pg_authid.h"
 #include "catalog/pg_database.h"
@@ -992,8 +995,10 @@ static PgBackendType map_backend_type(BackendType type)
 			return PG_UNKNOWN;
 		case B_ARCHIVER:
 			return PG_ARCHIVER;
+#if PG_VERSION_NUM < 150000
 		case B_STATS_COLLECTOR:
 			return PG_STATS_COLLECTOR;
+#endif
 		case B_LOGGER:
 			return PG_LOGGER;
 #endif