RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity
9,795 Commits 5 Branches 0 Tags 32 MiB
master
Commit Graph

3343 Commits

Author SHA1 Message Date
Kiel Goodman
918d2910d9 [DDC-3108] Fix regression introduced in DDC-2764 where join aliases were no longer accessible in Criteria expressions 2015-01-17 08:33:23 +01:00
Oliver Tischlinger
f8072dd8e0 Fixed typo 2015-01-17 08:20:24 +01:00
Oliver Tischlinger
b5ba84f667 matching should not change critera 
The matching should behave like in ArrayCollection, where it is not changed.
The criteria should be cloned so that it could be used for more than one matching operation.
 2015-01-17 08:20:24 +01:00
Marco Pivetta
f13b085582 Using PersisterHelper instead of the unreliable ClassMetadataInfo#getTypeOfColumn() 2015-01-17 08:14:04 +01:00
Marco Pivetta
f1170c84a4 #1086 - Passing type information when building meta-mappings for JTI and STI inheritances 2015-01-17 08:09:55 +01:00
Marco Pivetta
131a39bad4 #1178 - s/getValue/getIdentifierValues 2015-01-17 07:59:03 +01:00
Marco Pivetta
584839d38a #1178 - moved private method to the bottom of the class 2015-01-17 07:59:03 +01:00
Marco Pivetta
d47f724f16 #1178 - restoring correct getJoinTableRestrictionsWithKey logic as per @jaspernbrouwer's previous implementation 2015-01-17 07:59:02 +01:00
Marco Pivetta
f88f5ce454 #1178 - fetching actual target entity when resolving column types of it 2015-01-17 07:59:02 +01:00
Marco Pivetta
a39b6869ca #1178 - mapping between criteria parameters and types when fetching on one-to-many with additional criterions 2015-01-17 07:59:02 +01:00
Marco Pivetta
ce446a6f03 #1178 - correcting filtering when initializing a one-to-many collection that has composite complex (custom DBAL types) identifiers 2015-01-17 07:59:02 +01:00
Marco Pivetta
096bd90aed #1178 - using the PersisterHelper to extract type of associated meta-result columns 2015-01-17 07:59:02 +01:00
Marco Pivetta
0743238b43 #1178 - minor code duplication removal 2015-01-17 07:59:01 +01:00
Marco Pivetta
4eaa7ea821 #1178 - correcting class from which the type of a column should be fetched (source class when relationToSourceKeyColumns is used) 2015-01-17 07:59:01 +01:00
Marco Pivetta
6e2179aa8e #1178 - handling custom types when filtering/removing by element in extra-lazy many-to-many associations 2015-01-17 07:59:01 +01:00
Marco Pivetta
5e49aeef6f #1178 - handling custom types when filtering by key in extra-lazy many-to-many associations 2015-01-17 07:59:01 +01:00
Marco Pivetta
e39f08f6bd #1178 - handling correct parameter binding when counting extra-lazy collections with custom-type referenced identifiers 2015-01-17 07:59:01 +01:00
Marco Pivetta
c82794bff7 #1178 - handling traversal of association mapping data in lazy-loading many-to-many requests on the inverse side 2015-01-17 07:59:01 +01:00
Marco Pivetta
1e606d1ed3 #1178 - adding note about ClassMetadataInfo#getTypeOfColumn() being unreliable/dangerous 2015-01-17 07:59:01 +01:00
Marco Pivetta
41900dca76 #1178 - correctly handling initialization of collections referenced via custom DBAL types 2015-01-17 07:59:00 +01:00
Marco Pivetta
91bceca7ee #1178 - correcting collection insert/update logic to correctly cast values for custom typed columns 2015-01-17 07:59:00 +01:00
Marco Pivetta
aaa6443954 #1178 - PersisterHelper::getTypeOfColumn() should not fail silently, as that makes persister bugs impossible to spot 2015-01-17 07:59:00 +01:00
Marco Pivetta
a80532a538 #1178 - correcting association column type when dealing with multiple derived associations/identifier levels 
Since the ClassMetadata can only know about internal state, any `joinColumn` association details on the
inverse side of an association need to be computed by fetching associated metadata.
 2015-01-17 07:59:00 +01:00
