ec35d4886c
Ticket DDC-1392 fixed an issue where uninitialized proxies could not be merged because the merge routine couldn't get the identifier from them. The soution was to initialize the proxy. Ticket DDC-1734 fixed the merging of *unserialized* uninitialized proxies by resetting their internals, so these proxies were able to initialize, as required by the fix for DDC-1392. Somehow, in the meanwhile, the fix for DDC-1392 is not needed anymore: reverting the patch will not break the associated test (but it does break the test for DDC-1734). This means it is not needed anymore to initialize the proxy when merging. Uninitialized proxies that get merged should not be loaded at all. Since they are not initialized, the entity data for sure hasn't changed, so it can be safely ignored. Actually, the only thing the data is needed for while merging, is to copy it into the managed entity, but that one is already supposed to be up to date. By not initializing the proxy, a potential database roundtrip is saved, and the fix for DDC-1734 is not needed anymore. Besides optimizing the merge, this patch also solves an issue with merging. Currently, when a detached uninitialized proxy is merged while there is already a corresponding managed entity (proxy or not), the ORM returns a blank entity instead of returning the already managed entity. This patch makes sure that already existing managed entities are re-used.
| Master | 2.4 | 2.3 | 2.2 | 2.1 |
|---|---|---|---|---|
 |
 |
 |
 |
 |
 |
Doctrine 2 is an object-relational mapper (ORM) for PHP 5.4+ that provides transparent persistence for PHP objects. It sits on top of a powerful database abstraction layer (DBAL). One of its key features is the option to write database queries in a proprietary object oriented SQL dialect called Doctrine Query Language (DQL), inspired by Hibernates HQL. This provides developers with a powerful alternative to SQL that maintains flexibility without requiring unnecessary code duplication.