HHH-17316/HHH-17317/HHH-17318 Remove support for PostgreSQL and EDB 12

Author: beikov

ci/build.sh

@@ -12,9 +12,9 @@ elif [ "$RDBMS" == "mysql" ] || [ "$RDBMS" == "mysql_8_0" ]; then
   goal="-Pdb=mysql_ci"
 elif [ "$RDBMS" == "mariadb" ] || [ "$RDBMS" == "mariadb_10_4" ]; then
   goal="-Pdb=mariadb_ci"
-elif [ "$RDBMS" == "postgresql" ] || [ "$RDBMS" == "postgresql_12" ]; then
+elif [ "$RDBMS" == "postgresql" ] || [ "$RDBMS" == "postgresql_13" ]; then
   goal="-Pdb=pgsql_ci"
-elif [ "$RDBMS" == "edb" ] || [ "$RDBMS" == "edb_12" ]; then
+elif [ "$RDBMS" == "edb" ] || [ "$RDBMS" == "edb_13" ]; then
   goal="-Pdb=edb_ci -DdbHost=localhost:5444"
 elif [ "$RDBMS" == "oracle" ]; then
   goal="-Pdb=oracle_ci"

docker_db.sh

@@ -154,12 +154,6 @@ postgresql() {
   postgresql_17
 }
 