Marco Pivetta
445798ed46 #1178 - reverting patch and keeping tests (rebase gone awry) 
Also cleaning up `OrmFunctionalTestCase`
 2015-01-17 07:59:00 +01:00
Jasper N. Brouwer
5c1d1931b7 Fixed typehints and use statements 2015-01-17 07:59:00 +01:00
Jasper N. Brouwer
fe21f18991 Fixed doc-blocks 2015-01-17 07:59:00 +01:00
Jasper N. Brouwer
a0b43d0a7f Don't alias PersisterHelper to Helper 2015-01-17 07:58:59 +01:00
Jasper N. Brouwer
7b9c6a69bd Add tests for extra lazy many-to-many associations 
and fixed production code
 2015-01-17 07:58:59 +01:00
Jasper N. Brouwer
ba3df8577b Refined and added tests, fixed found issues 
- Renamed id properties so they don't coexist between entities in a test
- Added tests for extra lazy one-to-many associations
- Fixed production code to make tests green
 2015-01-17 07:58:59 +01:00
Jasper N. Brouwer
f7b14085f2 Abstracted infering binding types away in a helper 2015-01-17 07:58:59 +01:00
Jasper N. Brouwer
4f9f7eedf5 Removed DDC-3380 mentions in production code 2015-01-17 07:58:59 +01:00
Jasper N. Brouwer
f60f2a567a Fixed associations using a value-conversion type for identifiers 2015-01-17 07:58:59 +01:00
Marco Pivetta
57ce6ccfcf #1172 - fixed minor CS issues (spacing) 2015-01-16 22:54:30 +01:00
Marco Pivetta
45e733eb60 #1172 - adding @method annotation to simplify static introspection 2015-01-16 22:50:52 +01:00
Mathieu De Zutter
318b23097b Don't load uninitialized proxies after merging. 
Previous patch avoided initialization of proxies before merging, mainly to
fix a bug with merging. However, later on, doctrine tries again to load
the proxy. This is unnecessary and thus has been removed. This way, a
round trip to the database is saved.
 2015-01-16 20:54:15 +01:00
Mathieu De Zutter
ec35d4886c Don't load detached proxies when merging them. 
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.
 2015-01-16 20:54:15 +01:00
Marco Pivetta
935a79e15f #1133 DDC-3305 - minor cs fix (spacing) 2015-01-16 19:46:04 +01:00
Marco Pivetta
7e4dab17ec #1133 DDC-3305 - test case with embeddable without referenced embeddable class 2015-01-16 19:45:16 +01:00
Javier Spagnoletti
705a7d2cc2 [Embeddables] Improved exception message when embeddables is missing 'class' attribute. 2015-01-16 19:18:46 +01:00
Marco Pivetta
f799986be1 Reverting BC break in AbstractIdGenerator signature 2015-01-16 18:52:58 +01:00
Marco Pivetta
339bd23ac8 #1209 DDC-3427 - removing leftover EntityManager hints (using interface instead) 2015-01-16 14:44:31 +01:00
Marco Pivetta
6fc0d84b7a DDC-3427 - s/EntityManager/EntityManagerInterface in type-hints 2015-01-16 14:21:30 +01:00
Guilherme Blanco
f90475772d Classify persisters into more granular namespaces. 2015-01-16 00:10:25 +01:00
Marco Pivetta
0f2c117f3e Cloning and configuring the cache adapter for each newly created cache region (fixes cache namespacing) 2015-01-15 21:17:49 +01:00
Marco Pivetta
514fd008b9 Cache regions will not modify the injected cache instance settings 2015-01-15 21:01:35 +01:00
Marco Pivetta
5bd921139e Merge branch 'hotfix/#1250-DDC-3493-fix-class-pseudo-constant-parsing-in-entitygenerator' 2015-01-15 04:16:44 +01:00
Guilherme Blanco
a1d77bdc65 Renamed coll to collection and some small updates to tests. 2015-01-15 03:14:48 +00:00
Andrea Sprega
243210e896 DDC-3493 - fixed EntityGenerator parsing for php 5.5 "::class" syntax 2015-01-15 04:13:09 +01:00
Marco Pivetta
55a75bfb1b Merge pull request #1249 from doctrine/extra-lazy-get-m2m 
Support for extra lazy get for both owning and inverse side on many to many associations.
 2015-01-15 03:36:35 +01:00
