RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 14:31:40 +03:00
Code Issues Projects Releases Wiki Activity
9,708 Commits 5 Branches 0 Tags
Commit Graph

5511 Commits

Author SHA1 Message Date
Bill Schaller
a8342a4be2 Cleanup 2015-03-31 21:36:33 +01:00
Bill Schaller
ff75a3ad49 Fix paginator issues when ordering by a joined column from a to-many association. 
Manual merge testcase from #1351
 2015-03-31 21:36:32 +01:00
Bill Schaller
54d7efd92c Fix LimitSubqueryOutputWalker when used on tables with joined table inheritance 2015-03-31 21:32:28 +01:00
Fedik
5cd8334897 fix EntityGenerator RegenerateEntityIfExists 2015-03-27 13:10:14 +02:00
Marco Pivetta
60bacda685 Bumping version to 2.5.0-DEV 2015-03-25 23:16:30 +00:00
Marco Pivetta
df902c9c6a Preparing release v2.5.0-RC1 2015-03-25 23:14:52 +00:00
Marco Pivetta
cf1ecffb14 Merge pull request #1339 from BenMorel/dqlcustomtype 
[DDC-2224] Honor convertToDatabaseValueSQL() in DQL query parameters
 2015-03-25 01:27:05 +00:00
Benjamin Morel
9eb458caa6 Query::_getQueryCacheId() directly accesses $this->_parsedTypes 2015-03-24 17:14:45 +01:00
Marco Pivetta
d97d3ec0e5 Minor CS fixes (braces) 2015-03-24 00:37:17 +00:00
Marco Pivetta
45d39dd50d Making preserveSqlOrdering API private 2015-03-24 00:36:13 +00:00
Marco Pivetta
6dfff304f3 Merge branch 'hotfix/#1337-fix-oracle-postgresql-paginator-sorting-issues' into hotfix/#1342-paginator-functional-test-integration 2015-03-24 00:25:12 +00:00
Marco Pivetta
70c8591bbe Merge pull request #1343 from karlrixon/master 
Support embeddables in partial object query expression [DDC-3621]
 2015-03-23 23:43:36 +00:00
Marco Pivetta
22d699008c Merge branch 'hotfix/#1346-post-insert-big-integer-cast-avoidance' 
Close #1346
 2015-03-23 23:38:21 +00:00
Josef Kříž
e57be9da5e Fix: generated IDs are converted to integer 2015-03-23 17:51:04 +01:00
Josef Kříž
d1a695b42b Typo in phpdoc 2015-03-23 15:57:41 +01:00
Bill Schaller
4b10db3a43 Fix crashes in ConvertMappingCommand and GenerateEntitiesCommand when using entities with joined table inheritance 
ConvertMappingCommand and GenerateEntitiesCommand both use the DisconnectedClassMetadataFactory, which allows metadata manipulation without loading the associated classes. Commit a36bea broke these two commands by adding a bailout condition in ClassMetadataFactory::populateDiscriminatorValue which checks $metadata->reflClass->isAbstract(). If the DisconnectedClassMetadataFactory is being used, $metadata->reflClass will always be null, causing a fatal error, "Fatal error: Call to a member function isAbstract() on null".

This commit adds a check to see if $metadata->reflClass is set before checking isAbstract.
 2015-03-20 13:59:27 -04:00
Bill Schaller
4c84f54493 Fix failures on SQL Server due to scalar select items not having an alias 2015-03-19 17:09:47 -04:00
Marco Pivetta
24425436b0 Bumping version constants to 2.5.0-DEV 2015-03-18 22:38:42 +00:00
Marco Pivetta
483d48cc54 Bumping version constants for the 2.5.0-BETA1 release 2015-03-18 22:38:18 +00:00
Benjamin Eberlei
b3a6fb7fde [DDC-3461] Renamed AssocationBuilder::isPrimaryKey() to makePrimaryKey(). Same for FieldBuilder and depreceating isPrimaryKey(). Adjust tests. Revert change in ClassMetadataInfo and fix bug. 2015-03-18 17:06:30 +01:00
Marco Pivetta
4daf383e4f Merge pull request #1303 from mrkrstphr/querybuilder-get-all-aliases 
make QueryBuilder::getAllAliases public
 2015-03-17 23:33:43 +00:00
Marco Pivetta
3b0fb6b4b8 Merge pull request #1274 from doctrine/persistent-collection-as-lazy-collection 
PersistentCollection now extends AbstractLazyCollection.
 2015-03-17 23:32:17 +00:00
Marco Pivetta
1add0a04fa Merge pull request #1302 from goetas/pr1301 
Store column values of not cache-able associations
 2015-03-17 23:27:04 +00:00
