Skip to content
Success

Changes

Summary

  1. Verify integrity constraints of merged instances (on commit). (commit: b1284eb) (details)
  2. When merging changes on a field, use original if the clone is a managed (commit: e992c34) (details)
Commit b1284eb1830a643c62984fb645728344571ce8af by Martin Ledvinka
Verify integrity constraints of merged instances (on commit).
(commit: b1284eb)
The file was modified jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/change/UnitOfWorkChangeSetImpl.java (diff)
The file was modified jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkImpl.java (diff)
The file was modified jopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/change/UnitOfWorkChangeSetTest.java (diff)
The file was modified jopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/runner/UpdateOperationsRunner.java (diff)
The file was modified jopa-api/src/main/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkChangeSet.java (diff)
The file was modified jopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/runner/BaseRunner.java (diff)
The file was modified jopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkTest.java (diff)
Commit e992c3423b841b6ee5cca279849d2ee408910e6f by Martin Ledvinka
When merging changes on a field, use original if the clone is a managed
type. It fixes issues with object identity, which were caused by the
clone attributes being merged into the original attributes, instead of
just replacing the instance.
(commit: e992c34)
The file was modified jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/DefaultInstanceBuilder.java (diff)
The file was modified jopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/CloneBuilderTest.java (diff)