From 8302b061b2d8873bdeafc5200223c80eb6630b6c Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Wed, 21 Sep 2022 11:30:14 +0200
Subject: [PATCH] Revert "HHH-15533 Introduce versionless CI matrix entries for
 the PostgreSQL and MySQL minimum supported version"

This reverts commit aae3513d588a2640edf27bd8a62d37ec9f953179.
---
 .github/workflows/contributor-build.yml | 2 +-
 Jenkinsfile                             | 8 ++++----
 README.adoc                             | 4 ++--
 ci/build.sh                             | 2 +-
 ci/database-start.sh                    | 4 ++--
 docker_db.sh                            | 5 -----
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/contributor-build.yml b/.github/workflows/contributor-build.yml
index 22a8b38c31..3a1d392267 100644
--- a/.github/workflows/contributor-build.yml
+++ b/.github/workflows/contributor-build.yml
@@ -40,7 +40,7 @@ jobs:
           - rdbms: derby
           - rdbms: mysql8
           - rdbms: mariadb
-          - rdbms: postgresql
+          - rdbms: postgresql_9_5
           - rdbms: postgresql_13
           - rdbms: oracle
           - rdbms: db2
diff --git a/Jenkinsfile b/Jenkinsfile
index 3ae7f1b8cd..287521c10b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ stage('Configure') {
 //		new BuildEnvironment( dbName: 'derby' ),
 //		new BuildEnvironment( dbName: 'mysql8' ),
 //		new BuildEnvironment( dbName: 'mariadb' ),
-//		new BuildEnvironment( dbName: 'postgresql' ),
+//		new BuildEnvironment( dbName: 'postgresql_9_5' ),
 //		new BuildEnvironment( dbName: 'postgresql_13' ),
 //		new BuildEnvironment( dbName: 'oracle' ),
 		new BuildEnvironment( dbName: 'oracle_ee' ),
@@ -130,12 +130,12 @@ stage('Build') {
 									sh "./docker_db.sh mariadb"
 									state[buildEnv.tag]['containerName'] = "mariadb"
 									break;
-								case "postgresql":
+								case "postgresql_9_5":
 									// use the postgis image to enable the PGSQL GIS (spatial) extension
 									docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
 										docker.image('postgis/postgis:9.5-2.5').pull()
 									}
-									sh "./docker_db.sh postgresql"
+									sh "./docker_db.sh postgresql_9_5"
 									state[buildEnv.tag]['containerName'] = "postgres"
 									break;
 								case "postgresql_13":
@@ -197,7 +197,7 @@ stage('Build') {
 								case "tidb":
 									runTest("-Pdb=tidb -DdbHost=localhost:4000${state[buildEnv.tag]['additionalOptions']}", 'TIDB')
 									break;
-								case "postgresql":
+								case "postgresql_9_5":
 								case "postgresql_13":
 									runTest("-Pdb=pgsql_ci${state[buildEnv.tag]['additionalOptions']}")
 									break;
diff --git a/README.adoc b/README.adoc
index 88ce99e407..e51ff27e52 100644
--- a/README.adoc
+++ b/README.adoc
@@ -130,7 +130,7 @@ The script `docker_db.sh` allows you to start a pre-configured database which ca
 All you have to do is run the following command:
 
 ----
-./docker_db.sh postgresql
+./docker_db.sh postgresql_9_5
 ----
 
 omitting the argument will print a list of possible options.
@@ -174,7 +174,7 @@ The following table illustrates a list of commands for various databases that ca
 |`./gradlew test -Pdb=mariadb_ci`
 
 |PostgreSQL 9.5
-|`./docker_db.sh postgresql`
+|`./docker_db.sh postgresql_9_5`
 |`./gradlew test -Pdb=pgsql_ci`
 
 |PostgreSQL 13
diff --git a/ci/build.sh b/ci/build.sh
index d487f38c36..49f32442ae 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -11,7 +11,7 @@ elif [ "$RDBMS" == "mysql" ]; then
   goal="-Pdb=mysql_ci"
 elif [ "$RDBMS" == "mariadb" ]; then
   goal="-Pdb=mariadb_ci"
-elif [ "$RDBMS" == "postgresql" ]; then
+elif [ "$RDBMS" == "postgresql_9_5" ]; then
   goal="-Pdb=pgsql_ci"
 elif [ "$RDBMS" == "postgresql_13" ]; then
   goal="-Pdb=pgsql_ci"
diff --git a/ci/database-start.sh b/ci/database-start.sh
index 30ff434ca8..997a450ee9 100755
--- a/ci/database-start.sh
+++ b/ci/database-start.sh
@@ -8,8 +8,8 @@ elif [ "$RDBMS" == 'mysql8' ]; then
   bash $DIR/../docker_db.sh mysql_8_0
 elif [ "$RDBMS" == 'mariadb' ]; then
   bash $DIR/../docker_db.sh mariadb
-elif [ "$RDBMS" == 'postgresql' ]; then
-  bash $DIR/../docker_db.sh postgresql
+elif [ "$RDBMS" == 'postgresql_9_5' ]; then
+  bash $DIR/../docker_db.sh postgresql_9_5
 elif [ "$RDBMS" == 'postgresql_13' ]; then
   bash $DIR/../docker_db.sh postgresql_13
 elif [ "$RDBMS" == 'db2' ]; then
diff --git a/docker_db.sh b/docker_db.sh
index 1218531931..454e05de85 100755
--- a/docker_db.sh
+++ b/docker_db.sh
@@ -86,10 +86,6 @@ mariadb() {
     fi
 }
 
-postgresql() {
-  postgresql_9_5
-}
-
 postgresql_9_5() {
     $CONTAINER_CLI rm -f postgres || true
     $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 -d docker.io/postgis/postgis:9.5-2.5
@@ -531,7 +527,6 @@ if [ -z ${1} ]; then
     echo -e "\tpostgis"
     echo -e "\tpostgresql_13"
     echo -e "\tpostgresql_9_5"
-    echo -e "\tpostgresql"
     echo -e "\tsybase"
 else
     ${1}