Benjamin Morel
517cb7e2a2 Honor convertToDatabaseValueSQL() in DQL query parameters 2015-03-18 00:24:41 +01:00
Marco Pivetta
648fde8914 #1316 - removing useless null check (redundant with isset()), cs cleanups 2015-03-17 23:16:16 +00:00
molchanoviv
f244db80fb Allow to join non-public schema tables 2015-03-17 23:03:03 +00:00
Jeremy
ac9a5e69ec Properly generate default value from yml & xml mapping 2015-03-17 22:47:11 +00:00
Bill Schaller
5c4b6a2140 resolve nitpicks from @Ocramius and @deeky666 2015-03-17 18:44:03 -04:00
Bill Schaller
d710555265 Remove shameful hack in LimitSubqueryOutputWalker - replace with significantly less shameful hack 2015-03-17 18:32:57 -04:00
nclavaud
b492d61398 Update identityMap when entity gets managed again 
http://www.doctrine-project.org/jira/browse/DDC-3619

When using SoftDeleteable doctrine extension, an entity can be scheduled
for deletion, then persisted before flushing. In such a case, the entity
was removed from the unit of work identity map and no reference was
hold. This could lead to spl_object_hash collisions, and prevent
another, new entity to be persisted later.

This fix makes sure the unit of work identity map holds a reference to
the entity after it has been soft-deleted.
 2015-03-17 22:19:10 +00:00
Bill Schaller
df0875c596 Fix Paginator OrderBy clauses when ordering by columns from non-fetched joined tables 2015-03-17 17:32:28 -04:00
Marco Pivetta
40c41857e8 #1333 - Removing unused is_string() function call and cast (always a string) 2015-03-17 21:12:20 +00:00
Marco Pivetta
d6687e070e #1333 - Removing useless is_string() function call, clarifying docblock parameters 2015-03-17 21:11:43 +00:00
Stefano Torresi
2bdc1142fe add string casting to id hashes 2015-03-17 21:08:06 +00:00
Jan Langer
8ac66bb608 Allow DateTimeInterface as parameter value 2015-03-17 20:58:20 +00:00
Bill Schaller
eebce88146 Revert "Revert "Merge branch 'hotfix/#1220-sort-paginator-subquery-output-only-once'"" 
This reverts commit 6a1755972d19af4c1c07bc9c555d456d66426bda.
 2015-03-17 13:58:50 -04:00
Karl Rixon
778ed04eac Support embeddables in partial object query expression [DDC-3621] 2015-03-17 15:46:01 +00:00
Benjamin Morel
8d7ba1aebb Fixed AbstractQuery::getParameter() documented return type 2015-03-17 15:53:09 +01:00
Jeroen Thora
a409e7591d Changed some wrong usage of the @internal phpdoc 2015-03-15 16:53:34 +01:00
Marco Pivetta
a3f9f153dd Merge pull request #1321 from vvh-empora/master 
embeddedClasses support...
 2015-03-10 21:53:05 +01:00
Marco Pivetta
73d4d88ba1 Merge pull request #1326 from guiwoda/orphan-removal-association-builder 
Allow AssociationBuilder to set a relation as orphan removal
 2015-03-09 23:18:59 +01:00
Guido Contreras Woda
71821bb7a3 Allow AssociationBuilder to set a relation as orphan removal 2015-03-09 18:54:35 -03:00
vvh-empora
6afcac84d0 embeddedClasses support... 
...for JoinedSubclassPersister.php
 2015-03-03 11:40:19 +01:00
Guilherme Blanco
19f18fa069 PersistentCollection now extends AbstractLazyCollection. 2015-03-01 00:30:21 -05:00
Guilherme Blanco
6e40361fe7 Merge pull request #1311 from jankramer/DDC-3582-nested-embeddable-hydration 
[DDC-3582] Wrong class is instantiated when using nested embeddables
 2015-02-27 10:31:58 -05:00
Jan Kramer
f09b9895b6 Fix embeddable instantiation in nested situations 2015-02-27 15:09:58 +01:00
Marco Pivetta
a41e774bb1 Merge pull request #1314 from FabioBatSilva/date-add-second 
DATE_ADD - Support for seconds
 2015-02-26 10:20:52 +00:00
FabioBatSilva
57bcd7cd3d DATE_ADD - Support for seconds 2015-02-25 14:32:51 -05:00
Guilherme Blanco
5ab4c3d50c Added programatical support to define indexBy on root aliases. 2015-02-25 14:29:10 -05:00
Thomas Lomas
37f5c82d15 Add proper pluralization into UpdateCommand 2015-02-24 18:13:13 +00:00