Steve Müller
d343617f13 Merge pull request #1255 from Ocramius/cleanup/php-5.3-support-end 
Cleanup: PHP 5.3 support end
 2015-01-15 01:29:00 +01:00
Marco Pivetta
e2acd74cb4 #1072 DDC-3191 - minor performance optimization 2015-01-15 00:37:41 +01:00
Alexander Kurilo
58cd520e32 Fix attempt of traversing bool in FileLockRegion 2015-01-14 23:51:41 +01:00
Marco Pivetta
541e7bdf72 Refactoring test method: no need to test for PHP version 2015-01-14 20:13:46 +01:00
Marco Pivetta
8e28cb9119 Removing useless $self use statements, as PHP 5.4 supports $this in closures 2015-01-14 20:12:27 +01:00
Marco Pivetta
3ba9689448 #881 DDC-2825 - aligning assignments 2015-01-14 18:19:22 +01:00
Marco Pivetta
f0102a69f9 #881 DDC-2825 - refactoring mapping driver to use ClassMetadata#setPrimaryTable() instead of duplicating explode() logic 2015-01-14 18:12:12 +01:00
Marco Pivetta
eefa3b2e53 #881 DDC-2825 - correcting YAML driver implementation (wasn't using extracted schema) 2015-01-14 18:06:29 +01:00
Marco Pivetta
51bf82b7e7 #881 DDC-2825 - correcting PHP mapping behavior when using implicit schema in table name 2015-01-14 17:54:00 +01:00
Marco Pivetta
3820fa57d3 #881 DDC-2825 - XML mappings should handle explicitly defined schema name 2015-01-14 17:33:17 +01:00
Michaël Perrin
54b3c0548d Fix persistence exception on a table with a schema on a platform without schema support 2015-01-14 15:48:49 +01:00
Marco Pivetta
ba5378fecc #385 #1181 DDC-3385 - fixing Events docblocks as per @deeky666's review 2015-01-13 21:15:34 +01:00
Marco Pivetta
ae8ab0812e #385 #1181 DDC-3385 - fixing OnClassMetadataNotFoundEventArgs docblocks as per @deeky666's review 2015-01-13 21:14:32 +01:00
Marco Pivetta
662b49608c #385 #1181 DDC-3385 - aligning tests and implementation to new OnClassMetadataNotFoundEventArgs API 2015-01-13 20:56:57 +01:00
Marco Pivetta
762e798d22 #385 #1181 DDC-3385 - extending OnClassMetadataNotFoundEventArgs from ManagerEventArgs instead of generic EventArgs 2015-01-13 20:56:21 +01:00
Marco Pivetta
6021e3a1b8 #385 #1181 DDC-3385 - Updating docblock of OnClassMetadataNotFoundEventArgs 2015-01-13 20:49:08 +01:00
Marco Pivetta
eaa9187dd8 #385 #1181 DDC-3385 - minor CS fix (spacing) 2015-01-13 20:33:30 +01:00
Marco Pivetta
8ea394e778 #385 #1181 DDC-3385 - removing @todo that was discussed/cleared 2015-01-13 20:33:10 +01:00
Marco Pivetta
a710706c81 #385 #1181 DDC-3385 - optimized imports, removing duplicate imports (caused by rebase conflicts) 2015-01-13 20:00:40 +01:00
Marco Pivetta
e4cbdb57ad Enabling fallback logic in metadata loading 2015-01-13 19:50:55 +01:00
Marco Pivetta
d91b0b4938 Minor CS fixes in the ResolveTargetEntityListener 2015-01-13 19:50:17 +01:00
Marco Pivetta
f5eb20b63d OnClassMetadataNotFoundEventArgs should support setting the actually resolved ClassMetadata as a mutable event result vector 2015-01-13 19:50:17 +01:00
Bart van den Burg
3be43a1def Rebased and renamed PreLoadClassMetadata to OnClassMetadataNotFound 2015-01-13 19:49:57 +01:00
Bart van den Burg
437f812718 Added new event to allow actions to be done before trying to load class metadata 2015-01-13 19:49:57 +01:00
Bart van den Burg
51528fbdea set metadata for interface to be able to fetch entites by interface name 2015-01-13 19:49:57 +01:00
Guilherme Blanco
25b7c64dc6 Implemented support for extra lazy get for both owning and inverse side on many to many associations. 2015-01-13 17:50:20 +00:00
Marco Pivetta
9c3cb57931 Merge branch 'optimize-persisters' 
Close #1246
 2015-01-13 15:05:45 +01:00
