This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 478809960 Merge pull request #502 from stariy95/4.2-FIX-CAY-2734-bigdecimal-support new c62d44169 CAY-2630 Prefetched relationships not preserving pending changes fix case for to-one relationship some code cleanup new fc6565a67 CAY-2630 Prefetched relationships not preserving pending changes fix case for to-many relationship new cb4690d01 Merge pull request #457 from stariy95/4.2-CAY-2630-merge-prefetch-with-diff The 6795 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cayenne/access/HierarchicalObjectResolver.java | 70 ++++++------- ....java => JoinedIdParentAttachmentStrategy.java} | 14 ++- .../cayenne/access/PrefetchProcessorNode.java | 108 ++++++++++++++++----- .../access/PrefetchProcessorTreeBuilder.java | 9 +- .../access/ResultScanParentAttachmentStrategy.java | 41 +++----- .../StackLookupParentAttachmentStrategy.java | 2 +- .../org/apache/cayenne/access/JointPrefetchIT.java | 102 ++++++++++++------- .../apache/cayenne/util/DeepMergeOperationIT.java | 29 +++--- 8 files changed, 221 insertions(+), 154 deletions(-) rename cayenne-server/src/main/java/org/apache/cayenne/access/{JoinedIdParentAttachementStrategy.java => JoinedIdParentAttachmentStrategy.java} (88%)