[hibernate-commits] [hibernate/hibernate-orm] bc97b1: HHH-5732 - @OrderColumn not updated if @OneToMany ...

[GitHub]

  Branch: refs/heads/4.1
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: bc97b1157b520bde4000a7e3913b3637f29c1817
      https://github.com/hibernate/hibernate-orm/commit/bc97b1157b520bde4000a7e3913b3637f29c1817
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    A hibernate-core/src/test/java/org/hibernate/test/collection/list/LineItem.java
    M hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml
    A hibernate-core/src/test/java/org/hibernate/test/collection/list/Order.java
    M hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java

  Log Message:
  -----------
  HHH-5732 - @OrderColumn not updated if @OneToMany has mappedby defined

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java


  Commit: 26b612a613bb68baee67f31d7fa638ef97380757
      https://github.com/hibernate/hibernate-orm/commit/26b612a613bb68baee67f31d7fa638ef97380757
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
    M hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/BankAccount.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java
    M hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java

  Log Message:
  -----------
  HHH-5732 @OrderColumn not updated if @OneToMany has mappedby defined
Conflicts:
	hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java


Compare: https://github.com/hibernate/hibernate-orm/compare/1b5144b0a66f...26b612a613bb