RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-15 07:36:03 +03:00
Code Issues Projects Releases Wiki Activity
5,824 Commits 5 Branches 0 Tags 32 MiB
14f20c16bc
Commit Graph

1492 Commits

Author SHA1 Message Date
Benjamin Eberlei
2b663ff2bc Merge branch 'master' of github.com:doctrine/doctrine2 2011-10-16 22:47:28 +02:00
Benjamin Eberlei
939fbf9c24 DDC-1278 - Clean up event handling of new clear functionality. 2011-10-16 22:45:06 +02:00
Benjamin Eberlei
22a04fd6de Merge dominikl/DDC-1278 into doctrine/DDC-1278 2011-10-16 22:41:16 +02:00
Benjamin Eberlei
8466060797 DDC-1385 - Add INDEX BY scalar variables on the top-level 2011-10-16 19:23:20 +02:00
Christophe Coevoet
a8e6131e3b Added the initializeObject method in the EntityManager 2011-10-16 17:00:33 +02:00
Benjamin Eberlei
ee924ffaba DDC-1385 - Fix scalar handling for array hydrator 2011-10-16 16:27:50 +02:00
Benjamin Eberlei
2730f64d90 DDC-1385 - Refactor ObjectHydrator 2011-10-16 16:13:59 +02:00
Benjamin Eberlei
cb0e5dbff3 DDC-1385 - Fixed Mixed result hydration using INDEX BY to work on the top-level indexes, not some weird result. This is a BC break to those that actually use this crazy logic, sorry for that :-) 2011-10-16 12:46:17 +02:00
Benjamin Eberlei
0252d55c67 DDC-1358 - Fix bug where multiple NULL root entity combined with scalar results will break the object and array hydrator. 
This case likeli only occurs when doing native queries. A guard clause that prevents hydration from breaking
when RIGHT JOIN queries with null root entities appear has been added aswell.
 2011-10-16 11:15:45 +02:00
Guilherme Blanco
eeba947ea7 Code optimizations. Fixed unused argument in OrmTestCase as referred in DDC-766. 2011-10-16 02:10:59 -02:00
Benjamin Eberlei
4474d305cb DDC-1210 - Optimize UnitOfWork collection handling internally. 2011-10-15 21:47:16 +02:00
Benjamin Eberlei
7c244abc1c Merge branch 'master' of github.com:doctrine/doctrine2 2011-10-15 21:09:36 +02:00
Benjamin Eberlei
7b71b3284d Fix failing test due to EntityGenerator assuming beginning with 2.2 the AnnotationReader is always used. There is still the simple reader though. 2011-10-15 20:41:07 +02:00
Benjamin Eberlei
7e571212a7 Merge pull request #109 from alOneh/patch-1 
Remove trailing spaces
 2011-10-15 11:39:56 -07:00
Benjamin Eberlei
75e1d17d18 Merge branch 'ValidateJoinColumnsMatching' 2011-10-15 20:33:46 +02:00
Benjamin Eberlei
a82bffbfc9 Make SchemaValidator catch errors such as very invalid schema using only part of the primary key for join columns 2011-10-15 20:31:56 +02:00
Guilherme Blanco
ba38f3e1e9 Merge pull request #148 from asm89/ProxyIdentifer 
Do not load entity on retrieving identifier from a proxy
 2011-10-15 11:23:06 -07:00
Benjamin Eberlei
18fd29613c Merge pull request #137 from docteurklein/fluent_query_expr 
added fluent pattern to Query\Expr\Base::add* methods
 2011-10-15 11:09:37 -07:00
Benjamin Eberlei
1f59001ff7 Merge pull request #130 from bmichotte/master 
Fluent entity (master)
 2011-10-15 11:01:19 -07:00
lenar
3dc30dee11 use the correct targetEntity 2011-10-15 20:00:02 +02:00
lenar
cab154b873 identifier referencing foreign entity can be defined in parent class too 2011-10-15 19:59:50 +02:00
Benjamin Eberlei
7f5844c209 Merge pull request #147 from asm89/assignid 
Goetas: Better error handling on missing assigned id
 2011-10-15 10:41:27 -07:00
