RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-09 02:27:10 +03:00
Code Issues Projects Releases Wiki Activity
8,990 Commits 5 Branches 0 Tags 32 MiB
f9b4df70ff
Commit Graph

8990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bilge
f9b4df70ff Minor grammar fix. 2014-11-27 18:07:10 +00: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
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
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