RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-09 18:47:10 +03:00
Code Issues Projects Releases Wiki Activity
9,016 Commits 5 Branches 0 Tags 32 MiB
b9506ac64a
Commit Graph

9016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Pivetta
f987cf77b5 Merge branch 'hotfix/#1173-merge-association-to-identical-entities' 
Close #1173
 2014-11-11 12:38:08 +01:00
Marco Pivetta
2888791e5c #1173 - test CS fixes, reduced clutter code, made method names more explicit 2014-11-11 12:37:16 +01:00
Marco Pivetta
511893e182 #1173 - applying CS fixes on top of the patch 2014-11-11 12:27:57 +01:00
Mathieu De Zutter
2ead9e23ab Fix merging of entities with associations to identical entities. 
Without this patch, when an entity that refers multiple times to the same
associated entity gets merged, the second references becomes null.

The main issue is that even though doMerge returns a managed copy, that value
is not used while cascading the merge. These identicial entities are already
detected through the visitor map, but they are ignored.  There should be some
refactoring so cascadeMerge calls a function that checks if the parent must be
updated, based on the return value of its call to doMerge.  However, this patch
tries to impact the code as little as possible, and only introduces a new
function to avoid duplicate code.

The secondary issue arises when using inverted associations. In that case, it
is possible that an entity to be merged is already merged, so the the visitor
map is looked up by the hash of a managed copy instead of the original entity.
This means that in this case the visitor map entries should also be set to the
entity, instead of being set to 'true'.
 2014-11-11 12:12:25 +01:00
Mathieu De Zutter
9caef62489 Test case for merging entities with associations to identical entities. 2014-11-11 12:12:25 +01:00
Marco Pivetta
25849a3412 Merge pull request #1177 from c960657/production-settings-arraycache 
Ensure metadata cache is not ArrayCache in production
 2014-11-11 10:43:29 +01:00
Christian Schmidt
3287ce12a4 Fix namespace collission 2014-11-11 08:31:36 +01:00
Christian Schmidt
c973d8df1a Code style fixes. 2014-11-11 07:35:52 +01:00
Christian Schmidt
0990d64756 Ensure metadata cache is not ArrayCache in production 2014-11-08 15:05:56 +01:00
Marco Pivetta
76e1a469ef Merge pull request #1027 from PowerKiKi/feature-partial-indexes 
Support for Partial Indexes for PostgreSql and Sqlite
 2014-11-05 13:19:29 +01:00
Marco Pivetta
20c6bfd360 Aligning expected exception test to typo fix in doctrine/doctrine2@b7d104d2a2, which was breaking the build 2014-10-23 07:01:59 +02:00
Guilherme Blanco
b7d104d2a2 Fixed typo 2014-10-21 22:43:26 -04:00
Guilherme Blanco
3a0d7d1d6b Merge pull request #1146 from c960657/order-by-assoc 
Allow orderBy to reference associations
 2014-10-21 21:40:04 -04:00
Guilherme Blanco
3924ede3ad Merge pull request #1128 from Erikvv/patch-1 
Add QueryBuilder::addSelect()
 2014-10-21 21:35:26 -04:00
Kim Hemsø Rasmussen
6fc6d18882 Merge pull request #1165 from Ocramius/feature/#1120-metadata-info-command 
[DDC-3205] #1120 - metadata info command
 2014-10-20 20:46:33 +02:00
Marco Pivetta
ea6f2130b4 #1120 - downgrading requirement for symfony/console to ~2.3 
Just need `Symfony\Component\Console\Helper\TableHelper` availability
 2014-10-20 18:51:39 +02:00
Marco Pivetta
95bc0fb456 #1120 - using the Symfony\Component\Console\Helper\TableHelper for symfony/symfony:~2.3 compatibility 
(Instead of `Symfony\Component\Console\Helper\Table`)
 2014-10-20 18:49:54 +02:00