Marco Pivetta
35dd7f8e2b #1246 DDC-3487 - docblock args fixes 2015-01-13 15:03:04 +01:00
Marco Pivetta
278b8bfa08 #1246 DDC-3487 - minor alignment fixes 2015-01-13 14:58:56 +01:00
Marco Pivetta
7f71cbc8c7 #1246 DDC-3487 - removed unused assignment, minor alignment fixes 2015-01-13 14:54:00 +01:00
Marco Pivetta
97d1d5343e #1246 DDC-3487 - removed unused assignment, making $association variable overwrite more obvious 2015-01-13 14:46:34 +01:00
Marco Pivetta
c4366124c7 #1246 DDC-3487 - removed unused assignment, direct return instead 2015-01-13 14:45:13 +01:00
Marco Pivetta
17a865ec7f #1246 DDC-3487 - correcting docblock (static introspection fix) 2015-01-13 14:39:05 +01:00
Marco Pivetta
b99f4461be #1246 DDC-3487 - re-aligning SQL string concatenation for readability, fixed docblock return value hint 2015-01-13 14:37:32 +01:00
Marco Pivetta
5942b6c302 #1246 DDC-3487 - re-aligning SQL string concatenation for readability 2015-01-13 14:31:22 +01:00
Marco Pivetta
77234d6aec #1246 DDC-3487 - removing unused assignment 2015-01-13 14:30:51 +01:00
Marco Pivetta
a8dcc2acf3 #1246 DDC-3487 - removing possible undefined value path for $newValId for clarity 2015-01-13 14:05:27 +01:00
Guilherme Blanco
de4723883f Merge pull request #1171 from jaimz22/master 
Improvements for complex select statements when using new object expression
 2015-01-12 22:48:56 -05:00
Guilherme Blanco
bc268da8c2 Small optimization. 2015-01-13 03:30:07 +00:00
Guilherme Blanco
678f47f494 More deprecated code removal. 2015-01-13 02:52:31 +00:00
Guilherme Blanco
965cdbdbbb Optimized column to field resolutions. 2015-01-13 02:18:49 +00:00
Guilherme Blanco
96955d6e79 Some small improvements to persisters. 2015-01-13 02:05:33 +00:00
Marco Pivetta
1bfa7ea754 #1240 DDC-3479 - Basic coverage for EntityNotFoundException 2015-01-13 02:55:51 +01:00
Marco Pivetta
fc72b41953 #1240 DDC-3479 - Using a static proxy constructor rather than the default constructor 2015-01-13 02:51:47 +01:00
Marco Pivetta
66c556fbfd #1240 DDC-3479 - Fixing minor CS issues (naming, alignment) 2015-01-13 02:48:57 +01:00
Lars Strojny
8e4092750d Include IDs in the exception message to ease debugging 2015-01-13 02:41:05 +01:00
Carnage
00b6f62287 Fixed issue 2015-01-13 02:36:58 +01:00
Vladislav Veselinov
79bf84e1ad revert typehint change 2015-01-13 02:05:49 +01:00
Vladislav Veselinov
9cb17d2915 EntityManagerInterface instead of EntityManager 
Make connection available in filters
Add test for the changes
 2015-01-13 02:05:49 +01:00
