Commit Graph
6442 Commits
Author SHA1 Message Date
Rob Bygrave 44e0585fb7 #2961 - Followup for #2952 - @OneToMany + orphanRemoval + @SoftDelete + non-BeanCollection collection results in hard deletes
As noted in comments in #2952

In the internals of SaveManyBeans we have:

- BUG: the deleteByParentId is hard delete and does not care for soft delete
- YUK: internally we have 3 ways of performing the orphan removal when we really want 2

This change fixes the BUG and fixes the YUK. It does this by removing the special case at: https://github.com/ebean-orm/ebean/blob/ebean-parent-13.11.3/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java#L347-L350 ... and replacing it with the more common orphan removal code used when we do not have BeanCollection modifications.

The result of this change is that in SaveManyBeans internals we get back to have 2 ways to remove orphans.

- A BeanCollection with modifications: Orphans explicitly deleted using the known elements removed from the collection
- All other cases: Orphans as everything NOT in the collection that is going to be updated
2023-02-10 13:08:44 +13:00
Rob BygraveandGitHub 889c0f12e0 Merge pull request #2960 from ebean-orm/buchtajz-one2many_setArraylist
Fix for @OneToMany orphanRemoval not occurring for #2952 #2953
2023-02-10 13:01:55 +13:00
Rob Bygrave 0135263dbd Style only for SaveManyBeans switching order in if/else 2023-02-09 23:45:27 +13:00
Rob Bygrave 564194042b No effective change, BeanCollectionUtil perform the instanceof Collection before instanceof Map check 2023-02-09 23:44:13 +13:00
Rob Bygrave 244d45674a #2952 #2953 - Fix for @OneToMany orphanRemoval not occurring
orphanRemoval was not occurring when a loaded bean had a collection
replaced by a new BeanCollection (as opposed to a vanilla collection
like java.util.ArrayList).

