Skip to content

Commit 693d053

Browse files
mbelladebeikov
authored andcommitted
HHH-15900 Fix trigger creation on PG10+HANA and check version in OracleDialect to support insert returning generated keys
1 parent 99186e1 commit 693d053

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ public String currentTimestampWithTimeZone() {
326326

327327
@Override
328328
public boolean supportsInsertReturningGeneratedKeys() {
329-
return true;
329+
return getVersion().isSameOrAfter( 12 );
330330
}
331331

332332
/**

hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.hbm.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
$$
3535
language plpgsql;
3636
37-
create or replace trigger t_i_my_entity
37+
drop trigger if exists my_entity_trigger on my_entity;
38+
39+
create trigger my_entity_trigger
3840
before insert on my_entity
3941
for each row
4042
execute procedure gen_id_my_entity();]]>

hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/MyEntity.hbm.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
$$
3737
language plpgsql;
3838
39-
create or replace trigger my_entity_trigger
39+
drop trigger if exists my_entity_trigger on my_entity;
40+
41+
create trigger my_entity_trigger
4042
before insert on my_entity
4143
for each row
4244
execute procedure gen_id_my_entity();]]>

0 commit comments

Comments
 (0)