This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit e3a2293ace36c7ad13cc6d733a17018f112c026d Merge: 996ca92bf c3617ddd4 Author: Nikita Timofeev <stari...@users.noreply.github.com> AuthorDate: Thu May 23 15:25:32 2024 +0300 Merge pull request #615 from Jugen/improve-deletion-of-entities-from-flattened-attribute CAY-2854 Improve delete prevention detection of flattened attribute row RELEASE-NOTES.txt | 1 + .../org/apache/cayenne/access/ObjectResolver.java | 5 ++-- .../org/apache/cayenne/access/ObjectStore.java | 2 +- .../cayenne/access/flush/RootRowOpProcessor.java | 31 +++++----------------- .../reflect/AdditionalDbEntityDescriptor.java | 29 ++++++++++++++++++++ .../apache/cayenne/reflect/ClassDescriptor.java | 6 ++--- .../reflect/LazyClassDescriptorDecorator.java | 2 +- .../cayenne/reflect/PersistentDescriptor.java | 8 +++--- .../reflect/PersistentDescriptorFactory.java | 16 +++++++++-- 9 files changed, 63 insertions(+), 37 deletions(-)