Marco Pivetta
a0e107249f Removing public properties validation (supported) 2014-10-20 15:15:05 +02:00
Marco Pivetta
9ccb56a7ab #1120 - applying CS fixes as per @dantleech's review 2014-10-19 19:56:21 +02:00
Marco Pivetta
9bf8f6ed4c DDC-3261 - fixed link to DBAL documentation (should always reference latest) 2014-10-19 19:18:11 +02:00
Marco Pivetta
29e99b2b89 #1120 - removed duplication: field and association mappings actually use the same dump format 2014-10-19 18:57:58 +02:00
Marco Pivetta
d5d64b756d #1120 - removed redundant if block 2014-10-19 18:42:14 +02:00
Marco Pivetta
1208cc836a #1120 - registering the new MappingDescribeCommand with the ORM's ConsoleRunner 2014-10-19 18:41:14 +02:00
Marco Pivetta
806068b0df #1120 - removing useless variables, refactoring 2014-10-19 18:36:08 +02:00
Marco Pivetta
39a8a31de9 #1120 - removing unused private properties 2014-10-19 18:34:42 +02:00
Marco Pivetta
574f3ea909 #1120 - map functions over array iteration/mutation 2014-10-19 18:34:06 +02:00
Marco Pivetta
254a46e79c #1120 - avoiding mutable state for rows/output 2014-10-19 18:32:12 +02:00
Marco Pivetta
250b38710c #1120 - missing docblock parameter 2014-10-19 18:23:50 +02:00
Marco Pivetta
db74efbe34 #1120 - test coverage annotations 2014-10-19 18:22:28 +02:00
Marco Pivetta
0f289a1270 #1120 - cs cleanups - moving success cases at the end of methods 2014-10-19 18:21:45 +02:00
Marco Pivetta
97fdd0adb7 #1120 - cleaning up try-catch code when fetching metadata 2014-10-19 18:14:33 +02:00
Marco Pivetta
100766e360 #1120 - Removing example array('Foo', 'Bar', 'Boo') dumped data 2014-10-19 18:13:46 +02:00
Marco Pivetta
dcdffbffc7 #1120 - assuming existence of Symfony\Component\Console\Helper\Table 2014-10-19 18:13:01 +02:00
Marco Pivetta
a762158e99 #1120 - since we want to use Symfony\Component\Console\Helper\Table, symfony/console:~2.5 is required 2014-10-19 18:11:42 +02:00
Marco Pivetta
7cf427cfbf #1120 - avoiding version comparisons when working with version-dependant constants 2014-10-19 17:53:40 +02:00
Marco Pivetta
ed79648d7d #1120 - avoiding storing the Doctrine\ORM\EntityManager in the command itself 2014-10-19 17:51:17 +02:00
Marco Pivetta
cf078d8da8 #1120 - avoiding storing the Doctrine\ORM\EntityManager in the command itself 2014-10-19 17:49:28 +02:00
Marco Pivetta
e9d7c23261 #1120 - MappingDescribeCommand can be final 2014-10-19 17:43:32 +02:00
dantleech
37de75b2ae Split new functionality into new command 2014-10-19 17:40:50 +02:00
dantleech
c71b489e9e Added preg_quote and doc blocks 2014-10-19 17:40:50 +02:00
dantleech
b5552a82e3 Code review fixes 2014-10-19 17:40:50 +02:00
dantleech
51cd8f7ce8 Added test 2014-10-19 17:40:50 +02:00
dantleech
45ce6a41a3 Expanded scope of orm:info to include metadata information 2014-10-19 17:40:50 +02:00
Marco Pivetta
a9bd51c0e4 Merge branch 'hotfix/#615-enforce-A-to-Z-sql-table-aliases' 
Close #615
 2014-10-19 17:25:09 +02:00
Marco Pivetta
b989175754 #615 - Removing unused assignment 2014-10-19 17:24:07 +02:00
Marco Pivetta
264cd8ee11 #615 - Refactoring test case to remove duplication 2014-10-19 17:21:13 +02:00
Marco Pivetta
69494dc624 #615 - sql table aliases should stay constant over time 2014-10-19 17:18:30 +02:00
Marco Pivetta
10da2eb85b #615 - Using a data provider to build aliases for the SqlWalkerTest 2014-10-19 17:16:07 +02:00
Marco Pivetta
17c9388473 #615 - Test coverage annotations 2014-10-19 17:10:39 +02:00
Marco Pivetta
435befd25c #615 - EOF EOL fixes 2014-10-19 17:09:41 +02:00