Alexander
c5e51e6fa9 Merge branch 'master' into assignid 2011-10-15 19:33:42 +02:00
Alexander
fdb9fb1c2b AssignedGenerator can always tell what field is missing an id 2011-10-15 19:33:29 +02:00
Benjamin Eberlei
b6c49863e8 Merge branch 'master' of github.com:doctrine/doctrine2 2011-10-15 19:14:53 +02:00
Benjamin Eberlei
08716d9f72 DDC-1383 - Proxy Generation in merge was flawed with inheritance 2011-10-15 19:14:30 +02:00
Benjamin Eberlei
73101be422 Merge pull request #143 from craue/patch-2 
added missing type hint
 2011-10-15 10:05:53 -07:00
Benjamin Eberlei
6f3667201c Add @ignore and @internal to UnitOfWork#computeChangeSet 2011-10-15 18:11:14 +02:00
Benjamin Eberlei
52cea01563 DDC-1411 - Fixed onDelete handling in EntityGenerator 2011-10-15 17:53:04 +02:00
Benjamin Eberlei
cb21f3c5ff DDC-1414 - Missing push to $newNodes 2011-10-15 17:47:09 +02:00
Alexander
f47e1feac6 Merge branch 'master' of git://github.com/doctrine/doctrine2 into ProxyIdentifer 
Conflicts:
	lib/Doctrine/ORM/Proxy/ProxyFactory.php
 2011-10-15 17:24:13 +02:00
Benjamin Eberlei
e38076c19a DDC-1421 - Fix potential bug and code-smells 2011-10-15 16:57:57 +02:00
Benjamin Eberlei
dd6f6cb097 Fix notice 2011-10-15 16:03:50 +02:00
Benjamin Eberlei
640facd26a Remove unncessary line 2011-10-15 15:51:11 +02:00
Benjamin Eberlei
3801e0c230 Add way to keep track of read only objects in the UnitOfWork which are never updated during flush. 
Changed the behavior of EntityManager#getPartialReference to be read-only. No changes are ever
done to this entities. Changed UnitOfWork#computeChangeSet to never create a changeset for
fields that are partially omitted from a DQL or NativeQuery.

To check if an entity is read only use the new API:

    if ($entityManager->getUnitOfWork()->isReadOnly($entity))
 2011-10-15 15:42:02 +02:00
Guilherme Blanco
772b413579 Fixed bug with boolean values being converted to string. 2011-10-15 00:23:55 -03:00
Fabien Potencier
6a72ba5f97 DDC-1418 - Add simplified XML and YAML drivers ported from the Symfony project, thanks Fabien 2011-10-13 23:39:11 +02:00
Benjamin Eberlei
a36a1624fb [DDC-1415] Add EntityEventDelegatee, allowing to restrict emitting events to certain entity classes only. 2011-10-13 22:58:22 +02:00
Christophe Coevoet
c7c875a063 Fixed the version check in the entity generator 
The 3.0.x branch of Common has been merged to become the incoming
2.2 release.
 2011-10-10 19:20:01 +02:00
Benjamin Eberlei
9058bc3f5c Fix DDC-1402 - No caching for SingleTablePersister::_getSelectColumnList 2011-10-10 17:52:37 +02:00
Christian Raue
1681d8a893 switched 2nd and 3rd argument for SelectExpression's constructor, making the 3rd one optional to keep its signature compatible to previous versions 2011-10-10 14:04:55 +02:00
Christian Raue
689aaef4dc added missing type hint 2011-10-10 09:44:17 +03:00
Christian Raue
bf44be86a9 fixed typo 2011-10-10 03:02:55 +03:00
Guilherme Blanco
24042863ac BasicEntityPersister::exists() was not supporting identifiers that are associations. Fixes DDC-1382. 2011-10-03 02:21:14 -03:00
Guilherme Blanco
ebe933810e Implemented HIDDEN support in DQL. Fixes DDC-1363. 2011-10-03 02:07:07 -03:00
Guilherme Blanco
8efae0b232 Fixes DDC-1396. 2011-10-03 01:30:20 -03:00
Guilherme Blanco
cd28051370 Fixes DDC-1395 2011-10-03 01:26:43 -03:00
Asmir Mustafic
d24f288149 Better error handling on missing assigned id 2011-09-29 09:31:06 +02:00
docteurklein
b28af2e527 added fluent pattern to Query\Expr\Base::add* methods 2011-09-27 10:36:32 +02:00
Guilherme Blanco
80284a273d Merge pull request #133 from FabioBatSilva/DDC-1335 
Fixes DDC-1335.

