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,211 Commits 5 Branches 0 Tags 32 MiB
7911beaf1c
Commit Graph

9211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Pivetta
c2ad338707 Merge pull request #1198 from Bilge/patch-2 
Tables for buttons.
 2014-11-28 12:23:23 +01:00
Marco Pivetta
18fd892c85 Merge pull request #1199 from kormik/patch-1 
minor typo
 2014-11-28 11:14:09 +01:00
Tomas Kormanak
27e671378b minor typo 2014-11-28 08:40:00 +00:00
Bilge
13c03b573c Tables for buttons. 2014-11-28 05:18:18 +00:00
Marco Pivetta
ee13405a13 Merge pull request #1197 from Bilge/patch-1 
Minor grammar fix.
 2014-11-27 19:16:00 +01:00
Marco Pivetta
9eae0d5ce8 Merge branch 'hotfix/#1196-inherit-mapped-superclass-indexes' 
See DDC-3418
See DDC-3419

Close #1196
 2014-11-27 19:10:57 +01:00
Marco Pivetta
b3fe0904eb #1196 DDC-3418 DDC-3419 - Minor CS fixes, explicit setExpectedException calls 2014-11-27 19:10:45 +01:00
Marco Pivetta
71135972c6 #1196 DDC-3418 DDC-3419 - Renamed _factory to cmf 2014-11-27 19:08:10 +01:00
Marco Pivetta
291b68634e #1196 DDC-3418 DDC-3419 - Adding missing docblock for test private property 2014-11-27 19:07:16 +01:00
Bilge
f9b4df70ff Minor grammar fix. 2014-11-27 18:07:10 +00:00
Marco Pivetta
34d2af8a77 #1196 DDC-3418 DDC-3419 - assertArrayHasKey() instead of assertTrue(isset(...)) 2014-11-27 19:06:42 +01:00
Marco Pivetta
084ce7ecc0 #1196 DDC-3418 DDC-3419 - reducing test assets annotations spacing for readability 2014-11-27 18:57:49 +01:00
Marco Pivetta
b761d84d4f #1196 DDC-3418 DDC-3419 - refactoring class metadata factory to avoid duplicate checks 2014-11-27 18:54:10 +01:00
Marco Pivetta
7648a3c590 #1196 DDC-3418 DDC-3419 - refactoring inherited indexes copying logic into separate private method 2014-11-27 18:52:03 +01:00
Dustin Thomson
17ec1aab77 Modified class metadata factory to have entity tables inherit indexes from mapped superclasses 2014-11-27 18:41:33 +01:00
Marco Pivetta
ec6781954a Merge branch 'hotfix/#1188-support-count-queries-with-parameters-in-removed-query-parts' 
Close #1188
 2014-11-27 18:16:22 +01:00
Marco Pivetta
f536daa1e4 #1188 - Simplified and optimized parameter un-setting logic 2014-11-27 18:08:11 +01:00
Marco Pivetta
ac0f1b2ce2 #1188 - Importing parser class 2014-11-27 17:59:12 +01:00
Marco Pivetta
64752532dd #1188 - assertCount instead of assertEquals 2014-11-27 17:57:42 +01:00
Marco Pivetta
42547234d2 #1188 - minor CS fixes (avoiding DQL one-liner) 2014-11-27 17:54:02 +01:00
Marco Pivetta
ecb09b5627 #1188 - accessing Doctrine\ORM\Tools\Pagination\Paginator#getCountQuery() via reflection for test purposes 2014-11-27 17:50:27 +01:00
Marco Pivetta
69064ac13d #1188 - making Doctrine\ORM\Tools\Pagination\Paginator#getCountQuery() private, as it is an implementation detail 2014-11-27 17:48:37 +01:00
Marco Pivetta
a80117a4ee #1188 - removing unused variable assignments 2014-11-27 17:42:14 +01:00
Paweł Kolanowski
af39fce6e5 Missing doc block, removed parse() parameter. 
Missing doc block, removed parse() parameter.
 2014-11-27 17:27:22 +01:00
Merixstudio
18244161f7 Filtering by auto-increnement field causes test error. 
Executing the same test many times causes error because AI fields.
 2014-11-27 17:27:22 +01:00
Merixstudio
de1843ad30 Testing SQLs in functional test is not necessary 2014-11-27 17:27:22 +01:00
Merixstudio
fa014ee55d Test parameter removing parameters passed to select part of query. 2014-11-27 17:27:22 +01:00
Merixstudio
d02ea224df Allowed to get count query from paginator. 2014-11-27 17:27:22 +01:00
Merixstudio
42aff75108 Fixed counting exception 
Fixed "Invalid parameter number: number of bound variables does not match number of tokens " exception during execution count on Query where select part of query contains :parameters.
 2014-11-27 17:27:22 +01:00
Nick DeCoursin
82c5547931 Correction Events.rs - Entity Listeners Resolver 
Configuring the Entity Listener Resolver can only be done before Entity Manager is initialized as described here: https://github.com/doctrine/doctrine2/pull/1193
 2014-11-26 19:29:58 -05:00
Steve Müller
bf5003f25e Merge pull request #1192 from javiereguiluz/patch-4 
Fixed a very minor typo
 2014-11-25 09:42:10 +01:00
Javier Eguiluz
7e64d606d2 Fixed a very minor typo 2014-11-25 09:41:13 +01:00
Marco Pivetta
88ce68e733 Merge pull request #1190 from c960657/autogenerate-integer 
Document that AUTOGENERATE_ constants are allowed
 2014-11-21 21:54:00 +01:00
Christian Schmidt
89684b4ce9 Document that AUTOGENERATE_ constants are allowed 2014-11-21 21:11:32 +01:00
Marco Pivetta
e7be0c4dc9 Merge pull request #1184 from goetas/patch-2 
Postgres SERIAL is not a post-insert identifier generation strategy
 2014-11-12 10:31:52 +01:00
Asmir Mustafic
a1660997ff Postgres SERIAL is not a post-insert identifier generation strategy 2014-11-12 10:10:06 +01:00
Marco Pivetta
9280a4621d Merge pull request #1183 from NAYZO/patch-2 
Update tools.rst
 2014-11-12 10:04:49 +01:00
Ala Eddine Khefifi
44304c30b3 Update tools.rst 2014-11-12 09:55:51 +01:00
Marco Pivetta
ab62914f87 Merge pull request #1089 from encoder32/EntityRepositoryGeneratorDefaultRepository 
EntityRepositoryGenerator default repository
 2014-11-11 16:22:51 +01:00
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
jaimz22
dd012dfd90 oops.. forgot to add a condition 2014-11-08 16:56:42 +00:00
jaimz22
e2f1ea7f23 stupid cloud 9 ide broke my code :( sorry 2014-11-08 16:45:58 +00:00
jaimz22
c47a072815 fixed for failing test case. when a single DTO is specified in the query, you no longer get a multidimensional array returned. 2014-11-08 16:36:55 +00:00