-postgresql_12() {
-    $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 ${DB_IMAGE_POSTGRESQL_12:-docker.io/postgis/postgis:12-3.4}
-    $CONTAINER_CLI exec postgres bash -c '/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && apt install -y postgresql-12-pgvector && psql -U hibernate_orm_test -d hibernate_orm_test -c "create extension vector;"'
-}
-
 postgresql_13() {
     $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 ${DB_IMAGE_POSTGRESQL_13:-docker.io/postgis/postgis:13-3.1}
@@ -197,11 +191,11 @@ edb() {
     edb_17
 }
 
-edb_12() {
+edb_13() {
     $CONTAINER_CLI rm -f edb || true
     # We need to build a derived image because the existing image is mainly made for use by a kubernetes operator
-    (cd edb; $CONTAINER_CLI build -t edb-test:12 -f edb12.Dockerfile .)
-    $CONTAINER_CLI run --name edb -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p 5444:5444 -d edb-test:12
+    (cd edb; $CONTAINER_CLI build -t edb-test:13 -f edb13.Dockerfile .)
+    $CONTAINER_CLI run --name edb -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p 5444:5444 -d edb-test:13
 }
 
 edb_14() {
@@ -1047,10 +1041,11 @@ if [ -z ${1} ]; then
     echo -e "\tdb2_10_5"
     echo -e "\tdb2_spatial"
     echo -e "\tedb"
+    echo -e "\tedb_17"
     echo -e "\tedb_16"
     echo -e "\tedb_15"
     echo -e "\tedb_14"
-    echo -e "\tedb_12"
+    echo -e "\tedb_13"
     echo -e "\thana"
     echo -e "\tmariadb"
     echo -e "\tmariadb_verylatest"
@@ -1070,11 +1065,11 @@ if [ -z ${1} ]; then
     echo -e "\toracle_23"
     echo -e "\toracle_21"
     echo -e "\tpostgresql"
+    echo -e "\tpostgresql_17"
     echo -e "\tpostgresql_16"
     echo -e "\tpostgresql_15"
     echo -e "\tpostgresql_14"
     echo -e "\tpostgresql_13"
-    echo -e "\tpostgresql_12"
     echo -e "\tsybase"
     echo -e "\ttidb"
     echo -e "\ttidb_5_4"

edb/edb12.Dockerfile renamed to edb/edb13.Dockerfile

@@ -1,12 +1,12 @@
-FROM quay.io/enterprisedb/edb-postgres-advanced:12.16-3.3-postgis
+FROM quay.io/enterprisedb/edb-postgres-advanced:13.20-3.5-postgis
 USER root
 # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
 RUN chown -R postgres:postgres /var/lib/edb && chmod 777 /var/lib/edb && rm /docker-entrypoint-initdb.d/10_postgis.sh
 
 USER postgres
 ENV LANG en_US.utf8
-ENV PG_MAJOR 12
-ENV PG_VERSION 12
+ENV PG_MAJOR 13
+ENV PG_VERSION 13
 ENV PGPORT 5444
 ENV PGDATA /var/lib/edb/as$PG_MAJOR/data/
 VOLUME /var/lib/edb/as$PG_MAJOR/data/

hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java

@@ -143,15 +143,15 @@
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMillis;
 
 /**
- * A {@linkplain Dialect SQL dialect} for PostgreSQL 12 and above.
+ * A {@linkplain Dialect SQL dialect} for PostgreSQL 13 and above.
  * <p>
  * Please refer to the
  * <a href="https://www.postgresql.org/docs/current/index.html">PostgreSQL documentation</a>.
  *
  * @author Gavin King
  */
 public class PostgreSQLDialect extends Dialect {
-	protected final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 12 );
+	protected final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 13 );
 
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
 	private final StandardTableExporter postgresqlTableExporter = new StandardTableExporter( this ) {
@@ -645,11 +645,9 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.jsonRemove_postgresql();
 		functionFactory.jsonReplace_postgresql();
 		functionFactory.jsonInsert_postgresql();
-		if ( getVersion().isSameOrAfter( 13 ) ) {
-			// Requires support for WITH clause in subquery which only 13+ provides
-			functionFactory.jsonMergepatch_postgresql();
-		}
-		functionFactory.jsonArrayAppend_postgresql( getVersion().isSameOrAfter( 13 ) );
+		// Requires support for WITH clause in subquery which only 13+ provides
+		functionFactory.jsonMergepatch_postgresql();
+		functionFactory.jsonArrayAppend_postgresql( true );
 		functionFactory.jsonArrayInsert_postgresql();
 
 		functionFactory.xmlelement();
@@ -1404,7 +1402,7 @@ public boolean supportsFetchClause(FetchClauseType type) {
 		return switch (type) {
 			case ROWS_ONLY -> true;
 			case PERCENT_ONLY, PERCENT_WITH_TIES -> false;
-			case ROWS_WITH_TIES -> getVersion().isSameOrAfter(13);
+			case ROWS_WITH_TIES -> true;
 		};
 	}
 

hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonMergepatchFunction.java

@@ -108,13 +108,17 @@ public void render(
 
 		sqlAppender.appendSql( "select" );
 		// Use strict aggregation to ensure a SQL null does not end up as JSON null in the result
-		sqlAppender.appendSql( " jsonb_object_agg_strict(coalesce(" );
+		sqlAppender.appendSql( " jsonb_object_agg(coalesce(" );
 		renderColumnList(sqlAppender, "k", arguments.size());
 		sqlAppender.appendSql( "),coalesce(case when coalesce(" );
 		renderColumnList(sqlAppender, "k", arguments.size());
 		sqlAppender.appendSql( ")=r.p[cardinality(r.p)] then r.v end," );
 		renderColumnList(sqlAppender, "v", arguments.size());
-		sqlAppender.appendSql( "))" );
+		sqlAppender.appendSql( ")) filter (where coalesce(case when coalesce(" );
+		renderColumnList(sqlAppender, "k", arguments.size());
+		sqlAppender.appendSql( ")=r.p[cardinality(r.p)] then r.v end," );
+		renderColumnList(sqlAppender, "v", arguments.size());
+		sqlAppender.appendSql( ") is not null)" );
 		// The parent path
 		sqlAppender.appendSql( ",coalesce(" );
 		renderColumnList(sqlAppender, "p", arguments.size());

hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java

@@ -86,7 +86,7 @@ public void testTrimAll(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 12, matchSubTypes = true, reason = "The PostgreSQL emulation for version < 14 doesn't throw an error")
+	@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 13, matchSubTypes = true, reason = "The PostgreSQL emulation for version < 14 doesn't throw an error")
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "The Cockroach emulation doesn't throw an error")
 	public void testTrimOutOfRange(SessionFactoryScope scope) {
 		scope.inSession( em -> {

nightly.Jenkinsfile

@@ -30,8 +30,8 @@ stage('Configure') {
 		new BuildEnvironment( dbName: 'hsqldb_2_6' ),
 		new BuildEnvironment( dbName: 'mysql_8_0' ),
 		new BuildEnvironment( dbName: 'mariadb_10_5' ),
-		new BuildEnvironment( dbName: 'postgresql_12' ),
-		new BuildEnvironment( dbName: 'edb_12' ),
+		new BuildEnvironment( dbName: 'postgresql_13' ),
+		new BuildEnvironment( dbName: 'edb_13' ),
 		new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ),
 		new BuildEnvironment( dbName: 'mssql_2017' ), // Unfortunately there is no SQL Server 2008 image, so we have to test with 2017
 // 		new BuildEnvironment( dbName: 'sybase_16' ), // There only is a Sybase ASE 16 image, so no pint in testing that nightly
@@ -123,17 +123,17 @@ stage('Build') {
 									sh "./docker_db.sh mariadb_10_5"
 									state[buildEnv.tag]['containerName'] = "mariadb"
 									break;
-								case "postgresql_12":
+								case "postgresql_13":
 									// 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:12-3.4').pull()
+										docker.image('postgis/postgis:13-3.1').pull()
 									}
-									sh "./docker_db.sh postgresql_12"
+									sh "./docker_db.sh postgresql_13"
 									state[buildEnv.tag]['containerName'] = "postgres"
 									break;
-								case "edb_12":
-									docker.image('quay.io/enterprisedb/edb-postgres-advanced:12.16-3.3-postgis').pull()
-									sh "./docker_db.sh edb_12"
+								case "edb_13":
+									docker.image('quay.io/enterprisedb/edb-postgres-advanced:13.20-3.5-postgis').pull()
+									sh "./docker_db.sh edb_13"
 									state[buildEnv.tag]['containerName'] = "edb"
 									break;
 								case "db2_10_5":