Patch looks perfect to me. @beberlei please merge into 2.1 =)
 2011-09-25 14:52:56 -07:00
Benjamin Eberlei
d2cd6560c5 DDC-1337 - Adjust MultiTableUpdateExecutor and MultiTableDeleteExecutor to use AbstractPlatform 2011-09-25 19:01:37 +02:00
Benjamin Eberlei
9f96d4a31a DDC-1392 - Fix bug with merging unitialized proxies 2011-09-25 18:08:41 +02:00
Fabio B. Silva
5fe996baf9 change tests for DDC-1135 2011-09-25 12:20:48 -03:00
Benjamin Eberlei
cd7029d266 DDC-1367 - Bugfix 2011-09-25 16:39:41 +02:00
Benjamin Eberlei
c02920762b Adjust ClassMetadataFactory to forthcoming interface change 2011-09-25 14:41:56 +02:00
Fabio B. Silva
e94b902a9b tests for DDC-1335 2011-09-24 16:10:10 -03:00
Fabio B. Silva
f4c5c4ba01 branch for DDC-1335 2011-09-23 18:10:58 -03:00
Guilherme Blanco
9795cb1f0d Subqueries should never add items to ResultSetMapping. Fixing possible broken inclusion. 2011-09-21 17:35:38 -03:00
Guilherme Blanco
a86038b484 Fixed issue with CaseExpression not working in Subselects. 2011-09-21 17:30:45 -03:00
Benjamin
01d900d5d7 tab <-> spaces 2011-09-20 15:50:32 +02:00
Benjamin
944f802d79 Correct indentation 2011-09-20 15:35:16 +02:00
Benjamin
2b334977f5 Add "return $this" to generated methods to get a fluent Enttity class 2011-09-20 14:59:32 +02:00
Guilherme Blanco
2ae3bb6e3a Fixed bug in Result cache cleaner. 2011-09-19 01:40:30 -03:00
Guilherme Blanco
1fb213760b Refactored Cache cleaners commands to sync with new Common Cache Providers. 2011-09-15 17:46:13 -03:00
Guilherme Blanco
918e2d2018 Fixed remaining Doctrine packages upgrade. 2011-09-13 01:14:36 -03:00
Guilherme Blanco
3bb803fd69 Cherry picked FabioBatSilva upgrade of Common lib. 2011-09-13 00:59:24 -03:00
Fabio B. Silva
3707b34cbb Change repository type for EntityRepository 2011-09-08 17:21:06 -03:00
Fabio B. Silva
43ccd9ead6 tests for DDC-753 2011-09-08 15:54:49 -03:00
Fabio B. Silva
ee80ec4851 Merge remote-tracking branch 'upstream/master' into DDC-753 2011-09-08 14:36:38 -03:00
Fabio B. Silva
84cd22d7f7 new branch for DDC-753 2011-09-08 14:36:13 -03:00
Fabio B. Silva
19d0887bb0 check if parent class is a mapped superclass 2011-09-08 13:41:16 -03:00
Fabio B. Silva
7f0275155d php mapping 2011-09-08 13:17:53 -03:00
Fabio B. Silva
f6d34bbb9d Merge remote-tracking branch 'upstream/master' into DDC-869 2011-09-08 11:54:04 -03:00
Alain Hippolyte
01c9a4ac1c Fix documentation for metadata driver 2011-09-08 11:41:09 +03:00
Guilherme Blanco
a7f3af8328 Added IDENTITY DQL Function. Fixes DDC-1339. 2011-09-08 02:10:48 -03:00
Fabio B. Silva
25ecd45fd1 Merge remote-tracking branch 'upstream/master' into DDC-869 2011-09-07 17:27:59 -03:00
Fabio B. Silva
82f7d6cad2 starts work with mapped superclass repository 2011-09-07 17:27:05 -03:00
Guilherme Blanco
e3d133af04 Added getQuotedTableName() in missing places of Doctrine ORM. Fixes DDC-1365. 2011-09-07 01:48:19 -03:00
Guilherme Blanco
6ec2ae249b Merge branch 'master' of github.com:doctrine/doctrine2 2011-09-06 01:58:34 -03:00
Guilherme Blanco
2cfc61db84 Fixed bug with orphanRemoval not removing associated Entity on OneToMany and OneToOne relationships. As defined in ClassMatedataInfo, in these situations, when orphanRemoval=true, cascade=remove is implicit. This fixes DDC-1321. 2011-09-06 01:58:16 -03:00
Davy Hellemans
b333ff95fb Fixed typo 2011-09-05 09:42:09 +03:00
Guilherme Blanco
6bbf2d9da3 Added support for ResultVariable referencing in ArithmeticPrimary. Fixes DDC-1346. 2011-09-05 03:16:01 -03:00
Guilherme Blanco
ddfdb37a58 Merge branch 'master' of github.com:doctrine/doctrine2 2011-09-05 02:27:26 -03:00
Guilherme Blanco
666691f84f Small changes for code readability. Added type binding in JoinedSubclassPersister, which was missing. Fixes DDC-1316. 2011-09-05 02:27:06 -03:00
Benjamin Eberlei
09ac3a9eb2 DDC-659 - Add ClassMetadataBuilder for PHP based metadata management 2011-09-04 14:13:20 +02:00
Benjamin Eberlei
342c3ba941 Initial work on ClassMetdataBuilder 2011-09-04 10:08:33 +02:00
Guilherme Blanco
f29c907f41 Optimized and refactored code for getParameterValue in Doctrine\ORM\Query. 2011-09-02 13:53:53 -03:00
Guilherme Blanco
3b3186ee98 Added support to user provide an array of Entities as a DQL parameter. Fixes DDC-1356. 2011-09-01 19:11:57 -03:00
Guilherme Blanco
ecc556f687 Fixes DDC-1354. 2011-09-01 03:00:53 -03:00
Benjamin Eberlei
53a153bc15 Merge pull request #111 from Gregwar/yaml_entity_repository 
[Tools] Added entityRepository support in yaml exporter
 2011-08-30 11:43:25 -07:00
