Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17091 - Remove support for PostgreSQL versions older than 12 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2023-10-11 17:24:52 +02:00 committed by Christian Beikov
parent 749c6f0e15
commit 90485c2b78
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker_db.sh
View File

@ -168,9 +168,9 @@ postgresql() {
postgresql_15 postgresql_15
} }
postgresql_11() { postgresql_12() {
$CONTAINER_CLI rm -f postgres || true $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:11-3.3 $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:12-3.4
} }
postgresql_13() { postgresql_13() {
@ -1080,6 +1080,7 @@ if [ -z ${1} ]; then
echo -e "\tpostgresql_15" echo -e "\tpostgresql_15"
echo -e "\tpostgresql_14" echo -e "\tpostgresql_14"
echo -e "\tpostgresql_13" echo -e "\tpostgresql_13"
echo -e "\tpostgresql_12"
echo -e "\tsybase" echo -e "\tsybase"
echo -e "\ttidb" echo -e "\ttidb"
echo -e "\ttidb_5_1" echo -e "\ttidb_5_1"

17
hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
View File

@ -138,7 +138,7 @@ import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithM
* @author Gavin King * @author Gavin King
*/ */
public class PostgreSQLDialect extends Dialect { public class PostgreSQLDialect extends Dialect {
protected final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 11 ); protected final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 12 );
private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this); private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
@ -583,16 +583,11 @@ public class PostgreSQLDialect extends Dialect {
functionFactory.degrees(); functionFactory.degrees();
functionFactory.log(); functionFactory.log();
functionFactory.mod_operator(); functionFactory.mod_operator();
if ( getVersion().isSameOrAfter( 12 ) ) { functionFactory.log10();
functionFactory.log10(); functionFactory.tanh();
functionFactory.tanh(); functionFactory.sinh();
functionFactory.sinh(); functionFactory.cosh();
functionFactory.cosh(); functionFactory.moreHyperbolic();
functionFactory.moreHyperbolic();
}
else {
functionContributions.getFunctionRegistry().registerAlternateKey( "log10", "log" );
}
functionFactory.cbrt(); functionFactory.cbrt();
functionFactory.pi(); functionFactory.pi();
functionFactory.trim2(); functionFactory.trim2();

8
hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java
View File

@ -125,12 +125,10 @@ public class PostgreSQLSqlAstTranslator<T extends JdbcOperation> extends SqlAstT
@Override @Override
protected void renderMaterializationHint(CteMaterialization materialization) { protected void renderMaterializationHint(CteMaterialization materialization) {
if ( getDialect().getVersion().isSameOrAfter( 12 ) ) { if ( materialization == CteMaterialization.NOT_MATERIALIZED ) {
if ( materialization == CteMaterialization.NOT_MATERIALIZED ) { appendSql( "not " );
appendSql( "not " );
}
appendSql( "materialized " );
} }
appendSql( "materialized " );
} }
@Override @Override

8
nightly.Jenkinsfile
View File

@ -30,7 +30,7 @@ stage('Configure') {
new BuildEnvironment( dbName: 'hsqldb_2_6' ), new BuildEnvironment( dbName: 'hsqldb_2_6' ),
new BuildEnvironment( dbName: 'mysql_5_7' ), new BuildEnvironment( dbName: 'mysql_5_7' ),
new BuildEnvironment( dbName: 'mariadb_10_3' ), new BuildEnvironment( dbName: 'mariadb_10_3' ),
new BuildEnvironment( dbName: 'postgresql_11' ), new BuildEnvironment( dbName: 'postgresql_12' ),
new BuildEnvironment( dbName: 'edb_11' ), new BuildEnvironment( dbName: 'edb_11' ),
new BuildEnvironment( dbName: 'oracle_11_2' ), new BuildEnvironment( dbName: 'oracle_11_2' ),
new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ), new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ),
@ -124,12 +124,12 @@ stage('Build') {
sh "./docker_db.sh mariadb_10_3" sh "./docker_db.sh mariadb_10_3"
state[buildEnv.tag]['containerName'] = "mariadb" state[buildEnv.tag]['containerName'] = "mariadb"
break; break;
case "postgresql_11": case "postgresql_12":
// use the postgis image to enable the PGSQL GIS (spatial) extension // use the postgis image to enable the PGSQL GIS (spatial) extension
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
docker.image('postgis/postgis:11-3.3').pull() docker.image('postgis/postgis:12-3.4').pull()
} }
sh "./docker_db.sh postgresql_11" sh "./docker_db.sh postgresql_12"
state[buildEnv.tag]['containerName'] = "postgres" state[buildEnv.tag]['containerName'] = "postgres"
break; break;
case "edb_11": case "edb_11":