[hibernate-commits] [hibernate/hibernate-orm] b01abe: HHH-6911 - Write DiscriminatorValue to Discriminat...
Branch: refs/heads/4.2
Home: https://github.com/hibernate/hibernate-orm
Commit: b01abeadefb8696cca4cc2b27caace87d0e94d6f
https://github.com/hibernate/hibernate-orm/commit/b01abeadefb8696cca4cc2b...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java
M hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java
M
hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
A
hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java
A
hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java
Log Message:
-----------
HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined
with InheritanceType#JOINED
Conflicts:
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
Commit: d847a171eb270192ae8ea3aea97fd37d4bff4eb4
https://github.com/hibernate/hibernate-orm/commit/d847a171eb270192ae8ea3a...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
M hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java
A
hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java
Log Message:
-----------
HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined
with InheritanceType#JOINED
Conflicts:
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
Commit: e99f889bfdcfab5303be0cd097b944999fabc9dc
https://github.com/hibernate/hibernate-orm/commit/e99f889bfdcfab5303be0cd...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
Log Message:
-----------
HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined
with InheritanceType#JOINED
Conflicts:
hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
Compare: https://github.com/hibernate/hibernate-orm/compare/323cc9d0b02c...e99f889...