Marco Pivetta
f571a9ef88 #470 DDC-54 DDC-3005 - query iteration must cause eager hydrationComplete logic to be fired 2015-01-13 01:42:38 +01:00
Marco Pivetta
a884452ffc #470 DDC-54 DDC-3005 - removing unused PostLoadEventDispatcher 2015-01-13 01:16:46 +01:00
Marco Pivetta
b1144e74ea #470 DDC-54 DDC-3005 - reverting hydrator changes, as patch DDC-3005 already deals with the issue 2015-01-13 01:09:23 +01:00
Lukasz Cybula
aa4796cd0d Moved postLoad dispatching from UnitOfWork to object hydrators 2015-01-13 01:03:48 +01:00
Marco Pivetta
d09280a1dc #1001 DDC-3005 - HydrationCompleteHandler cs fixes (line-wrap) 2015-01-13 00:52:12 +01:00
Marco Pivetta
45221b1951 #1001 DDC-3005 - removed HydrationCompleteHandler#invokeAllDeferredPostLoadEvents() (useless method call indirection) 2015-01-13 00:51:44 +01:00
Marco Pivetta
c9ccd91421 #1001 DDC-3005 - optimized HydrationCompleteHandler imports 2015-01-13 00:50:19 +01:00
Marco Pivetta
730c2a81f7 #1001 DDC-3005 - HydrationCompleteHandler static introspection cleanups, as well as memory and performance improvements 2015-01-13 00:50:05 +01:00
Marco Pivetta
7b81cfb6ea #1001 DDC-3005 - Minor CS fixes in HydrationCompleteHandler 2015-01-13 00:33:15 +01:00
Marco Pivetta
89530f88f7 #1001 DDC-3005 - Removing dead assignment HydrationCompleteHandler#__construct() 2015-01-13 00:32:10 +01:00
Marco Pivetta
516d04c391 #1001 DDC-3005 - Removing useless dependency from the HydrationCompleteHandler to the UnitOfWork 2015-01-13 00:31:32 +01:00
Marco Pivetta
af93539576 #1001 DDC-3005 - HydrationCompleteHandler should accept EntityManagerInterface instances 2015-01-13 00:06:07 +01:00
Marco Pivetta
22e12e0043 #1001 DDC-3005 - coverage annotations, minor CS fixes 2015-01-12 23:50:16 +01:00
Guilherme Blanco
dd883f2136 Moved delete() and update() to proper locations. 2015-01-12 22:04:04 +00:00
Strate
0c8a31bf2b DDC-3005. Revert empty line. Removed @since annotation 2015-01-12 22:34:24 +01:00
Strate
35ea399d33 DDC-3005 Defer invoking of postLoad event to the end of hydration cycle. 
1. Refactor handling of hydration complete: delegate this task to special object
2. Write test case for situation, when inside postLoad listener other entity is loading.
3. Make test, written on second step, be able to pass :)
 2015-01-12 22:34:24 +01:00
Strate
f3b31c2807 DDC-3005 Defer invoking of postLoad event to the end of hydration cycle. 
This feature makes guarantee, that postLoad event fires after all associations are populated
 2015-01-12 22:33:40 +01:00
Guilherme Blanco
932a56f26f Internalize UnitOfWork in CollectionPersisters. Updated related code. 2015-01-12 19:52:27 +00:00
Guilherme Blanco
c5f1b99721 Fixed wrong return. 2015-01-12 18:18:15 +00:00
Guilherme Blanco
73afcec22a Implemented support for one to many extra lazy with joined inheritance. 2015-01-12 18:15:13 +00:00
Benjamin Morel
fbcf18cf33 Changed $this return type to static in AbstractQuery 
This allows IDEs and static code analysis tools to properly understand the return type when chaining methods, for example when using the QueryBuilder.
 2015-01-11 16:48:09 +00:00
Marco Pivetta
be91cc9bb3 Merge pull request #1239 from deeky666/fix-index-duplication 
Fix index duplication for unique association join columns
 2015-01-09 23:07:50 +01:00
Marco Pivetta
664b6bf4c5 Merge pull request #1227 from c960657/production-settings-query-cache 
Ensure query cache is not ArrayCache in production
 2015-01-09 16:58:38 +01:00
Steve Müller
d1e5034659 fix index duplication for unique association join columns 2015-01-08 15:39:41 +01:00
Andrey Knupp Vital
08e8af9372 Type-hinting SimpleXMLElement (_getCascadeMappings) 2015-01-08 09:28:15 -02:00
Andrey Knupp Vital
b90943c56b Minor improvements 2015-01-08 09:04:37 -02:00
Andrey Knupp Vital
4935da138d Respecting use-column-prefix instead of relying on false/0 of column-prefix 2015-01-08 00:10:24 -02:00
Andrey Knupp Vital
8bbc492978 Removing weird strict comparison on different types 2015-01-07 17:24:44 -02:00
Andrey Knupp Vital
82cda1ecb0 Prevents prefixing a column when false on column-prefix (XML) 2015-01-07 17:22:48 -02:00
Guilherme Blanco
ef65270387 Merge pull request #1230 from johannes/master 
Allow dumping SQL query when passing DQL on cli
 2015-01-06 21:39:11 -05:00
