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,714 Commits 5 Branches 0 Tags
Commit Graph

9714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Schaller
b76107e20f resolve review comments from @stof 2015-03-31 21:39:20 +01:00
Bill Schaller
edcc0fc024 Fix paginator when ordering by while selecting entities using joined table inheritance 2015-03-31 21:39:20 +01:00
Bill Schaller
09d28819b5 Fix issue where paginating on a query with a subquery in the where clause crashed 2015-03-31 21:38:58 +01:00
Bill Schaller
af3f5c5c5a Add test for paginating on a query with a subquery in the where clause 
Conflicts:
	tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
 2015-03-31 21:38:58 +01:00
Kristopher Wilson
a4aa18f796 test case for joined table inheritance pagination 2015-03-31 21:38:58 +01:00
Bill Schaller
010d52378c Fix LimitSubqueryOutputWalkerTest 2015-03-31 21:36:33 +01:00
Bill Schaller
a8342a4be2 Cleanup 2015-03-31 21:36:33 +01:00
Alexander Orabey
f92307d06d problem with LimitSubqueryOutputWalker when use InheritanceType 
Conflicts:
	tests/Doctrine/Tests/OrmFunctionalTestCase.php
 2015-03-31 21:36:32 +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
Marco Pivetta
b923c937e2 Merge branch 'hotfix/#1352-entity-generator-new-class-metadata-hotfix' 
Close #1352
 2015-03-31 08:45:48 +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
dc99ed286a Merge branch 'hotfix/#1342-paginator-functional-test-integration-take2' 
Close #1342
Close #1337
Close #1325
 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 #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
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 #1345 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 #1344 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 #1341 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 #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
0738571b7d Merge branch 'feature/#1316-allow-non-public-schema-join-tables' 
Close #1316
 2015-03-17 23:16:26 +00:00
Marco Pivetta
648fde8914 #1316 - removing useless null check (redundant with isset()), cs cleanups 2015-03-17 23:16:16 +00:00
Marco Pivetta
4095bbaa92 #1316 - adding @group annotation to newly introduced tests 2015-03-17 23:15:07 +00:00