From 7157f30d3e4b964a54c7d2484858589fcda34d10 Mon Sep 17 00:00:00 2001
From: Naisila Puka <37271756+naisila@users.noreply.github.com>
Date: Mon, 15 Dec 2025 16:45:55 +0300
Subject: [PATCH] Bump PG versions to 17.7, 16.11 (#8355)

This PR bumps PG versions in CI tests and update some error messages in
statistics based on the following commits of latest PG minors:

https://github.com/postgres/postgres/commit/ab16418ee
https://github.com/postgres/postgres/commit/f225473cb
https://github.com/postgres/postgres/commit/f9b41f3e1

Sister PR https://github.com/citusdata/the-process/pull/181
---
 .devcontainer/Dockerfile                           |  6 +++---
 .github/workflows/build_and_test.yml               | 10 +++++-----
 src/test/regress/expected/pg18_0.out               |  4 ++--
 src/test/regress/expected/propagate_statistics.out |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 55968b569..c2467a330 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -73,7 +73,7 @@ USER citus
 
 # build postgres versions separately for effective parrallelism and caching of already built versions when changing only certain versions
 FROM base AS pg16
-RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.10
+RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.11
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
 RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -85,7 +85,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
 RUN rm .pgenv-staging/config/default.conf
 
 FROM base AS pg17
-RUN MAKEFLAGS="-j $(nproc)" pgenv build 17.6
+RUN MAKEFLAGS="-j $(nproc)" pgenv build 17.7
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
 RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -203,7 +203,7 @@ COPY --chown=citus:citus .psqlrc .
 RUN sudo chown --from=root:root citus:citus -R ~
 
 # sets default pg version
-RUN pgenv switch 17.6
+RUN pgenv switch 17.7
 
 # make connecting to the coordinator easy
 ENV PGPORT=9700
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index e71071948..555d548ca 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -31,11 +31,11 @@ jobs:
       pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester"
       style_checker_image_name: "ghcr.io/citusdata/stylechecker"
       style_checker_tools_version: "0.8.33"
-      sql_snapshot_pg_version: "17.6"
-      image_suffix: "-v9555df2"
-      pg16_version: '{ "major": "16", "full": "16.10" }'
-      pg17_version: '{ "major": "17", "full": "17.6" }'
-      upgrade_pg_versions: "16.10-17.6"
+      sql_snapshot_pg_version: "17.7"
+      image_suffix: "-vafdc5ac"
+      pg16_version: '{ "major": "16", "full": "16.11" }'
+      pg17_version: '{ "major": "17", "full": "17.7" }'
+      upgrade_pg_versions: "16.11-17.7"
     steps:
       # Since GHA jobs need at least one step we use a noop step here.
       - name: Set up parameters
diff --git a/src/test/regress/expected/pg18_0.out b/src/test/regress/expected/pg18_0.out
index 27d3c8d74..9146db605 100644
--- a/src/test/regress/expected/pg18_0.out
+++ b/src/test/regress/expected/pg18_0.out
@@ -8,12 +8,12 @@ SELECT substring(:'server_version', '\d+')::int >= 18 AS server_version_ge_18
 -- behavior is same among PG versions, error message differs
 -- relevant PG18 commit: 3eea4dc2c7, 38883916e
 CREATE STATISTICS tst ON a FROM (VALUES (x)) AS foo;
-ERROR:  only a single relation is allowed in CREATE STATISTICS
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
 CREATE FUNCTION tftest(int) returns table(a int, b int) as $$
 SELECT $1, $1+i FROM generate_series(1,5) g(i);
 $$ LANGUAGE sql IMMUTABLE STRICT;
 CREATE STATISTICS alt_stat2 ON a FROM tftest(1);
-ERROR:  only a single relation is allowed in CREATE STATISTICS
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
 DROP FUNCTION tftest;
 \if :server_version_ge_18
 \else
diff --git a/src/test/regress/expected/propagate_statistics.out b/src/test/regress/expected/propagate_statistics.out
index 80e944bc8..02563c22a 100644
--- a/src/test/regress/expected/propagate_statistics.out
+++ b/src/test/regress/expected/propagate_statistics.out
@@ -16,7 +16,7 @@ SELECT create_distributed_table('test_stats', 'a');
 (1 row)
 
 CREATE STATISTICS pg_temp.s1 (dependencies) ON a, b FROM test_stats;
-ERROR:  "statistics object s1" has dependency on unsupported object "schema pg_temp_xxx"
+ERROR:  "statistics object pg_temp_xxx.s1" has dependency on unsupported object "schema pg_temp_xxx"
 CREATE STATISTICS s1 (dependencies) ON a, b FROM test_stats;
 -- test for distributing an already existing statistics
 CREATE TABLE "test'stats2" (