Marco Pivetta
6448627bc9 Merge pull request #1233 from SofHad/refactoring-duplicate-code 
[Minor] Refactoring to avoid duplicate code
 2015-01-04 22:59:05 +01:00
SofHad
eb22db0dcf remove the unnecessary check 2015-01-04 21:01:32 +01:00
Martin Prebio
8f15c5e905 Consistent return type confirming with interface 2014-12-31 01:28:05 +01:00
Sofiane HADDAG
8d91f7de60 Rename handleCache to updateCache 2014-12-30 14:49:12 +01:00
shaddag
ccb09ad0ac Rename the private method 2014-12-30 14:10:56 +01:00
shaddag
12b5a0cdd7 Extracted ony the common logic 2014-12-30 14:06:48 +01:00
shaddag
50ef1369c3 [Minor] Refactoring to avoid duplicate code 2014-12-30 10:03:49 +01:00
Johannes Schlüter
cdb62a70cd Allow dumping SQL query when passing DQL on cli 2014-12-24 14:15:23 +01:00
Christian Schmidt
61c72e4aa7 Ensure query cache is not ArrayCache in production 2014-12-19 20:18:45 +01:00
James Murray
d9cbe1a8b7 removed unnecessary fieldIdentificationVariable property check 2014-12-19 14:10:47 -05:00
James Murray
2f76571d3a Added a fix for ObjectHydrator when the same number of scalar results and new object results exist 
Adding additional tests for mixed New object and scalar query
 2014-12-19 14:06:03 -05:00
Guido Contreras Woda
82847e1851 Added more docblock 2014-12-16 22:37:50 -03:00
Guido Contreras Woda
8fd28fcd8f Added embedded and embeddables to ClassMetadataBuilder 2014-12-16 22:30:28 -03:00
Gareth Evans
2fac6272a1 Checks key exists rather than isset 
If the default value is set to `null`, `isset` will return `false` even though the key is actually there for a reason.
 2014-12-08 01:31:14 +01:00
Marco Pivetta
cf1b16a505 #1213 - DDC-3437 - renaming variables/alignment/clarifications in docblocks 2014-12-08 01:22:20 +01:00
Austin Morris
d48546d2dd fix instantiation of embedded object in ReflectionEmbeddedProperty 2014-12-08 01:06:11 +01:00
Fedik
c1eff7045a XML export driver: fix export options 2014-12-07 13:05:19 +02:00
Guilherme Blanco
0059e01936 Merge pull request #1208 from Ocramius/hotfix/DDC-3427-class-metadata-factory-should-accept-entitymanagerinterface-instances 
DDC-3427 - class metadata factory should accept `EntityManagerInterface` instances
 2014-12-05 12:22:23 -05:00
Marco Pivetta
ac67a10d4c DDC-3434 - adding note on why restoring 'HIDDEN' selected fields is relevant 2014-12-05 18:02:12 +01:00
Marco Pivetta
6169175a89 DDC-3434 - HIDDEN modifier marked fields in ORDER BY clause are always preserved when creating a paginator subquery 2014-12-05 17:11:57 +01:00
Guilherme Blanco
a6cf714f41 Merge pull request #1210 from Ocramius/hotfix/DDC-3336-undefined-property-with-paginator-and-scalar-expression-select 
DDC-3336 - undefined property with paginator walker and scalar expression in ORDER BY clause
 2014-12-05 10:42:55 -05:00
