Branch: refs/heads/5.0 Home: https://github.com/hibernate/hibernate-orm Commit: 659157a45c8adea79831007f6f1324469171b9c8 https://github.com/hibernate/hibernate-orm/commit/659157a45c8adea79831007... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java M hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java A hibernate-core/src/main/java/org/hibernate/dialect/identity/GetGeneratedKeysDelegate.java A hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java A hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java A hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cGetGeneratedKeysDelegate.java A hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java M hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java M hibernate-core/src/main/java/org/hibernate/id/insert/InsertSelectIdentityInsert.java M hibernate-core/src/main/java/org/hibernate/mapping/Table.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/main/java/org/hibernate/sql/Insert.java M hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java A hibernate-core/src/test/java/org/hibernate/test/idgen/identity/CustomIdentityColumnSupportTest.java A hibernate-core/src/test/java/org/hibernate/test/idgen/identity/hhh9983/SaveEntityTest.java M hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java Log Message: ----------- HHH-10422 - Add test for issue (from HHH-9983) (cherry picked from commit 1f3048e572382a76f81a4d5f3c31f1fd4b26d696) HHH-10422 - Fix Error saving entity with identity id on Oracle 12c (from HHH-9983) (cherry picked from commit 33458ab6f84c997533422f5bac549ed94631e14d) Conflicts: hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java HHH-10422 : Backport HHH-9983 to fix identity IDs using Oracle12cDialect in 5.0 HHH-10422 : Custom identity support test HHH-10422 : Custom identity support test