Benjamin Eberlei
8b38e68e23 DDC-1350 - Bugfixes in Doctrine\ORM\Tools\Setup 2011-08-30 20:40:26 +02:00
Grégoire Passault
240f0ea34c [Tools] Added entityRepository support in yaml exporter 2011-08-29 17:40:54 +02:00
Guilherme Blanco
12f46e936c Merge branch 'master' of github.com:doctrine/doctrine2 2011-08-28 13:48:24 -03:00
Guilherme Blanco
e7f471ef3e Fixed issue with CTI during DQL update that was incorrectly setting parameter types during multi table execution. Fixes DDC-1341. 2011-08-28 13:48:15 -03:00
Benjamin Eberlei
b145f061c9 DDC-1348 - Fix bug with UnitOfWork::getEntityState() 2011-08-28 15:58:08 +02:00
Benjamin Eberlei
e6a73803a4 Merge branch 'DDC-1306' 2011-08-27 20:44:15 +02:00
Benjamin Eberlei
3b4b38e184 DDC-1306, DDC-1113 - Fix issues with inheritance and commit order 2011-08-27 20:41:52 +02:00
Benjamin Eberlei
d3b27dcb1a DDC-1344 - Fix path displaying to not use realpath()ed variables 2011-08-27 13:36:18 +02:00
Nadav
2e389e00d4 Removed blank line, used empty() instead of the count() check 2011-08-26 08:15:28 +03:00
Nadav
5fc6277d3f Oops, shouldn't have removed the condition completely... checking a parameter is provided 2011-08-26 07:51:29 +03:00
Nadav
d314386060 we can (now) transform it into IS NULL 2011-08-26 07:42:16 +03:00
Benjamin Eberlei
8c2db89f2b DDC-1340 - Fix bug with merge() and optimistic lock exception 2011-08-21 15:01:57 +02:00
Alain Hippolyte
06d56156dd Remove trailing spaces 2011-08-19 06:11:58 +03:00
Lenar Lõhmus
d7fbd2cd14 short classname support for custom repository class 2011-08-19 04:44:24 +03:00
Guilherme Blanco
7433148f17 Fixed bug in XMLDriver where relation indexes are treathed as elements but documented as attributes. 2011-08-16 11:36:41 -03:00
Guilherme Blanco
6857134f36 Fixed issue with duplicated commas if Entity has no fields. 2011-08-15 12:47:17 -03:00
Guilherme Blanco
f148912a28 [DDC-934][DDC-1100][DDC-1331] Implemented support to multi-values in INSTANCE OF expression. 2011-08-15 01:53:56 -03:00
Benjamin Eberlei
2ee3cdeb0c Merge pull request #106 from FabioBatSilva/master 
[DDC-1325] @Target annotation
 2011-08-14 10:22:13 -07:00