Marco Pivetta
e53e8bfe8e DDC-3336 - applied hotfix: only PathExpression instances have a $field property 2014-12-05 14:56:47 +01:00
Marco Pivetta
e65417f1f6 DDC-3427 - Adding setting an EntityManagerInterface instance in the ClassMetadataFactory#setEntityManager() 2014-12-05 13:49:42 +01:00
Marco Pivetta
b4a23e97a9 ReflectionEmbeddedProperty should be like any ReflectionProperty, and should therefore extend it for type compatibility 2014-12-05 13:06:41 +01:00
Marco Pivetta
112fdf46d0 Using instantiator to work with internal PHP classes as embeddables 2014-12-05 13:00:54 +01:00
Marco Pivetta
fc3f233923 Yodaism good for you: is. 2014-12-05 11:18:10 +01:00
Marco Pivetta
1d5a0a0a1b Adding docblocks 2014-12-05 11:17:43 +01:00
Marco Pivetta
ce308dc476 #1204 - refactored sequence-generator metadata exporting into own private method for simplicity 2014-12-04 14:00:05 +01:00
Paulo de Freitas
aa1454562c Fix sequence-generator in MetaData exporter for XML Driver. 2014-12-04 14:00:05 +01:00
Marco Pivetta
9d2c0481ae #1200 - removing console deprecation errors by using the new Symfony\Component\Console\Helper\Table instead of the deprecated TableHelper 2014-12-04 13:40:22 +01:00
Marco Pivetta
d3b1bf571b #1200 - removing Yaml::parse() deprecation errors by passing in file contents instead of file paths 2014-12-04 13:37:59 +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
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
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
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
Christian Schmidt
89684b4ce9 Document that AUTOGENERATE_ constants are allowed 2014-11-21 21:11:32 +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
ab62914f87 Merge pull request #1089 from encoder32/EntityRepositoryGeneratorDefaultRepository 
EntityRepositoryGenerator default repository
 2014-11-11 16:22:51 +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
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
jaimz22
2ffda34f23 fixing a missing index error 2014-11-08 10:15:33 -05: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
James Murray
da7e4ed8de removing orphaned scalar results and allowing mixed results when use new object expressions 2014-10-28 17:59:37 -04:00
James Murray
85eac7200d Adding the ability to alias new object expressions 2014-10-28 17:34:57 -04: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
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
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
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
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
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
b989175754 #615 - Removing unused assignment 2014-10-19 17:24:07 +02:00
Marco Pivetta
a4e9c235f8 #615 - assignment alignment 2014-10-19 17:08:33 +02:00
Mike Meier
fb5f76f025 rewrite tablePrefixAlias 2014-10-19 17:05:34 +02:00
Mike Meier
ebc996c820 Update SqlWalker.php 
Always be sure that only a-z characters are used for table alias, otherwise use generic "t" for "table"
 2014-10-19 17:05:34 +02:00
Steve Müller
06b5c84728 Merge pull request #1160 from Ocramius/hotfix/#1159-multiple-entity-managers-per-repository-factory 
#1159 - multiple entity managers per repository factory should be supported
 2014-10-19 14:58:04 +02:00
Marco Pivetta
0f26c62e73 Merge pull request #1143 from MajorCaiger/master 
Fixed a bug so that a versioned entity with a oneToOne id can be created
 2014-10-19 11:52:37 +02:00
Alex Bakhturin
b33c9befb7 [QueryBuilder] Remove unused method parameters that are shadowed by local variables 
PHP5 treats the left part of such assignment as an independent local variable, while HHVM treats it as a reference to the method parameter. This leads to the value of the parameter being changed, which, in turn, causes func_get_args() to return not what is expected.
This commit is a part of the effort to make Symfony run flawlessly on HHVM. This issue causes a bunch of Symfony tests to fail on HHVM.
 2014-10-17 11:17:33 -07:00
Marco Pivetta
8093c6ddb0 #1159 - protecting Doctrine\ORM\Repository\DefaultRepositoryFactory API by making it final and its protected members private 2014-10-14 01:46:50 +02:00
Marco Pivetta
a9847533e5 #1159 - Doctrine\ORM\Repository\DefaultRepositoryFactory keeps separate caches per entity manager used to build repositories 2014-10-14 01:46:14 +02:00
Ala Eddine Khefifi
f2bdfe102e Fixed missed initialization in CommitOrderCalculator.php 2014-10-12 14:04:41 +01:00
Christian Schmidt
94f5f53d2a Allow orderBy to reference associations 2014-10-05 10:16:58 +02:00
Rob Caiger
dd398ce577 - Fixed the basic entity persister so that versioned OneToOne entities can be created 
- Created an IdentifierFlattener utility class
- Moved the logic for the flatten identifier method into the new utility class
- Replaced calls for private flattenIdentifier to use new utility
- Added appropriate unit tests
 2014-10-01 14:01:44 +01:00