Json marshalling a collection puts beans into BeanCollection and this
is part of the test that reproduced this issue.
2023-02-09 23:29:13 +13:00
Rob Bygrave 4722f10f5e Bump versions after release 2023-02-07 22:46:08 +13:00
Rob Bygrave 3f5140e7f3 [maven-release-plugin] prepare for next development iteration 2023-02-07 22:10:29 +13:00
Rob Bygrave 43dec17d08 [maven-release-plugin] prepare release ebean-parent-13.11.3 ebean-parent-13.11.3 2023-02-07 22:10:16 +13:00
Rob Bygrave f1ee45d7d1 Bump ebean-agent to 13.11.3 2023-02-07 22:06:16 +13:00
Rob Bygrave 3263e7bfc3 #2959 - Improve logging for lazy loading error due to "markAsDeleted" 2023-02-07 22:05:34 +13:00
Rob Bygrave e01f19b3aa Merge branch 'one2many_setArraylist' of github.com:buchtajz/ebean into buchtajz-one2many_setArraylist 2023-02-07 20:09:01 +13:00
Rob Bygrave 20f6a659fe #2959 - Improve logging for lazy loading error due to "markAsDeleted" 2023-02-07 19:59:33 +13:00
Michal Buchtík 09fe923770 Merge remote-tracking branch 'origin/one2many_setArraylist' into one2many_setArraylist 2023-02-05 09:28:11 +01:00
buchtajzandGitHub e6f5e42c2d Merge branch 'ebean-orm:master' into one2many_setArraylist 2023-02-05 09:25:29 +01:00
Rob Bygrave 5150ecba62 #2948 - SoftDelete entities are hard deleted on orphan removal 2023-02-02 23:15:22 +13:00
Rob Bygrave 978b1dbe02 Merge branch 'master' of github.com:ebean-orm/ebean 2023-02-02 23:06:49 +13:00
Rob Bygrave 9813703ce5 Merge branch 'Ichtil-hard_delete_instead_of_soft_delete_2' 2023-02-02 23:03:28 +13:00
Rob Bygrave 09001e80b5 #2948 - SoftDelete entities are hard deleted on orphan removal 2023-02-02 23:02:44 +13:00
Rob BygraveandGitHub 4aa3ca6d95 Merge pull request #2941 from FOCONIS/expressionlist-clear
NEW: ExpressionList has clear() method
2023-02-02 01:13:28 +13:00
Rob BygraveandGitHub 5ec8469ddc Merge pull request #2940 from FOCONIS/fix-bom
FIX: Removed non existent modules from BOM
2023-02-02 00:42:43 +13:00
Michal Buchtík 39099bbcc9 print sql 2023-01-31 23:01:52 +01:00
Michal Buchtík cb2ca0de11 setArrayListDoInsertInsteadUpdate 2023-01-30 23:47:18 +01:00
Jan Klička b25233b0b9 Merge branch 'master' into hard_delete_instead_of_soft_delete_2
# Conflicts:
#	ebean-test/pom.xml
2023-01-27 16:28:03 +01:00
Jan Klička 743f1b10e3 #2948 2023-01-27 16:17:01 +01:00
Roland Praml 371f50fb4d NEW: ExpressionList has clear() method 2023-01-23 11:33:29 +01:00
Roland Praml a3be2041c8 FIX: Removed non existent modules from BOM 2023-01-23 11:31:45 +01:00
Rob Bygrave 09a831f2d6 Bump versions after release 2023-01-21 22:35:40 +13:00
Rob Bygrave 27d9e03691 [maven-release-plugin] prepare for next development iteration 2023-01-21 20:37:02 +13:00
Rob Bygrave 5a3c6b9dad [maven-release-plugin] prepare release ebean-parent-13.11.2 ebean-parent-13.11.2 2023-01-21 20:36:54 +13:00
Rob Bygrave 502eb78ffd Bump ebean-agent to 13.11.2 2023-01-21 20:25:49 +13:00
Rob Bygrave 761ec584b2 #2939 - [yugabyte] Bump testing against Yugabyte to use version 2.16.0.1-b7 2023-01-20 18:01:53 +13:00
Rob Bygrave 144b8c3077 #2939 - [yugabyte] Bump testing against Yugabyte to use version 2.16.0.1-b7 2023-01-20 17:35:27 +13:00
Rob Bygrave 79a1b3a024 Merge branch 'master' of github.com:ebean-orm/ebean 2023-01-20 16:58:41 +13:00
Rob Bygrave 519b75a778 Adjust tests for Postgres - DtoQuery2Test and EaObject 2023-01-20 16:58:26 +13:00
Rob BygraveandGitHub 1659c526d7 Merge pull request #2938 from FOCONIS/scan-cache-annotations-recursively
FIX: Search cache annotations recursively
2023-01-20 09:35:54 +13:00
Rob Bygrave 93fc7b07a0 Add more tests for DtoQuery column -> property mapping 2023-01-20 09:32:38 +13:00
Rob BygraveandGitHub d7e6feebc2 Merge pull request #2935 from ebean-orm/feature/2915-invalid-id-mapping
#2915 - Failing test for - generator param of @GeneratedValue is not ignored when using GenerationType.AUTO on db where this uses identity
2023-01-20 08:34:25 +13:00
Rob Bygrave 2a6c60c89b #2915 - Fix for generator param of @GeneratedValue is not ignored when using GenerationType.AUTO on db where this uses identity 2023-01-20 08:27:09 +13:00
Roland Praml b569ec97ee FIX: Search cache annotations recursively 2023-01-19 16:22:38 +01:00
Rob Bygrave 6b6cf48ae2 Merge branch 'FOCONIS-fix-order-by-on-prop' 2023-01-18 07:52:58 +13:00
Rob Bygrave f09cba3ab5 #2930 - Add extra test for DbOrderByTrimTest 2023-01-18 07:52:43 +13:00
Rob Bygrave 724183f669 Merge branch 'fix-order-by-on-prop' of github.com:FOCONIS/ebean into FOCONIS-fix-order-by-on-prop 2023-01-18 07:46:41 +13:00
Rob BygraveandGitHub a40212d41e Merge pull request #2934 from ebean-orm/feature/2931-redis-collectionIds
Ebean Redis - Failed to decode cache data for UUID as Id
2023-01-18 07:41:59 +13:00
Rob BygraveandGitHub c9ce02c43d Merge pull request #2933 from FOCONIS/bugfix/drop_table_drop_foreign_keys
Drop table statements potentially not possible due to foreign key constraints
2023-01-18 07:41:38 +13:00
Rob Bygrave 03c9782d63 #2915 - Failing test for - generator param of @GeneratedValue is not ignored when using GenerationType.AUTO on db where this uses identity 2023-01-18 00:07:04 +13:00
Rob Bygrave 130e9451f4 #2931 - Fix for Ebean Redis - Failed to decode cache data for UUID as Id 2023-01-17 23:20:33 +13:00
Rob Bygrave dce6a3e9e1 #2931 - Failing test for Ebean Redis - Failed to decode cache data for UUID as Id 2023-01-17 23:10:08 +13:00
Rob BygraveandGitHub 486044d29b Merge pull request #2932 from parveenyadav-multiply/patch-2
Create UUIDAsIDModel.java
2023-01-17 20:51:45 +13:00
parveenyadav-multiplyandGitHub 934b0f0044 Create UUIDAsIDModel.java 2023-01-16 03:05:01 +05:30
Jonas Pöhler 2633cd6bfe FIX: drop foreign keys before dropping tables 2023-01-13 15:35:54 +01:00