Dominik Liebler
6e47d7b16d DDC-1278 - EntityManager::clear($entity) support 
added test case and modified test data CmsUser to cascade detach address and articles (testing collections and single entites)
 2011-08-14 16:12:12 +02:00
Guilherme Blanco
a0ca506db7 Added support to SingleValuePathExpression in ORDER BY. 2011-08-14 00:46:02 -03:00
Guilherme Blanco
63a2f02f4d [DDC-408][DDC-1150][DDC-1277] Implemented support to parameter expanding on associations. 2011-08-13 21:28:54 -03:00
Fabio B. Silva
a04d2933fa @Target annotation and support to common 2.2-DEV 2011-08-13 16:28:05 -03:00
Dominik Liebler
25f5ff0ca1 DDC-1278 - EntityManager::clear($entity) support 
cascade detach operation only on entity name entities
 2011-08-13 20:22:23 +02:00
Dominik Liebler
745535d269 fixed typo 2011-08-12 20:15:32 +02:00
Dominik Liebler
05fb0b913a DDC-1278 - EntityManager::clear($entity) support 
added new parameter $entityName for UnitOfWork::clear()
removed not implemented exception in EntityManager:clear()
 2011-08-11 23:03:26 +02:00
Rafael Dohms
07e1c1e2e1 Added method to retrieve currently used Reader. This allows projects that use Doctrine to recycle the reader to use with other annotation-driven packages, like DMS\Filter and Symfony\Validator 2011-08-10 15:10:09 -03:00
Guilherme Blanco
816ce41f63 Added support to CaseExpression. Added support to nest AndX and OrX QueryBuilder composite expressions, since they do not mess with generated queries. 2011-08-08 02:09:25 -03:00
Benjamin Eberlei
bcc7bb1c9c DDC-1300 - Fix bug in fetch join hydration of entities with foreign key identifier 2011-08-06 20:25:45 +02:00
Johannes Schmitt
7e47a601b0 updated configuration 2011-08-05 16:48:05 +02:00
Benjamin Eberlei
ba882be76b DDC-1313 - Optimize behavior of DriverChain::getAllClassNames() 2011-08-01 21:45:21 +02:00
Benjamin Eberlei
816039f23f DDC-1302 - Fix bug in XmlDriver not handling orphan removal 2011-07-31 11:32:57 +02:00
Benjamin Eberlei
5c47c07794 Merge pull request #97 from asm89/DDC-1301 
[DDC-1301] Fixed count() for fetch="EXTRA_LAZY" on OneToMany association
 2011-07-28 14:26:15 -07:00
Benjamin Eberlei
8f589e5876 Merge pull request #92 from mridgway/DDC-1275 
DDC-1275: Added join columns to result set mapping
 2011-07-28 14:18:55 -07:00