Marco Pivetta
3f8865c6fb Merge pull request #1092 from birko/pagination-count-walker 
[DDC-2794] Arbitrary Join count walkers solution
 2014-09-23 00:30:30 +02:00
Steve Müller
b291d8d589 add support for embeddables in entity generator 2014-09-12 20:29:37 +02:00
Marco Pivetta
4974edc70a DDC-3272 - fixing issue with mapped superclass name, minor refactoring 2014-09-10 17:00:06 +02:00
encoder64
e295a6d05e visibility changed && few simple fixes 2014-09-09 22:17:10 +03:00
encoder64
859a5f88cb Unit Tests && simple fixes 2014-09-06 18:14:16 +03:00
encoder64
dc3bc45d1d Merge remote-tracking branch 'upstream/master' into EntityRepositoryGeneratorDefaultRepository 2014-09-06 15:33:48 +03:00
František Bereň
589d26fc5e Changed calling $from[0] to using reset($from) 
changed usage $from[0] according suggestion from @Ocramius  to use array
reset function
 2014-09-02 08:39:29 +02:00
Marco Pivetta
d9b43dc649 Merge pull request #1116 from deeky666/DDC-3265 
[DDC-3265] Fix DocBlock
 2014-08-30 04:22:47 +02:00
Marco Pivetta
6e79515a75 Merge pull request #1123 from stof/patch-1 
Fixed the structure of the reverse-engineered mapping
 2014-08-30 04:19:55 +02:00
Javier Spagnoletti
f731a66e1c Removed extra line breaks for docblocks in set, get, add and remove method templates. 2014-08-29 23:11:49 -03:00
Javier Spagnoletti
1378626937 Fixed new line in docblock (247803715b). 2014-08-29 22:49:23 -03:00
František Bereň
d48be34696 CS Fixes 2014-08-28 13:17:25 +02:00
Guilherme Blanco
4b504c9436 Merge pull request #1109 from doctrine/hotfix/DDC-3120-php-5.6-RC3-compat 
DDC-3120 - PHP 5.6-RC3 compatibility
 2014-08-27 12:27:05 -04:00
Christophe Coevoet
00eb0d3b67 Fixed the structure of the reverse-engineered mapping 2014-08-27 13:56:02 +02:00
Marco Pivetta
45d74e7220 DDC-3276 - #1122 - updating EBNF in docblock to reflect new syntax support 2014-08-27 02:12:08 +02:00
Marco Pivetta
097840dc93 Allowing expression in COUNT() DQL aggregation functions 2014-08-27 01:56:11 +02:00
encoder64
c8565c2772 Visibility for EntityRepositoryGenerator::generateClassName() 2014-08-26 21:42:55 +03:00
Steve Müller
8d3fba5540 improve schema validator error message for invalid bi-directional relations 2014-08-26 19:46:17 +02:00
Steve Müller
ad1f228ef6 fix DocBlock 2014-08-22 09:26:54 +02:00
Guilherme Blanco
400acad533 Merge pull request #1105 from deeky666/nested-embeddables 
Add support for nesting embeddables
 2014-08-21 16:33:44 -04:00
Marco Pivetta
ff80187930 Merge pull request #1098 from encoder32/DDC-1590 
#DDC-1590: Fix Inheritance in Code-Generation
 2014-08-18 22:35:52 +02:00
Marco Pivetta
dfbaac0401 #1112 - Fixed type-hint that is incompatible with most IDEs 2014-08-18 15:18:59 +02:00
Marco Pivetta
aab7fce2d4 #1112 - Elvis operator reduces code duplication even more 2014-08-18 15:17:54 +02:00
Marco Pivetta
bf03694e28 #1112 - Yoday need you may, better IDE hinting as well needed is. 2014-08-18 15:16:45 +02:00
Marco Pivetta
19d3552f2a #1112 - Removing useless trimming of the entity name being passed in 2014-08-18 15:14:53 +02:00
Marco Pivetta
3fed769b40 #1112 - avoiding useless assignments/splitted return statement 2014-08-18 15:02:34 +02:00
Marco Pivetta
7865de92ab #1112 - renamed $class to $className 2014-08-18 15:01:52 +02:00