From 388889dd5f6830a8985e04311c64e33d592d1100 Mon Sep 17 00:00:00 2001
From: Alexander Kukushkin <cyberdemn@gmail.com>
Date: Thu, 28 Oct 2021 09:03:48 +0200
Subject: [PATCH] Add more extensions to PostgreSQL v14 (#655)

- pglogical
- pldebugger
- timescaledb 2.5.0
- latest bg_mon
- debezium v1.7.0

In addition to that fix postgres_log_* foreign tables, pg14 added two more fields to csv: leader_pid and query_id
---
 postgres-appliance/Dockerfile           | 17 +++++++----------
 postgres-appliance/scripts/post_init.sh |  4 ++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/postgres-appliance/Dockerfile b/postgres-appliance/Dockerfile
index dfe801c9a..7462657b7 100644
--- a/postgres-appliance/Dockerfile
+++ b/postgres-appliance/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_IMAGE=ubuntu:18.04
 ARG PGVERSION=14
-ARG TIMESCALEDB="1.7.5 2.3.1 2.4.2"
+ARG TIMESCALEDB="1.7.5 2.3.1 2.5.0"
 ARG DEMO=false
 ARG COMPRESS=false
 
@@ -81,10 +81,10 @@ ARG DEB_PG_SUPPORTED_VERSIONS="$PGOLDVERSIONS $PGVERSION"
 # Install PostgreSQL, extensions and contribs
 ENV POSTGIS_VERSION=3.1 \
     POSTGIS_LEGACY=3.1 \
-    BG_MON_COMMIT=b81800d9d45d112ef402eca7588d24364198417b \
+    BG_MON_COMMIT=098b4857d1e88862439c0f02a6031e9fb78e5ef2 \
     PG_AUTH_MON_COMMIT=437435b4e2de32a820e86973f6934ec849a768e0 \
     PG_MON_COMMIT=54fbdcc3cfe7e2a626bd96dda644d9a0c6866b58 \
-    DECODERBUFS=v.1.3.1.Final \
+    DECODERBUFS=v1.7.0.Final \
     SET_USER=REL3_0_0 \
     PLPROFILER=REL4_1 \
     PAM_OAUTH2=v1.0.1 \
@@ -153,6 +153,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
                         postgresql-${version}-hypopg \
                         postgresql-${version}-pgaudit \
                         postgresql-${version}-pg-checksums \
+                        postgresql-${version}-pgl-ddl-deploy \
+                        postgresql-${version}-pglogical \
+                        postgresql-${version}-pglogical-ticker \
+                        postgresql-${version}-pldebugger \
                         postgresql-${version}-pllua \
                         postgresql-${version}-plpgsql-check \
                         postgresql-${version}-plproxy \
@@ -160,13 +164,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
                         postgresql-${version}-postgis-${POSTGIS_VERSION%.*}-scripts \
                         postgresql-${version}-repack \
                         postgresql-${version}-wal2json" \
-                && if [ $version != "14" ]; then \
-                    EXTRAS="$EXTRAS \
-                        postgresql-${version}-pgl-ddl-deploy \
-                        postgresql-${version}-pglogical \
-                        postgresql-${version}-pglogical-ticker \
-                        postgresql-${version}-pldebugger"; \
-                fi \
                 && if [ "$WITH_PERL" = "true" ]; then \
                     EXTRAS="$EXTRAS postgresql-plperl-${version}"; \
                 fi \
diff --git a/postgres-appliance/scripts/post_init.sh b/postgres-appliance/scripts/post_init.sh
index 7d1c8cd76..e43773081 100755
--- a/postgres-appliance/scripts/post_init.sh
+++ b/postgres-appliance/scripts/post_init.sh
@@ -114,6 +114,10 @@ GRANT SELECT ON public.postgres_log TO admin;"
 if [ "$PGVER" -ge 13 ]; then
     echo "ALTER TABLE public.postgres_log ADD COLUMN IF NOT EXISTS backend_type text;"
 fi
+if [ "$PGVER" -ge 14 ]; then
+    echo "ALTER TABLE public.postgres_log ADD COLUMN IF NOT EXISTS leader_pid integer;"
+    echo "ALTER TABLE public.postgres_log ADD COLUMN IF NOT EXISTS query_id bigint;"
+fi
 
 # Sunday could be 0 or 7 depending on the format, we just create both
 for i in $(seq 0 7); do