1
0
mirror of synced 2024-12-12 14:26:02 +03:00
Commit Graph

9701 Commits

Author SHA1 Message Date
Marco Pivetta
df902c9c6a Preparing release v2.5.0-RC1 2015-03-25 23:14:52 +00:00
Marco Pivetta
cf1ecffb14 Merge pull request 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
dc99ed286a Merge branch 'hotfix/#1342-paginator-functional-test-integration-take2'
Close 
Close 
Close 
2015-03-24 00:39:03 +00: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
Bill Schaller
147bdd8ede Fixed nitpicks from @stof 2015-03-24 00:25:12 +00:00
Bill Schaller
81ccd93b74 Add thorough functional tests for Paginator, expand existing ones. 2015-03-24 00:25:12 +00:00
Marco Pivetta
06998d015f Skipping DDC-3634 tests when a post-insert generator is unavailable 2015-03-24 00:20:03 +00:00
Marco Pivetta
70c8591bbe Merge pull request 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 
2015-03-23 23:38:21 +00:00
Marco Pivetta
4c119c44a1 Completed test coverage for DDC-3634 2015-03-23 23:37:36 +00:00
Marco Pivetta
cbdf23ca65 Verifies that identifiers are kept as strings when dealing with large numbers 2015-03-23 23:29:22 +00:00
Marco Pivetta
34168d7085 Merge pull request from zeroedin-bill/fix-crash-in-convertmapping-command
Fix crashes in ConvertMappingCommand and GenerateEntitiesCommand...
2015-03-23 22:35:33 +00:00
Jonathan H. Wage
525c77d4a1 Update docs theme submodule. 2015-03-23 22:10:06 +00:00
Josef Kříž
e57be9da5e Fix: generated IDs are converted to integer 2015-03-23 17:51:04 +01:00
Karl Rixon
6070c9395d Functional tests for partial selection with embeddables [DDC-3630] 2015-03-23 15:44:06 +00: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
Guilherme Blanco
e6887954ec Merge pull request from zeroedin-bill/fix-slc-tests-console-decoration
Fix tests for SLC console commands failing due to console output decoration
2015-03-20 13:52:00 -04:00
Bill Schaller
b057b64c1c Fix tests for SLC console commands failing due to comparison with decorated console output. 2015-03-20 13:45:49 -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
Bill Schaller
591fd00d73 Fix capitalization of mapping annotations in PaginationTestCase.php 2015-03-19 16:47:04 -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
Marco Pivetta
05db65d034 Merge pull request from javiereguiluz/patch-6
[doc] Minor fixes and typos
2015-03-18 22:02:15 +00:00
Javier Eguiluz
be18915ed6 Minor fixes and typos 2015-03-18 17:27:31 +01: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
df8be6f31e Correcting import that was colliding with another already imported User type 2015-03-17 23:58:53 +00:00
Marco Pivetta
4daf383e4f Merge pull request from mrkrstphr/querybuilder-get-all-aliases
make QueryBuilder::getAllAliases public
2015-03-17 23:33:43 +00:00
Marco Pivetta
3b0fb6b4b8 Merge pull request 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 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
0738571b7d Merge branch 'feature/#1316-allow-non-public-schema-join-tables'
Close 
2015-03-17 23:16:26 +00:00
Marco Pivetta
648fde8914 - removing useless null check (redundant with isset()), cs cleanups 2015-03-17 23:16:16 +00:00
Marco Pivetta
4095bbaa92 - adding @group annotation to newly introduced tests 2015-03-17 23:15:07 +00:00
Marco Pivetta
0c0d3a1a7c - removing unused API from stub class 2015-03-17 23:14:29 +00:00
Marco Pivetta
bfd628e153 - refactoring test code to reduce the number of actual involved systems (quote strategy) 2015-03-17 23:14:13 +00:00
molchanoviv
ab740abe96 Add DefaultQuoteStrategyTest::testGetJoinTableName() test 2015-03-17 23:03:03 +00:00
molchanoviv
f244db80fb Allow to join non-public schema tables 2015-03-17 23:03:03 +00:00
Marco Pivetta
8f0b3398d3 Merge branch 'hotfix/#1327-entity-generator-default-property-value-export'
Close 
2015-03-17 22:47:50 +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
Marco Pivetta
ce41e35c1f Merge branch 'hotfix/#1338-identity-map-garbage-collection-prevention-on-canceled-remove'
Close 
2015-03-17 22:38:19 +00:00
Marco Pivetta
0a2d9fa130 - Removing redundant test case 2015-03-17 22:36:00 +00:00
Bill Schaller
d710555265 Remove shameful hack in LimitSubqueryOutputWalker - replace with significantly less shameful hack 2015-03-17 18:32:57 -04:00
Marco Pivetta
504552e779 Adding @group annotations for newly introduced tests 2015-03-17 22:31:05 +00:00
Marco Pivetta
b721841c73 DDC-3619 - moved test to unit of work tests 2015-03-17 22:30:06 +00: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