Michael Ridgway
1250cd7a5a F[DDC-1275] ixed check for owning side of a toOne relationship 2011-07-28 10:50:22 -04:00
Alexander
d7dbde8f3e [DDC-1301] Fixed count() for fetch="EXTRA_LAZY" on OneToMany association 2011-07-28 11:01:52 +02:00
Benjamin Eberlei
196632978c DDC-1298 - Fix bug in SQLWalker with derived entities that have no fields of their own. 2011-07-27 23:22:20 +02:00
kwiateusz
d1e9bc6401 Now findByOne really retrieve only one entity adding limit to query. 2011-07-27 15:43:27 +02:00
Michael Ridgway
154fd60d85 DDC-1275: Added join columns to result set mapping 2011-07-26 17:35:06 -04:00
Benjamin Eberlei
57cfcfd20e Merge pull request #79 from mridgway/DDC-725 
[DDC-725] Removed onUpdate property on join columns
 2011-07-26 14:14:30 -07:00
Benjamin Eberlei
e73605e177 Merge pull request #90 from mweimerskirch/patch-2 
Corrected typo
 2011-07-26 14:12:19 -07:00
Benjamin Eberlei
598ab36968 [DDC-1215] Fix EntityGenerator inheritance regenerating properties and methods 2011-07-26 22:59:55 +02:00
Benjamin Eberlei
93d2e1bd0a [DDC-1280] Only generate linefeeds in proxies for consistency. 2011-07-26 22:30:20 +02:00
Benjamin Eberlei
cbf210605a [DDC-1290] Allow smallint and bigint for version fields 2011-07-26 22:24:16 +02:00
Benjamin Eberlei
a99ffc126f DDC-1276 - Fix bug where merge managed and new entitiy share the same collection that is cascaded, cleared during the process and then empty afterwards. 2011-07-26 22:15:27 +02:00
Michel Weimerskirch
6ef4ac62d7 Missed another typo 2011-07-26 11:03:23 +03:00
Michel Weimerskirch
b58f573b31 Corrected typo 2011-07-26 10:59:21 +03:00
Alexander
65f7e897b5 [DDC-1294] Add discriminator information to subselects 2011-07-26 00:19:26 +02:00
Guilherme Blanco
4b85d7a683 Reverted PR #86, which broke our suite. 2011-07-22 11:38:20 -03:00
Guilherme Blanco
4be7c3dac0 Merge pull request #85 from FabienPennequin/fix_ClassMetadataFactory 
Fixed php notice in ClassMetadataFactory
 2011-07-21 10:02:15 -07:00
kwiateusz
570799b48d Restoring the missing comment 2011-07-21 04:13:15 -07:00
kwiateusz
0e6121e8f5 Now findByOne really retrieve only one entity adding limit to query 2011-07-21 12:40:43 +02:00
Fabien Pennequin
99bdf65c10 Fixed php notice in ClassMetadataFactory 2011-07-17 19:39:55 +02:00
Benjamin Eberlei
d9b1dbbb09 DDC-1244 - Fix bug with entities without namespace 2011-07-12 23:43:24 +02:00
Benjamin Eberlei
c87dedbec5 DDC-1254 - Dont throw exception about missing id in disconnected metadata factory 2011-07-12 23:39:56 +02:00
Benjamin Eberlei
4796452b07 DDC-1268 - Singular add*() method name through using targetEntity shortname 2011-07-12 23:25:15 +02:00
Benjamin Eberlei
98fabd98be DDC-1240 - Fix optimistic lock exception loosing the message 2011-07-12 22:50:21 +02:00
Benjamin Eberlei
5733574867 Merge branch 'master' of github.com:doctrine/doctrine2 2011-07-12 22:47:33 +02:00
Benjamin Eberlei
c261315ea7 DDC-1250 - Fix bug with inverse one to one loading and ambigious column names in certain scenarios 2011-07-09 22:11:49 +02:00
Benjamin Eberlei
442a2b3a51 DDC-1257 - Fix bug where validation callbacks are added multiple times in EntityGenerator 2011-07-09 15:11:16 +02:00
Benjamin Eberlei
a8048af65d DDC-1251 - Fix bug in token parsing of EntityGenerator 2011-07-09 14:53:25 +02:00