Bump PostgreSQL version used in tests: 17.2 → 17.5

bwaldvogel · bwaldvogel · commit dbfad4044c13 · 2025-05-23T10:21:43.000+02:00
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ class SchemaTest implements JUnit5ValidationFileAssertions {
 
     @Container
     @ServiceConnection
-    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:17.2");
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:17.5");
 
     @Test
     void schemaExport() {
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testCleanAndCreate.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testCleanAndCreate.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -27,6 +27,7 @@ CREATE DATABASE "test-db" WITH TEMPLATE = template0 ENCODING = 'UTF8' LOCALE_PRO
 
 ALTER DATABASE "test-db" OWNER TO "test-user";
 
+\encoding SQL_ASCII
 \connect -reuse-previous=on "dbname='test-db'"
 
 SET statement_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testCleanAndCreateIfExists.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testCleanAndCreateIfExists.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -27,6 +27,7 @@ CREATE DATABASE "test-db" WITH TEMPLATE = template0 ENCODING = 'UTF8' LOCALE_PRO
 
 ALTER DATABASE "test-db" OWNER TO "test-user";
 
+\encoding SQL_ASCII
 \connect -reuse-previous=on "dbname='test-db'"
 
 SET statement_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testConnectViaHostName.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testConnectViaHostName.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDataOnly.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDataOnly.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDump.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDump.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpExcludingTableData.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpExcludingTableData.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpSpecificSchemaOnly.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpSpecificSchemaOnly.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpToFileExcludingTableData.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpToFileExcludingTableData.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpVerbose.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpVerbose.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 -- Started on [MASKED_TIMESTAMP] UTC
 
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpWithoutPrivileges.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpWithoutPrivileges.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpWithoutSpecificSchema.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testDumpWithoutSpecificSchema.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/DatabaseWithData/testSchemaOnly.txt b/data/test/validation/PostgresDumpTest/DatabaseWithData/testSchemaOnly.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/EmptyDatabase/testDumpToFile.txt b/data/test/validation/PostgresDumpTest/EmptyDatabase/testDumpToFile.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/EmptyDatabase/testDumpToString.txt b/data/test/validation/PostgresDumpTest/EmptyDatabase/testDumpToString.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/EmptyDatabase/testSchemaOnly.txt b/data/test/validation/PostgresDumpTest/EmptyDatabase/testSchemaOnly.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/testConnectViaDockerContainerIpAddress.txt b/data/test/validation/PostgresDumpTest/testConnectViaDockerContainerIpAddress.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/testConnectViaDockerNetworkAlias_postgis-17.txt b/data/test/validation/PostgresDumpTest/testConnectViaDockerNetworkAlias_postgis-17.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.0 (Debian 17.0-1.pgdg110+1)
--- Dumped by pg_dump version 17.0 (Debian 17.0-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg110+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresDumpTest/testConnectViaDockerNetworkAlias_vanilla-17.txt b/data/test/validation/PostgresDumpTest/testConnectViaDockerNetworkAlias_vanilla-17.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/data/test/validation/PostgresRestoreTest/testRestoreOnlySpecificSchema.txt b/data/test/validation/PostgresRestoreTest/testRestoreOnlySpecificSchema.txt
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.2 (Debian 17.2-1.pgdg120+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped from database version 17.5 (Debian 17.5-1.pgdg120+1)
+-- Dumped by pg_dump version 17.5 (Debian 17.5-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
diff --git a/src/test/java/de/cronn/postgres/snapshot/util/BaseTest.java b/src/test/java/de/cronn/postgres/snapshot/util/BaseTest.java
@@ -43,7 +43,7 @@
 })
 abstract class BaseTest {
 
-	private static final DockerImageName POSTGRES_DOCKER_IMAGE = DockerImageName.parse("postgres:17.2");
+	private static final DockerImageName POSTGRES_DOCKER_IMAGE = DockerImageName.parse("postgres:17.5");
 
 	private static final String DATABASE_NAME = "test-db";
 	protected static final String USERNAME = "test-user";
diff --git a/src/test/java/de/cronn/postgres/snapshot/util/PostgresDumpTest.java b/src/test/java/de/cronn/postgres/snapshot/util/PostgresDumpTest.java
@@ -211,7 +211,7 @@ void testOtherPostgresVersion() {
 	void testConnectViaDockerContainerIpAddress() {
 		String networkAlias = "postgres-db";
 		try (Network network = Network.newNetwork();
-			 PostgreSQLContainer<?> postgresInNetworkContainer = createPostgresContainer(DockerImageName.parse("postgres:17.2"))
+			 PostgreSQLContainer<?> postgresInNetworkContainer = createPostgresContainer(DockerImageName.parse("postgres:17.5"))
 				 .withNetwork(network)
 				 .withNetworkAliases(networkAlias)) {
 			postgresInNetworkContainer.start();
@@ -226,8 +226,8 @@ void testConnectViaDockerContainerIpAddress() {
 
 	@ParameterizedTest
 	@CsvSource({
-		"vanilla-17, postgres:17.2",
-		"postgis-17, postgis/postgis:17-3.4",
+		"vanilla-17, postgres:17.5",
+		"postgis-17, postgis/postgis:17-3.5",
 	})
 	void testConnectViaDockerNetworkAlias(String testName, String fullImageName) {
 		String networkAlias = "postgres-db";
