RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-15 15:46:02 +03:00
Code Issues Projects Releases Wiki Activity
6,526 Commits 5 Branches 0 Tags 32 MiB
49f9d185de
Commit Graph

1372 Commits

Author SHA1 Message Date
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
Guilherme Blanco
33bcf7ad6f Added coverage to DDC-1161. 2011-10-16 01:42:36 -02:00
Benjamin Eberlei
5c78ecaca1 Fix tests in EntityGenerator due to Annotation prefixes 2011-10-15 20:44:25 +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
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
08716d9f72 DDC-1383 - Proxy Generation in merge was flawed with inheritance 2011-10-15 19:14:30 +02:00
Alexander
d46352da01 Fixed tests + added dedicated tests for proxy loading and identifiers 2011-10-15 17:58:00 +02:00
Benjamin Eberlei
cb28bfd484 Improve Error Messages in ClassMetadata and UnitOfWork 2011-10-15 17:38:55 +02:00
Alexander
8d1b852aa2 Added tests for not loading the entity + fixed a test 2011-10-15 17:31: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
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
Benjamin Eberlei
2166a21511 Merge branch 'master' of github.com:doctrine/doctrine2 2011-10-15 11:36:53 +02:00
Benjamin Eberlei
894bbb020c DDC-1394 - Enhance test to verify 2011-10-15 09:57:35 +02:00
Guilherme Blanco
2518f0687c Removed invalid default argument. 2011-10-15 00:21:11 -03:00
Guilherme Blanco
f86e1ba66c Added tests for DDC-1389. Everything is working in 2.2-DEV. 2011-10-15 00:18:57 -03:00
Alexander
097d573d26 Merge branch 'master' into DDC-551 
Conflicts:
	lib/Doctrine/ORM/Configuration.php
	lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
	lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
 2011-10-14 12:33:39 +02: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
Benjamin Eberlei
97a6caf059 Update Common to latest to have the current Persistence Interface 2011-10-11 13:22:26 +02:00
Guilherme Blanco
ebe933810e Implemented HIDDEN support in DQL. Fixes DDC-1363. 2011-10-03 02:07:07 -03: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
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
Fabio B. Silva
728724bed5 fix DDC-1135 2011-09-24 16:16:25 -03: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
a86038b484 Fixed issue with CaseExpression not working in Subselects. 2011-09-21 17:30:45 -03:00
Alexander
63a3fb5ad8 [DDC-551] Moved SQLFilter logic to a separate FilterCollection class 2011-09-15 21:38:47 +02: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
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
6a89de51e5 change tests 2011-09-08 12:55:55 -03:00
Fabio B. Silva
54a53b1d03 tests for DDC-869 2011-09-08 11:56:05 -03:00
Fabio B. Silva
f6d34bbb9d Merge remote-tracking branch 'upstream/master' into DDC-869 2011-09-08 11:54:04 -03:00
Guilherme Blanco
a7f3af8328 Added IDENTITY DQL Function. Fixes DDC-1339. 2011-09-08 02:10:48 -03:00
Fabio B. Silva
b2d98495b1 mapping files 2011-09-07 18:29:43 -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
bd5393a318 Added coverage for orphanRemoval in OneToOne when unlinking an entity. 2011-09-07 13:12:02 -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
Guilherme Blanco
6bbf2d9da3 Added support for ResultVariable referencing in ArithmeticPrimary. Fixes DDC-1346. 2011-09-05 03:16:01 -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
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
Benjamin Eberlei
8b38e68e23 DDC-1350 - Bugfixes in Doctrine\ORM\Tools\Setup 2011-08-30 20:40:26 +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
0a6709acba Fix tests with regard to repositoryClass handling and applying the default namespace 2011-08-28 16:00:21 +02: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
8c2db89f2b DDC-1340 - Fix bug with merge() and optimistic lock exception 2011-08-21 15:01:57 +02:00
Alexander
ed0fb4ece7 Merge branch 'master' into DDC-551 
Conflicts:
	lib/Doctrine/ORM/Persisters/OneToManyPersister.php
 2011-08-16 16:59:48 +02: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
Alexander
3800581947 [DDC-551] Altered persisters to make filters work with EXTRA_LAZY associations 2011-08-16 16:24:50 +02:00
Alexander
2653d735e2 [DDC-551] Added state of the complete filter collection to the EM 
Previously it was sufficient to use the old parser result for a Query if
the DQL didn't change (Query::STATE_CLEAN), but now there must also be
no changes to the filter collection of the EntityManager.

In the old situation each Query object would create a hash of all the
filter objects on it's own. That was not very efficient.

This commit adds the state of the current filter collection to the
EntityManager. The state will be set to FILTERS_STATE_DIRTY as a filter
is enabled, removed or a parameter is set on a filter. The hash is also
computed by the EntityManager, but only if the filter collection is
dirty. This will prevent recalculation of the hash with each query.
 2011-08-16 13:34:42 +02:00
Alexander
3b1ddb0346 [DDC-551] Added filters to SQLWalker 2011-08-16 12:21:43 +02: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
Guilherme Blanco
b9a24b5487 Merge pull request #93 from kwiateusz/UnitTestsUpdate 
Last change from assertTrue($a instanceof $b) to assertInstanceOf
 2011-08-14 21:05:15 -07: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
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
Benjamin Eberlei
d583b149ac Merge pull request #98 from asm89/master 
[DDC-1301] Fixed tests teardown for mysql suite
 2011-07-31 02:41:19 -07:00
Benjamin Eberlei
816039f23f DDC-1302 - Fix bug in XmlDriver not handling orphan removal 2011-07-31 11:32:57 +02:00
Alexander
953a0f6572 [DDC-1301] Fixed tests teardown for mysql suite 2011-07-29 09:35:59 +02:00
Benjamin Eberlei
c34612b8e9 [DDC-1298] DDC117Link file got lost from 2.1.x to master somehow 2011-07-28 23:44:11 +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
Alexander
d439f67df5 [DDC-1301] Prefixed all Legacy models properties with _ 2011-07-28 12:25:23 +02:00
Alexander
b2951691e2 [DDC-1301] Added tests for fetch="EXTRA_LAZY" count() on a "legacy" database 2011-07-28 11:01:28 +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
a47af43bc1 Last change from assertTrue($a instanceof $b) to assertInstanceOf 2011-07-27 08:54:06 +02:00
Michael Ridgway
7f20a32db3 Removing debug comment 2011-07-26 17:39:57 -04: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
79d99b11ad Merge pull request #91 from kwiateusz/UnitTestsUpdate 
Removed deprecated assertType (thanks @kwiateusz)
 2011-07-26 14:03:04 -07: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
Alexander
6cf7bdc2b7 Merge branch 'master' into DDC-551 2011-07-26 17:26:00 +02:00
Alexander
97a4dbf2cd [DDC-1294] Added more tests for subselects in subselects 2011-07-26 17:15:21 +02:00
kwiateusz
7261060905 Few more converts from assertTrue($a instance of $b) to assertInstanceOf 2011-07-26 15:22:57 +02:00
kwiateusz
1ea3e543ab Correted indentation and variable name 2011-07-26 12:10:30 +02:00
kwiateusz
49c735109c Change from assertType to assertInstanceOf. 
Now PHPUnit doesn't show warning about deprecation of assertType.
Also some refractoring from assertTrue($a instanceof $b) to assertInstanceOf.
Leading \ in namespaces is not required so I removed it from few assertions.
 2011-07-26 11:38:09 +02:00
Alexander
65f7e897b5 [DDC-1294] Add discriminator information to subselects 2011-07-26 00:19:26 +02:00
Alexander
e3dcfa8702 [DDC-551] Added filters to query hash + tests for hash 2011-07-22 17:01:18 +02:00
Alexander
afd7a540a7 [DDC-551] Removed 'use ..DBAL\..\Type', causing full testsuite to fail 2011-07-22 15:10:31 +02:00
Alexander
4266ab77b2 [DDC-551] Added __toString() method to SQLFilter 2011-07-22 14:55:00 +02:00
Alexander
4cf63a4e83 [DDC-551] Fixed the escaping of filter parameters 2011-07-22 14:51:30 +02:00
Alexander
277fc751b6 [DDC-551] Added tests for SQLFilter 2011-07-22 13:51:26 +02:00
Alexander
b867744f15 [DDC-551] Added tests for SQLFilter functionality + small fixes 2011-07-22 13:08:49 +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
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
2b207106a3 DDC-1022 - Call __wakeup() with the same semantics then ClassMetadata::newInstance() does inside UnitOfWork 2011-07-09 12:12:44 +02:00
Benjamin Eberlei
ef663c83f3 DDC-1258 - Add Debug UnitOfWork Listener 2011-07-08 14:27:59 +02:00
Benjamin Eberlei
2858b8290f DDC-1238 - Fixed a bug introduced when refactoring persisters hydration. This occurs when you call $em->clear() and you start accessing a proxy. 2011-07-04 23:19:08 +02:00
Benjamin Eberlei
a638154046 Update tests 2011-07-04 20:59:46 +02:00
Benjamin Eberlei
a947e8a4b0 DDC-1238 - Reproducible case, its correct through 2011-07-04 20:59:46 +02:00
Benjamin Eberlei
8e7c156451 Started trying to reproduce this issue 2011-07-04 20:59:46 +02:00
Guilherme Blanco
550fcbc17f [DDC-1237] Fixed issue with QueryBuilder where user may have includes nested complex expression in a string format while consuming a composite expression (AND or OR). 2011-07-03 01:48:18 -03:00
Benjamin Eberlei
a0a81db045 DDC-1204, DDC-1203 - No need to throw this exception for abstract classes anymore 2011-06-30 20:57:29 +02:00
Peter Kruithof
9395eeed3d Changed order of elements 2011-06-29 03:15:05 -07:00
Michael Ridgway
c19d7fe2eb Missed one 2011-06-28 15:55:43 -04:00
Michael Ridgway
9ae30421dd Removed onUpdate property on join columns 2011-06-28 15:50:14 -04:00
Benjamin Eberlei
551f6d05d9 DDC-1230 - Fix bug where UnitOfWork does not set STATE_REMOVE when calling EntityManager#remove() on an entity 2011-06-28 21:37:53 +02:00
Benjamin Eberlei
52431251cb Fix some of the problems with Oracle testsuite 2011-06-26 17:20:03 +02:00
Benjamin Eberlei
7efe071ac4 DDC-1224 - Bugfix with temporary table ids and tables in schema (in postgresql) 2011-06-26 10:10:57 +02:00
Benjamin Eberlei
a73a1e8437 DDC-1226, DDC-1228 - Bugfix with refereshing proxy references not setting the originalEntityData. 2011-06-25 14:38:44 +02:00
Benjamin Eberlei
07f568e2b4 Add test for DDC-1227 regression 2011-06-25 10:27:06 +02:00
Benjamin Eberlei
7367e255ae Merge branch 'master' of github.com:doctrine/doctrine2 2011-06-25 10:24:06 +02:00
Benjamin Eberlei
10b70df1af DDC-1218, DDC-1156 - Fixed bugs with mapped superclasses in inheritance hierachies 2011-06-25 10:20:37 +02:00
Benjamin Eberlei
fe8b28a09f Add test for DDC-1156, DDC-1218 2011-06-25 09:57:15 +02:00
Guilherme Blanco
db80b2b135 Fixed phpunit tests which was failing due to a duplicate use declaration. 2011-06-21 12:38:08 -03:00
Benjamin Eberlei
c7c430032c DDC-1211 - Fix bug with empty numeric literal 2011-06-19 10:17:35 +02:00
Benjamin Eberlei
82f0c244e8 DDC-1189 - Bugfix with PersistentCollection#clear() in combination with lazy loading 2011-06-19 09:39:34 +02:00
Benjamin Eberlei
fa7574b2ba Removed AllTests files and Suites 2011-06-18 22:49:25 +02:00
Benjamin Eberlei
32b146ea8a Switch testsuite to run with phpunit.ini.dist from main folder, not using AllTests approach. Fixed global state problem in tests that was caused by EventManager being reused. Significantly enhanced error message about cascade persist 2011-06-18 22:47:21 +02:00
Benjamin Eberlei
989d375be5 Some more tests for the Setup helper 2011-06-18 08:47:10 +02:00
Benjamin Eberlei
ede68ec87b Merge branch 'master' of github.com:doctrine/doctrine2 2011-06-18 01:05:48 +02:00
Benjamin Eberlei
02f06b6d52 Add convenience Setup Tool to register autoloaders and create configuration objects 2011-06-18 01:05:30 +02:00
Guilherme Blanco
699ccfddb6 Implemented COALESCE and NULLIF support in DQL. 2011-06-17 16:16:22 -03:00
Benjamin Eberlei
0cd0ae49a1 Fix regression introduced with DDC-1203,DDC-1204 patch 2011-06-16 23:00:59 +02:00
Benjamin Eberlei
713f4654fd Merge remote-tracking branch 'origin/master' 2011-06-16 22:49:29 +02:00
Benjamin Eberlei
42c5382a03 DDC-1172 - Handle sequence dropping in SchemaTool. 2011-06-16 22:34:04 +02:00
Guilherme Blanco
98bc3c4e40 Merge pull request #74 from mridgway/DDC-1209 
[DDC-1209] Fixed custom object types as @Id
 2011-06-16 07:15:40 -07:00
Michael Ridgway
d1106a730b Made DDC-1209 test pass 2011-06-16 08:55:09 -04:00
Michael Ridgway
da2d83fc7d DDC-1209 tests 2011-06-15 17:15:46 -04:00
Benjamin Eberlei
5ff44b5ec7 DDC-1203, DDC-1204 - Fix problems with mapped superclasses in midth of inheritance hierachy and entities not mapped in discriminator map. 2011-06-15 22:27:24 +02:00
Guilherme Blanco
fdbc909bde Merge branch 'master' of github.com:doctrine/doctrine2 2011-06-09 15:43:37 -03:00
Guilherme Blanco
1f6b49d236 Added getRootEntities to QueryBuilder. 2011-06-09 15:42:40 -03:00
Benjamin Eberlei
4371e8fab0 DDC-1163 - Fix nasty bug with inheritance in UnitOfWork::executeUpdates() and executeRemovals() 2011-06-05 16:21:23 +02:00
Benjamin Eberlei
22826ac10d DDC-1156 - Do not throw exception for mapped superclass in middle of inheritance hierachy anymore. 2011-06-05 15:00:49 +02:00
Benjamin Eberlei
d3ab9b51fa DDC-1181 - Add test that verifies cascade remove works for entities with foreign identifiers 2011-06-05 13:57:44 +02:00
Benjamin Eberlei
1038a866a4 DDC-1194 - Improve error handling for DQL INSTANCE OF 2011-06-05 10:48:21 +02:00
Benjamin Eberlei
acaf08d4b7 DDC-1193 - Fix bug with cascade remove and proxy classes. 2011-06-05 09:59:16 +02:00
Benjamin Eberlei
875912bffd DDC-733 - Add UnitOfWork::initializeObject() method. 2011-06-05 08:44:38 +02:00
Benjamin Eberlei
6d724ad9ff Make ORM forward compatible with new Doctrine Annotations library version 2.1 2011-05-25 00:26:20 +02:00
Benjamin Eberlei
bc4e14a99f Prototype for a proxy extension that avoids loads when calling for a getter that is named after an identifier. 2011-05-20 20:50:03 +02:00
Benjamin Eberlei
a979852ee6 Merge branch 'DDC-1080' 2011-05-17 23:42:39 +02:00
Benjamin Eberlei
5d81e867be Add some logic to keep backwards compatibility in QueryBuilder 2011-05-15 23:16:44 +02:00
Benjamin Eberlei
85d40847ac Reintroduce QueryBuilder::getRootAlias() for backwards compatibility reasons, mark as @deprecated 2011-05-15 22:11:10 +02:00
Benjamin Eberlei
1b4f0a5e1f DDC-1080 - Add failing testcase 2011-05-14 13:32:12 +02:00
Benjamin Eberlei
cb3615ab47 DDC-1151 - Fix missing table quotes when adding foreign keys in SchemaTool 2011-05-14 08:44:19 +02:00
Guilherme Blanco
2a7364bb18 We now support @Id on @ManyToOne fields. Removed TODO and associated code. 2011-05-14 00:53:22 -03:00
Guilherme Blanco
f4d62b317e Fixed endless recursion of DDC-719 test. 2011-05-14 00:49:46 -03:00
Guilherme Blanco
1e9e2de737 [DDC-1122] Added coverage for bug report. 2011-05-13 00:12:05 -03:00
Guilherme Blanco
8e3fdc5adc [DDC-1148] Implement auto-inference of types in setParameter. 2011-05-12 23:05:45 -03:00
Guilherme Blanco
905e05cd36 [DDC-1067][DDC-1145] Fixed bug with multiple froms and inclusion of joins. Added support for index by in QueryBuilder. This break BC only if users are using base support (->add). 2011-05-11 21:40:27 -03:00
Guilherme Blanco
54a0109d5d [DDC-1147] Allowed usage of 0-based input parameters in DQL. 2011-05-11 17:30:42 -03:00
Guilherme Blanco
b025b2b343 Fixed where componentes (ie. MEMBER OF) that that are sensitive to parenthesis presence. Made OR and AND expressions smarter. Fixed related unit tests. 2011-05-07 20:14:04 -03:00
Benjamin Eberlei
d4569baa11 [DDC-1129] Fix bug in version changeset computation aswell as inline ClassMetadata::isCollectionValuedAssociation to increase performance by 2-5% 2011-05-01 11:44:31 +02:00
Benjamin Eberlei
c53baa9935 [DDC-1091] Fix bug with custom string functions in StringPrimary 2011-05-01 11:01:30 +02:00
Benjamin Eberlei
7a068c206e DDC-1043 - Make computeChangeSet() algorithm more strict, possible leading to more updates to to values that are not exactly the same. However this is necessary to avoid bugs with certain PHP casting rules, i.e. +44 = 44 2011-05-01 10:21:47 +02:00
Francis Besset
a141aaf663 [PR-39] Throw exception when hydrating joined entity without existing parent alias (NativeQuery problem only) 2011-05-01 00:17:40 +02:00
Benjamin Eberlei
85d6b9fd39 Merge pull request #42 from mridgway/DDC-1059. 
DDC-1059: RSM Helper
 2011-04-30 15:01:25 -07:00
Fabien Potencier
0c955fe54f Fix namespace/class parsing in the entity generator 2011-04-30 23:51:22 +02:00
Benjamin Eberlei
73c7605a5c [DDC-1094] Add support for limit, offset and orderby in EntityRepository::findBy(). 2011-04-30 23:18:24 +02:00
Benjamin Eberlei
5179ff921b [DBAL-115] REALLY fix issues with SchemaTool::getDropSchemaSQL(). 2011-04-30 17:16:34 +02:00
Benjamin Eberlei
67b89eaa4f [DDC-1108] Fix bug with single char named input parameters in DQL lexer. 2011-04-30 12:27:16 +02:00
Benjamin Eberlei
ed355d2eb6 Merge branch 'master' of github.com:doctrine/doctrine2 2011-04-30 11:19:58 +02:00
Benjamin Eberlei
f09d299660 [DDC-1132] Fix many to many table detection. 2011-04-30 11:15:45 +02:00
Benjamin Eberlei
41b3a372d3 Add new performance test checking compute changeset performance. 2011-04-30 10:47:56 +02:00
Guilherme Blanco
26bd3e3811 Implemented support for closure return on EntityManager::transactional. Fixes DDC-1125 2011-04-25 18:32:43 -03:00
Michael Ridgway
af4cf0d0ba Replaced prefix parameter with renamedColumns; Added exception when duplicate columns found 2011-04-14 20:55:03 -04:00
Benjamin Eberlei
822481d360 [DDC-1040] Add regression tests for entity as multiple named/positional parameters. 2011-04-03 23:06:03 +02:00
Benjamin Eberlei
a329007526 [DDC-1087] Add missing resolution to IS NULL in EntityRepository when passing a null value as a criteria. 2011-04-03 09:03:43 +02:00
Benjamin Eberlei
ea52b3cc8f [DDC-991] Rename method to AbstractQuery::getOneOrNullResult(). 2011-03-31 23:35:01 +02:00
Benjamin Eberlei
24a7a72f59 [DDC-991] add AbstractQuery::getOneResult() method that returns null instead of throwing an exception as getSingleResult() does. 2011-03-31 23:32:49 +02:00
Michael Ridgway
c46d835146 Moved new functions to ResultSetMappingBuilder class 2011-03-30 10:27:31 -04:00
Michael Ridgway
20dc72ef9a First pass on RSM helper functions for adding entities 2011-03-29 20:35:01 -04:00
Benjamin Eberlei
34ad308599 [DDC-692] Add respective metadata mapping possiblities for read-only entities and a test. 2011-03-29 20:17:44 +02:00
Benjamin Eberlei
9a75277dd4 [DDC-692] Add ClassMetadataInfo::isReadOnly flag and ignore these entities in Change Tracking. 2011-03-29 20:04:14 +02:00
Benjamin Eberlei
36985ee704 Merge remote branch 'mridgway/DDC-696' into DDC-696 2011-03-29 19:42:38 +02:00
Benjamin Eberlei
bda15231da [DDC-1077] Bugfix in not handling literals in Select Expressions. 2011-03-27 21:10:50 +02:00
Benjamin Eberlei
6ed0ff0a12 [DDC-1079] Bugfix for shortcut for ArithmeticExpressions in SimpleSelectExpression that lead to literals not being valid. Problem was that ScalarExpression() did not handle AggregateExpressions() at all, which is now fixed. 2011-03-27 14:04:53 +02:00
Benjamin Eberlei
4f1af0114f [DDC-1014] Add DATE_ADD(), DATE_SUB(), DATE_DIFF() functions for DQL. 2011-03-27 12:18:47 +02:00
Michael Ridgway
17cbb34952 Clean up of test case 2011-03-21 23:30:10 -04:00
Michael Ridgway
1f50dee8a8 DDC-696: Added onClear event 2011-03-21 23:17:08 -04:00
Benjamin Eberlei
7a41a205ee [DDC-992] Fix criteria usage of column names clashing with field or associations by prefixing with table names or alias. 2011-03-20 17:07:19 +01:00
Benjamin Eberlei
edfdbe10a0 [DDC-1053] Fix bug with usage of identification variables in GroupByItem. 2011-03-20 14:07:33 +01:00
Benjamin Eberlei
ac175d2c40 [DDC-1068] Fix case-sensitivity problems of first loading of Metadata. 2011-03-20 12:35:52 +01:00
Benjamin Eberlei
c77dbd859b [DDC-1070] Fix global test state problem introduced with test. 2011-03-20 12:25:27 +01:00
Benjamin Eberlei
62755cc647 [DDC-1070] Fix in AbstractQuery::iterate() method not respecting hydrator and parameters. 2011-03-20 12:19:01 +01:00
Benjamin Eberlei
e757e3beaf Merge branch 'DDC-952' 2011-03-16 23:00:57 +01:00
Benjamin Eberlei
5192306d39 [DDC-952] One last commit with some refactorings, additional comments and two new tests. Also added convenience method Query::setFetchMode($className, $assocName) 2011-03-16 22:51:32 +01:00
Benjamin Eberlei
6d27b4760f [DDC-952] Add Persister hydration performance tests. 2011-03-15 23:22:37 +01:00
Benjamin Eberlei
1b46208aa5 [DDC-952] More fixes 2011-03-15 21:34:47 +01:00
Benjamin Eberlei
1bc4b62805 [DDC-952] Make collection loading work with hydrators also. 2011-03-13 00:15:50 +01:00
Benjamin Eberlei
7c7106b1c1 DDC-952 - Fix bug in inverse one-to-one eager loading sql code. 2011-03-12 19:11:37 +01:00
Benjamin Eberlei
4677883acd [DDC-952] Added modelset and tests for Eager Loading, detected a bug with inverse one-to-one eager fetching that needs to be addressed. 2011-03-12 14:01:51 +01:00
Benjamin Eberlei
077ae9cee9 [DDC-914] Fetch join many-to-one/one-to-one associations configured as FETCH_EAGER inside the persisters. 2011-03-09 23:14:54 +01:00
Guilherme Blanco
7d1fca1ca2 Added support to NamedQueries through ClassMetadata. 2011-03-09 14:43:42 -03:00
Benjamin Eberlei
fd502631c7 DDC-734 - REname query hint to fetchEager. 2011-03-08 22:28:55 +01:00
Benjamin Eberlei
60eb755fe9 DDC-952, DDC-734 Add DQL query hint to switch associations from lazy to eager for deferred initialization optimizations. 2011-03-08 22:22:54 +01:00
Guilherme Blanco
a31289b9d7 Added support to NamedQueries through ClassMetadata. 2011-03-06 18:45:09 -03:00
Benjamin Eberlei
851f44a066 [DDC-952] [DDC-1050] Use ObjectHydrator inside Persisters, removing a bunch of duplicate code (step1, more necessary) 2011-03-06 21:26:54 +01:00
Benjamin Eberlei
03630df20d Add support for IN(?) queries in repositories using the DBAL support for parameter lists. 2011-03-06 11:15:56 +01:00
Benjamin Eberlei
32df9451fd DDC-952 - Implemented first approach for batching eager loads of ToOne associations. 2011-03-05 11:08:41 +01:00
Benjamin Eberlei
78aa893efd Adjust tests to changes in DBAL dependency with regard to automatic foreign key and index naming. 2011-03-05 10:08:30 +01:00
Benjamin Eberlei
67ae22b911 DDC-1034 - Fix bug where callbacks where registered multiple times in inheritance hierachies. 2011-03-04 23:00:54 +01:00
Benjamin Eberlei
49195ebe17 [DDC-1041] You could retrieve instances of the wrong type in inheritance hierachies because the identity map aggregates them by rootEntityName. 2011-03-03 23:11:09 +01:00
Benjamin Eberlei
b2c7a9c7fc [DDC-1050] Throw exception when trying to define inheritance information on a mapped superclass. It is not a valid use-case. 2011-03-03 22:51:53 +01:00
Benjamin Eberlei
c144df9be3 DDC-1033 - Fix cloning of not initialized proxies. 2011-02-26 12:47:59 +01:00
Benjamin Eberlei
1eb7f92956 DDC-1026 - Fix Result Cache Seperate chaining implementation that was wrong since DDC-892 was applied. 2011-02-26 00:39:54 +01:00
Guilherme Blanco
834203d868 [DDC-1012] Implemented Expr isNull and isNotNull. 2011-02-20 01:53:55 -03:00
Guilherme Blanco
505d9e2154 [DDC-1036] Modified the AggregateExpressions to support SimpleArithmeticExpression instead of StateFieldPathExpression. 2011-02-20 01:44:05 -03:00
Guilherme Blanco
dcf358f154 Fixed some warnings from phpunit. 2011-02-19 19:50:58 -02:00
Guilherme Blanco
2b2d9e7a1d Fixed wrong test. It was failing if you have memcache extension loaded. 2011-02-19 17:20:37 -02:00
Jonathan H. Wage
839b6dd5e4 Revert "Removing old Driver interface in favor of the new one in Common\Persistence. Also changed to use fully qualified class name for interfaces in common to avoid weird aliases." 
This reverts commit c988a99d55.
 2011-02-16 10:24:42 -06:00
Jonathan H. Wage
c988a99d55 Removing old Driver interface in favor of the new one in Common\Persistence. Also changed to use fully qualified class name for interfaces in common to avoid weird aliases. 2011-02-16 10:06:39 -06:00
Benjamin Eberlei
9768d08458 [DDC-250] Add tests and fix some glitches and finalized index-by patch. 2011-02-05 11:42:10 +01:00
Benjamin Eberlei
61e2cdc6b0 [DDC-1018] Bugfix: INDEX BY was not working in JOIN Declarations, only in FROM. 2011-02-05 10:04:18 +01:00
Benjamin Eberlei
4122abf558 DDC-1008, DDC-1002 - Create constructor and id setter if necessary. 2011-02-02 23:30:16 +01:00
Benjamin Eberlei
f9c1464879 DDC-1006, DDC-953 - Fix EntityGenerator creating empty classes 2011-02-02 23:21:42 +01:00
Benjamin Eberlei
05f41278a6 Significantly updated the Help of the ConvertMapping and GenerateEntities Commands to help people using and understanding their scope. Added an additional --force flag to ConvertMapping command. 2011-01-23 20:25:59 +01:00
Benjamin Eberlei
ed53f8aa74 DDC-958 - Fire postLoad event when calling refresh(). 2011-01-23 17:26:11 +01:00
Benjamin Eberlei
f1809ce180 DDC-968 - Add AbstractQuery::getHints() method 2011-01-23 16:47:07 +01:00
Benjamin Eberlei
65bbdc30de DDC-978 - Fix bug where Collection gets cleared (again) when calling flush multiple times and replacing a PersistentCollection with a new one. 2011-01-23 15:40:16 +01:00
Benjamin Eberlei
fd44894e9a DDC-996 - Throw more useful exception if fieldName is empty in a mapped field or association. 2011-01-23 14:20:15 +01:00
Benjamin Eberlei
5d333045b9 DDC-960 - Bugfix in how Persisters generate Fetch last version of Entity SQL. 2011-01-23 12:48:28 +01:00
Benjamin Eberlei
078e19d1c7 DDC-980 - Fix Update and Delete statements reference of the root table when doing subselects. 2011-01-13 21:16:08 +01:00
Benjamin Eberlei
247fc43cef DDC-546 - Rename ClassMetadataInfo::FETCH_EXTRALAZY to ClassMetadataInfo::FETCH_EXTRA_LAZY 2011-01-02 15:10:47 +01:00
Benjamin Eberlei
3acc05d953 DDC-546 - Fix bug in inverse many-to-many contains. 2011-01-02 13:37:29 +01:00
Benjamin Eberlei
685e327b43 DDC-546 - Fix some rebasing issues. 2011-01-02 12:54:55 +01:00
Benjamin Eberlei
75d59d8695 DDC-546 - Added functionality for extra-lazy PersistentCollection::contains(). 2011-01-02 12:46:08 +01:00
Benjamin Eberlei
7c567b305a Refactor DDC-546 persister approach. 2011-01-02 12:46:08 +01:00
Benjamin Eberlei
c998797c55 DDC-546 - Add Extra Lazy Collection prototype. 2011-01-02 12:44:16 +01:00
Benjamin Eberlei
78d4277e4b Merge branch DDC-117 into master 2011-01-02 12:01:05 +01:00
Benjamin Eberlei
c1edd5848f DDC-966 - Fix NOT NULL constraint SingleTableInheritance Generation using SchemaTool. 2011-01-02 10:18:02 +01:00
Benjamin Eberlei
a2cc9f0f6d DDC-949 - Bugfix for BasicEntityPersister not using $types for select clauses. This fixes the issue for PostgreSQL however it still occurs on Oracle. DBAL change is necessary for this. 2011-01-02 09:38:32 +01:00
Benjamin Eberlei
194a90923d DDC-117 - Finalize patch, fix all the problems of different use-cases by hugely expanding the test-model. 2011-01-01 18:17:19 +01:00
Benjamin Eberlei
7112b551e2 DDC-945 - Fix regression, ManyToMany unidirectional owning side assocations should be allowed. 2010-12-31 14:39:01 +01:00
Benjamin Eberlei
58019fbac0 DDC-961 - Bugfix with missing first letter in automatic join table names in global namespace entities. 2010-12-30 22:30:51 +01:00
Benjamin Eberlei
2d27a99a0b DDC-117 - Began to fix some issues surrounding the DDC-881 report and references to composite fk entities. 2010-12-29 01:02:21 +01:00
Benjamin Eberlei
337e2fa043 Fix DDC-795 (subtask of DDC-117) and integrated a test for cascade (that only works with sequence id generators). 2010-12-28 19:05:46 +01:00
Benjamin Eberlei
e7b4dca611 Merge master into DDC-117 2010-12-28 17:27:47 +01:00
Benjamin Eberlei
2d89ddfb1f DDC-837 - Fix bug with associations of the same name not being possible in inheritance hierachies. 2010-12-28 14:56:13 +01:00
Benjamin Eberlei
aa6ac3d6b0 DDC-945 - Throw exception in ClassMetadataFactory when mapped superclass has to many associations. 2010-12-28 11:59:51 +01:00
Benjamin Eberlei
fe672d2f61 DDC-617 - Throw error if selecting identification variables without picking at least one root entity alias. 2010-12-28 10:17:33 +01:00
Benjamin Eberlei
e46c65db09 Fix for DDC-944 2010-12-22 00:23:22 +01:00
Benjamin Eberlei
22ffbe7488 Fix tests so that PostgreSQL does not fail anymore on certain test. 2010-12-21 22:33:23 +01:00
Benjamin Eberlei
d87391e40c DDC-933 - Fix bug in lock sql generation of CTI classes. 2010-12-14 23:26:40 +01:00
Benjamin Eberlei
6c26af069c DDC-920 - Fix bug in DetachedEntityTest that occours with pre-persist generators (Postgresql, Oracle). Didnt came up when testing against Sqlite. 2010-12-12 15:43:12 +01:00
Benjamin Eberlei
4f154b6aa1 DDC-920 - Fix bug when detaching a managed entity that is not yet in the identity map (no id). 2010-12-10 21:55:48 +01:00
Benjamin Eberlei
06326918a5 DDC-915, DDC-925 - Fix Identification Ordering in combination with Tree Walkers. 2010-12-10 21:22:48 +01:00
Benjamin Eberlei
aa2501eb96 DDC-917 - Bugfix with DriverChain::getAllClassNames() - It was not semantically correct and returning too many metadata. 2010-12-08 23:29:21 +01:00
Benjamin Eberlei
c6a6aaf493 DDC-899 - Add method to check if EntityManager is still open. 2010-12-03 17:44:24 +01:00
Benjamin Eberlei
8e4197adc5 DDC-909 - Fix Result Cache with entities as parameters. 2010-12-03 17:34:56 +01:00
Benjamin Eberlei
dff5dae416 DDC-897 - Make ClassMetadataFactory configurable. 2010-11-27 20:53:26 +01:00
Benjamin Eberlei
e4f74d8290 DDC-886 - Bugfix for composite identifier flag not being mapped to child classes in inheritence/mapped superclass scenarios. 2010-11-27 17:38:12 +01:00
Benjamin Eberlei
e142bd1f30 Merge and modify juokazs Sqlsrv changes 2010-11-18 23:14:07 +01:00
Benjamin Eberlei
97b80d69f1 Fix several test-issues after upgrading dependencies and a Bug in a SchemaTool and DatabaseDriver 2010-11-18 23:07:32 +01:00
Juozas Kaziukenas
831b40e093 Fixes required for Microsoft SQL tests 2010-11-17 13:18:18 -08:00
Benjamin Eberlei
ae76b2ab8d DDC-853, DDC-629 - Fix drop schema always dropping everything at the cost of potential failures when dropping due to foreign keys. Added a full-database drop mode that resembles the old behavior. 2010-11-16 21:31:54 +01:00
Benjamin Eberlei
85a579febc DDC-867 - Deep clone of the QueryBuilder nested expression objects 2010-11-15 21:32:38 +01:00
Benjamin Eberlei
e62fb0b48e DDC-849 - Test verifies all different behaviors, clear contains, remove contains and clear count to be correct. 2010-11-15 19:03:09 +01:00
Benjamin Eberlei
d3d3032759 DDC-736 - Simplified patch and extended test to verify scalar results are still in order. 2010-11-13 09:52:35 +01:00
Benjamin Eberlei
e4280cf82e DDC-736 - Fix ordering of identification variables in DQL parser to be by specification. 2010-11-11 21:12:09 +01:00
Benjamin Eberlei
ac85584e9b DDC-870 - Fix several bugs with optimistic locking, conversion of types, multiple updating of values and inheritance related stuff. 2010-11-09 23:15:14 +01:00
Roman S. Borschel
4f71c3e6a3 [DDC-812] Fix uninitialized collections of managed entities not being initialized on subsequent fetch-join. 2010-10-31 11:07:26 +01:00
Benjamin Eberlei
9211bc2f4e DDC-832 - Fix regression in testsuite due to SchemaTool not being able to handle reserved word table names. 2010-10-31 09:20:33 +01:00
Benjamin Eberlei
692c35e7e2 DDC-826, DDC-841, DDC-671 - Added another testcase to verify mapped superclass + association dql alias generation 2010-10-31 08:13:59 +01:00
Benjamin Eberlei
23795605fc DDC-758 - Fix bugs with adding and removing elements from a cascade merge Collection. This fix leads to a significant hit in merge performance of collections since they have to be initialized to the current database state, leading to an additional sql query being executed + hydration. 2010-10-31 07:06:53 +01:00
Benjamin Eberlei
515ef33665 Fix quoting in BasicEntityPersister::_updateTable and BasicEntityPersister::delete. Added 6 tests for quoting of table names in different update, delete and inheritance scenario combinations 2010-10-30 19:33:20 +02:00
Benjamin Eberlei
bf79168952 Added Testcase to verify failure 2010-10-30 08:43:15 +02:00
Benjamin Eberlei
0a8ff7a030 Fix Testsuite to run with PHPUnit 3.5 2010-10-29 16:46:21 +02:00
Benjamin Eberlei
35860d9a94 Fix for DDC-839: Fetch joined collections are not initialized correctly. 2010-10-29 13:14:35 +02:00
Benjamin Eberlei
89d0a52c4f DDC-833 - Fix some nasty bug occouring when re-creating an entity that was a proxy before. Also found another nasty issue with refreshing entity that had an already loaded many-to-many or one-to-many association. 2010-10-11 22:15:18 +02:00
Benjamin Eberlei
07016f6da5 DDC-834 - Commit fix for requesting references of classes that have subclasses. This is not possible, so we do an eager find instead. Yes this means there is yet another negative performance impact when using Inheritance STI and CTI. 2010-10-11 20:11:23 +02:00
Benjamin Eberlei
638c3df3a6 DDC-822 - Fix making queries with detached entities 2010-09-30 21:59:01 +02:00
Benjamin Eberlei
3ad429a5aa Fix bug in OrmFunctionalTestCase in combination with vendors that dont deferr foreign key checks (like MySQL) 2010-09-28 22:36:26 +02:00
Benjamin Eberlei
394469d4b7 DDC-525 - Single Table Inheritance fields of child entities ALWAYS have to be nullable, Schema-Tool now enforces this. 2010-09-27 23:22:52 +02:00
Benjamin Eberlei
140ddf5098 DDC-817 - Add possibility to query by owning side association join column ids and tests for plain entities, single- and joined table inheritance 2010-09-27 22:31:18 +02:00
Benjamin Eberlei
d2630ff54e DDC-819 - Fix bug with invalid parameter exception because of using isset instead of array_key_exists() 2010-09-27 21:03:12 +02:00
Benjamin Eberlei
8f80c94923 DDC-514 - Implemented default for discriminator column 2010-09-23 23:10:31 +02:00
Benjamin Eberlei
01ffa2dc9e DDC-573 - Implement resetDQLPart() and resetDQLParts() methods on QueryBuilder. 2010-09-23 22:32:23 +02:00
Benjamin Eberlei
75e5c40a50 DDC-742 - More tests on the issue about possible caching problem, could not verify however 2010-09-22 23:01:08 +02:00
Benjamin Eberlei
6390653df7 Merge branch 'DDC-671' 2010-09-22 00:19:37 +02:00
Benjamin Eberlei
13047aa12e Fixed Mappedsuperclass Functional Test to work with new modelset and verify that relevant features work 2010-09-22 00:15:45 +02:00
Benjamin Eberlei
39f732ab91 Refactored DDC-671 model to become a first-class modelset, we dont have one with mapped superclass yet. 2010-09-21 23:53:26 +02:00
Benjamin Eberlei
7dc8ef1db9 Fix DDC-671 - The sourceEntity field has to be corrected to the subclass name when copied from a mapped superclass. Otherwise DQL queries will be wrong, generating wrong table aliases. 2010-09-21 23:14:45 +02:00
Benjamin Eberlei
c70f32f4c9 DDC-809 - Fix nasty issue in ObjectHydrator yielding Many-To-Many hydration problems with multi-valued collections that are join-fetched. 2010-09-21 00:32:07 +02:00
Benjamin Eberlei
72f65c3665 Some changes to the TestCase 2010-09-20 19:23:41 +02:00
Benjamin Eberlei
8a92bf075b DDC-671 - Fetch YamlMappingDriverTest from Shurakais remote branch 2010-09-16 22:27:04 +02:00
Benjamin Eberlei
d3419780f9 DDC-727 - Test shows expected behavior, no failure 2010-09-15 22:24:17 +02:00
Benjamin Eberlei
810a129a32 DDC-767 - Add testcase that shows described behavior works and not produces notices. 2010-09-15 22:11:09 +02:00
Benjamin Eberlei
97e572e2d8 DDC-806 - Fix xsd schema not allowing entities without id (in inheritance hierachies) 2010-09-15 21:51:44 +02:00
Benjamin Eberlei
da63bad9c8 DDC-762 - Fixed notice when mapping foreign keys to field having null values 2010-09-13 21:48:25 +02:00
Benjamin Eberlei
ee9158ffb4 DDC-749 - Refactor Query tests, add a test for setParameters() 2010-09-12 22:44:02 +02:00
Benjamin Eberlei
13da816f4e DDC-748 - Fix bug in EntityManager::refresh() when entity has an owning side many-to-one bi-directional association 2010-09-12 21:41:22 +02:00
Roman S. Borschel
207d624f5f Bumped Common dependency to RC1, fixing related issues in the test suite. 2010-09-01 20:43:23 +02:00
Benjamin Eberlei
0b5c694a7e DDC-778 - Fix AbstractQuery::__clone implementation that was wrongly implemented in DDC-770. Added more tests. 2010-08-30 20:30:11 +02:00
beberlei
0904bc5cc5 DDC-762 - Added test for NULL association finding in OneToOne relations 2010-08-29 11:19:23 +02:00
beberlei
c77a12ac83 DDC-770 - Refactored EntityGenerator Bugfix NOT to generate a use statement. Simplifies code and circumvents further problems (like importing a class from the namespace we are in) 2010-08-28 16:29:08 +02:00
Benjamin Eberlei
5bd8ffa53c Merge master into DDC-117 2010-08-27 22:27:00 +02:00
Benjamin Eberlei
d115f7af4f DDC-752 - Postpone Inheritance Related Metadata Validation into CMF 2010-08-27 22:14:48 +02:00
Benjamin Eberlei
797d9f1be5 Merge branch 'master' of github.com:doctrine/doctrine2 2010-08-27 21:28:46 +02:00
Benjamin Eberlei
8a21ab4755 DDC-770 - Cleanup Query instance when its cloned 2010-08-27 21:28:26 +02:00
Roman S. Borschel
506973a92e [DDC-757] Fixed. Also fixed some failing postgres tests due to changes to the default allocation size for sequences. 2010-08-26 13:47:37 +02:00
Jonathan H. Wage
aa5826b69a Symfony/Components renamed into Symfony/Component 2010-08-23 12:44:15 -05:00
Sébastien HOUZE
4a9f36800e Symfony/Components renamed into Symfony/Component 2010-08-23 12:39:30 -05:00
Benjamin Eberlei
1496250833 Merge branch 'master' into DDC-117 2010-08-15 20:17:56 +02:00
Benjamin Eberlei
2f00db08e1 Merge branch 'master' of github.com:doctrine/doctrine2 2010-08-15 20:16:28 +02:00
Benjamin Eberlei
6f4f8f8cb1 DDC-742 - Fix issue with collections that are set to fetch=EAGER not being initialized with takeSnapshot() correctly 2010-08-15 19:51:06 +02:00
Benjamin Eberlei
772e592489 Try Assoc-Id Mapping with Id that has its column renamed. 2010-08-15 19:15:34 +02:00
Benjamin Eberlei
fb44fa6b5a Fix hydration of Assoc-Id Entities, duplicate the hydration of the foreign key once for for use with the assoc-entity as a meta-column. Added isIdentifier capabilities to meta columns. 2010-08-15 18:58:25 +02:00
Benjamin Eberlei
5799e391c6 Fix bug with updating assoc-id entities 2010-08-15 14:40:06 +02:00
Benjamin Eberlei
e45c52b024 Merge Removal of association classes into DDC-117 branch, quite some merge efforts necessary to get it working again 2010-08-13 23:23:11 +02:00
Guilherme Blanco
496a34a4d2 [DDC-581] Implemented support to SingleValuedPathExpression to InExpression. 2010-08-12 00:16:07 -03:00
Guilherme Blanco
c3064336ab Merge branch 'master' of github.com:doctrine/doctrine2 2010-08-11 23:13:03 -03:00
Guilherme Blanco
84b9eda17c [DDC-680] Implemented support to complex mathematical expression in subselect part aswell as improved support of comparison expressions. 2010-08-11 23:12:44 -03:00
Benjamin Eberlei
98785122d3 DDC-562 - Finally able to generate Unique Constraint on @OneToOne foreign keys 2010-08-10 22:07:43 +02:00
Benjamin Eberlei
a812dab4d4 DDC-729 Add more tests for merging with many to many relations 2010-08-09 23:02:44 +02:00
Roman S. Borschel
dd7be5b13a Improving API and docblocks. Removing superfluous tests. 2010-08-09 22:48:07 +02:00
Roman S. Borschel
8d3e0e61ea Moved association mappings to plain arrays, just like field mappings. 2010-08-09 22:48:07 +02:00
Benjamin Eberlei
db936035e0 Added more tests for DQL joining the primary key entity and querying other fields 2010-08-08 19:46:45 +02:00
Benjamin Eberlei
8ea1d3825f DDC-735 - Fix PersistentCollection::remove() and PersistentCollection::removeElement() behaving differently with regards to orphan removal 2010-08-08 17:13:03 +02:00
Benjamin Eberlei
37a1a35b75 Merge branch 'DDC-729' 2010-08-08 16:08:43 +02:00
Benjamin Eberlei
a705b81d9b DDC-729 - Fix issue with merging of collections leading to dereference behaviour after next flush(). Added a test for dereferencing of collections as there was none 2010-08-08 16:07:40 +02:00
Roman S. Borschel
0424d87099 [DDC-386][DDC-675] Fixed. 2010-08-08 15:03:40 +02:00
Benjamin Eberlei
dcebc241b4 DDC-728 - Verified with test that checking for an inherited single valued association works 2010-08-08 14:23:57 +02:00
Benjamin Eberlei
7b07a17886 Merge branch 'master' into DDC-117 2010-08-08 14:07:24 +02:00
Roman S. Borschel
3630e06b84 [DDC-522][DDC-419][DDC-383] Fixed. 2010-08-08 12:40:32 +02:00
Benjamin Eberlei
69e9fd3145 DDC-704 - Added better validation of inheritence type constructs in Xml, Annotation and Yaml Drivers 2010-08-08 12:29:14 +02:00
Benjamin Eberlei
251247c16f DDC-633 - Fix Eager ManyToOne or OneToOne relations being replaced by a proxy instead. 2010-08-08 11:05:30 +02:00
Benjamin Eberlei
e3a4c8ddeb Refactored TestCase and added several more use-cases 2010-08-08 10:46:01 +02:00
Benjamin Eberlei
013262a9b7 Add support for EntityManager::remove() of full or partial association primary keys 2010-08-07 21:09:19 +02:00
Benjamin Eberlei
10f47389ae Made single identifier One-To-One + Id work also and added a test-case 2010-08-07 20:07:10 +02:00
Benjamin Eberlei
c697a2d47f Prototype hack of @ManyToOne + @Id support with two test-scenarios, composite association key only composite key, and a mixed key scenario. I think single foreign association would work also 2010-08-07 19:33:54 +02:00
Guilherme Blanco
35af98260a [DDC-719] Fixed issue with Empty and also Size function that were generating an incorrect SQL for associations counting. 2010-08-06 13:01:06 -03:00
Roman S. Borschel
69073c4b37 Fixes for merging bidirectional associations where both sides define cascade=merge as well as fixes for handling null values and proxies properly in single-valued associations. 2010-07-30 17:19:50 +02:00
Roman S. Borschel
954a8c3935 Updated tests. 2010-07-30 17:19:50 +02:00
Guilherme Blanco
e69c7c7c60 Merge branch 'DDC-722' 2010-07-30 01:30:40 -03:00
Guilherme Blanco
c1fec32f58 [2.0][DDC-482] Added support to INSTANCE OF in DQL. 2010-07-30 01:30:02 -03:00
Benjamin Eberlei
af59a581f0 Fix DDC440Test to comply with Oracle Identifier-Name Restrictions 2010-07-29 00:10:23 +02:00
Benjamin Eberlei
5bebf13d58 Bugfix in Test Models that made Oracle tests fail for illegal identifier name 2010-07-29 00:02:42 +02:00
Benjamin Eberlei
104dd7aa77 Fix bug in testsuite that makes oci8 testsuite fail 2010-07-28 23:36:52 +02:00
Benjamin Eberlei
d6a1075b53 DDC-644 - Added more tests for Hydrators and unknown to be skipped columns 2010-07-28 22:09:43 +02:00
Benjamin Eberlei
56b3c0e8b0 DDC-644 - Added missing code for the _getScalarRowData() 2010-07-28 21:57:05 +02:00
Benjamin Eberlei
553e93ae27 DDC-644 - Fixed issue with undefined columns in ResultSetMapping by skipping them, added a functional test for modified limit query functionality 2010-07-28 21:50:25 +02:00
Guilherme Blanco
ad115f0ac8 [DDC-698] Fixed wrong SQL generation of m2m with starting path on inverse side. 2010-07-26 01:13:03 -03:00
Guilherme Blanco
5f109c5d6c Merge branch 'DDC-619' 2010-07-23 01:56:38 -03:00
Guilherme Blanco
d50b3c42e2 [DDC-619] Removed support to complex PathExpressions. 2010-07-23 01:55:33 -03:00
Benjamin Eberlei
c2ee1d2439 DDC-697 - QueryBuilder did not support passing parameter types to the setParameter() or setParameters() methods. 2010-07-21 23:16:45 +02:00
Benjamin Eberlei
6007084324 DDC-706 - Fix DriverChain::isTransient() to comply with interface of Driver 2010-07-21 21:20:55 +02:00
Roman S. Borschel
913e58e385 [DDC-167] Implemented. 2010-07-20 14:27:14 +02:00
Guilherme Blanco
2c28872af8 [2.0][DDC-614] Added support to multiple FROM identification variables. Also, fixed bug with missing lock on subselect. 2010-07-20 00:51:01 -03:00
Roman S. Borschel
d86c2f6709 Prepared some more DQL tests. 2010-07-15 15:55:45 +02:00
Roman S. Borschel
e7ac35ed95 [DDC-119] Fixed. 2010-07-15 15:55:45 +02:00
Benjamin Eberlei
722d4a38f4 DDC-130 - fixed a bug in TestCases 2010-07-10 14:04:32 +02:00
Benjamin Eberlei
ede6205204 DDC-130 - Make self-referential relationsships work by deleting both the owning and the inverse pair of keys 2010-07-10 13:35:58 +02:00
Benjamin Eberlei
b0e4d06c40 DDC-130 - Refactored deleteJoinTableRecords() even more, simplified approach disfavouring evil legacy database schemas 2010-07-10 13:12:33 +02:00
Benjamin Eberlei
1794127d51 DDC-130 - Refactored deleteJoinTableRecords() support 2010-07-10 12:04:02 +02:00
beberlei
233b3cd0b9 DDC-130 - Add initial version of deleteJoinTableRecords code on the persisters, flanked by 4 tests. 2010-07-09 22:55:30 +02:00
Roman S. Borschel
aa6edb7903 Added another little contains() after find() test. 2010-07-09 13:18:53 +02:00
Roman S. Borschel
a1c13b58d3 Fixed behavior of PersistentCollection#clear(). Fixed single-valued association path expression support in DQL UpdateItems. 2010-07-08 17:30:39 +02:00
Roman S. Borschel
4212b88edc Fixed DDC-455, DDC-600. Some behavior and API polish in the UoW as well as continued _ prefix removal in some core classes. Cleanups and fixes for one-to-one orphan removal including tests. 2010-07-08 00:20:54 +02:00
Christian Heinrich
9b03a1ecdd Added testcase for #DDC-671 2010-07-06 20:19:43 +02:00
Roman S. Borschel
88b0813536 Improved entity state detection. 2010-07-06 11:43:14 +02:00
Benjamin Eberlei
26d8b4dafd Added test to verify DDC-635 is not a problem 2010-07-04 16:19:28 +02:00
Benjamin Eberlei
552865a867 DDC-649 - Remove IN queries for empty discriminator values if abstract base class is not part of the discriminator map 2010-07-04 13:34:41 +02:00
Benjamin Eberlei
fdf1f1b29e Fix testsuite by re-ordering how tests are executed, added debug capabilities for SQL Global State problems using SQL Comments when DOCTRINE_MARK_SQL_LOGS phpunit configuration variable isset 2010-07-04 13:34:40 +02:00
Benjamin Eberlei
d922631efe DDC-649 - Refactoring Single Table Inheritance Tests 2010-07-04 12:17:15 +02:00
beberlei
b56e1e31af DDC656 - Fix bug with order of fields when recomputeSingleEntityChangeSet() is called after lifecycle events are invoked 2010-07-04 08:54:57 +02:00
Benjamin Eberlei
fbaa4e3215 DDC-555 - Fixed toggling of collections when using Collection::clear() in a PersistentCollection context 2010-07-03 16:55:56 +02:00
Benjamin Eberlei
6479fcec68 DDC-501 - Cleanup Ticket Test file a little bit 2010-07-01 23:58:46 +02:00
beberlei
f7e8109d07 DDC-501 - Cascade Merging unitialized Persistent Collections leads to weird behaviour 2010-07-01 23:48:44 +02:00
beberlei
6ba4fa002b DDC-660 - Fix notIn() not quoting passed literals correctly. 2010-07-01 21:42:38 +02:00
Benjamin Eberlei
c1091485b0 DDC-618 - Bugfix INDEX BY was not yet implemented in SqlWalker 2010-06-29 00:06:19 +02:00
Christian Heinrich
321fc2506d Fixed #DDC-647 
Added missing length element

DBAL-647 - Added test to check for length of string type in all mapping drivers
 2010-06-28 23:05:49 +02:00
Benjamin Eberlei
cd978fb8c9 DDC-616 Made Database Reverse Engineering a Two-Step Approach, first collect details on all tables once and try to detect which tables are many-to-many tables. Then build metadata from this information. This allows to support even many-to-many tables in reverse engineering correctly 2010-06-20 19:34:09 +02:00
Benjamin Eberlei
51e6681934 DDC-646 - Bugfix with missing inclusion of Namespace, added test for ConvertDoctrine1SchemaCommand 2010-06-20 00:28:20 +02:00
Jonathan H. Wage
d27733f690 [DDC-613] Fixing issue with using function expressions in select not being allowed 2010-06-16 11:55:22 -04:00
Jonathan H. Wage
20c1ff3146 [DDC-642] Fixes issue with exporters not including inversedBy functionality 2010-06-16 11:47:22 -04:00
Jonathan H. Wage
e6f465ec80 [DDC-641] Fixing issue with XmlExporter cascade options 2010-06-16 11:19:26 -04:00
Benjamin Eberlei
8639735e91 Adding more Tests for DateTime, Date and Time type handling, related to DBAL-22. Failures in Oracle Time Type handling have to fixed in DBAL package. 2010-06-14 23:46:04 +02:00
Benjamin Eberlei
7018509126 Fix a bug with Table Indexes on XML Driver. Added tests for setting indexes on tables for all the mapping drivers 2010-06-13 22:59:56 +02:00
Benjamin Eberlei
b7db8df7ef Fixed DDC-627 and DDC-616 2010-06-13 19:36:49 +02:00
Benjamin Eberlei
f2aacf44c8 DDC-628 - Fix missing precision and scale attributes on doctrine-mapping.xsd 2010-06-13 17:21:14 +02:00
Roman S. Borschel
d6cb87a0ac [DDC-604] Fixed. 2010-06-07 13:57:43 +02:00
Roman S. Borschel
a90ad24cca Fixed order in testcase. 2010-06-07 13:02:29 +02:00
Roman S. Borschel
37b4652639 [DDC-599] Fixed. 2010-06-07 00:31:59 +02:00
Roman S. Borschel
4a9369de9e Fixed incorrect transaction management in locking tests. 2010-06-07 00:15:38 +02:00
Benjamin Eberlei
35e49aaf9f Fixed a fatal error in DatabasePlatformMock when linking ORM against latest DBAL, added a phpunit configuration.xml to change dependencies for tests 2010-06-06 22:41:05 +02:00
Jonathan H. Wage
bf9f7f85af Tweaking the method names of the recently added feature which allows custom hydration modes. 2010-06-03 14:11:31 -04:00
Jonathan H. Wage
5b148c7b20 [DDC-161] Adding ability to use custom hydrators with queries. 2010-06-02 23:25:09 -04:00
Jonathan H. Wage
f54dce93aa Fixing failing test introduced in last commit. 2010-05-25 18:22:42 -04:00
David Abdemoulaie
ece0e3ad88 Third parameter to Expr::substring is now optional 2010-05-25 15:11:35 -05:00
David Abdemoulaie
b6a5402bcb Query\Expr::_quoteLiteral properly quotes numeric strings 2010-05-25 13:41:02 -05:00
Jonathan H. Wage
2db8ad30a9 Fixing DatabaseDriverTest fails for mysql. 2010-05-25 13:35:12 -04:00
Jonathan H. Wage
4f8fc24226 Fixing TestInit to work with submodules. 2010-05-25 11:42:09 -04:00
beberlei
e4c7fa961e Removed Common and DBAL tests from repository, they are now in their respective projects 
Removed Common and DBAL tests from repository, they are now in their respective projects
 2010-05-23 19:19:48 +02:00
Roman S. Borschel
616f2eda0a [DDC-531] Fixed. 2010-05-21 11:49:05 +02:00
Roman S. Borschel
a45560dbd0 [DDC-505] Fixed and small lexer simplifcations that were marked as todo. 2010-05-18 22:19:08 +02:00
Roman S. Borschel
3cbee1fa09 Merge commit 'upstream/master' 2010-05-16 13:30:48 +02:00
Roman S. Borschel
3045507a9b [DDC-593] Fixed. 2010-05-16 13:30:40 +02:00
Benjamin Eberlei
ba6cb6bd14 Fixed nasty bug with Proxies not getting initialized correctly. 2010-05-15 21:32:34 +02:00
Benjamin Eberlei
46684ea5c9 Added a bunch of functional tests for the public read, write and transactional public DBAL API, passing all the current drivers 
Added a Write Test
 2010-05-15 19:54:56 +02:00
Benjamin Eberlei
78328ec6ea DDC-178 - Removed Doctrine\ORM\LockMode in favour of Doctrine\DBAL\LockMode 2010-05-15 11:48:20 +02:00
Benjamin Eberlei
8a67621b6a DDC-178 - Fixed problems occuring from merging upstream, re-ran API and tests, finalizing lock-support for merge with upstream 2010-05-15 09:58:39 +02:00
Benjamin Eberlei
64b57bbcfb Merge upstream into lock-support branch 2010-05-15 09:41:32 +02:00
David Abdemoulaie
668456e4d8 [DDC-588] EntityManager::refresh uses fieldName instead of columnName 2010-05-14 22:10:13 +02:00
Roman S. Borschel
8174f67a69 Fixed DataAccessTest to be included in AllTests. 2010-05-14 20:38:35 +02:00
Roman S. Borschel
ad9d678701 Removing API docs from repo, now that we have them online. Merged fetchRow fix from hobodave. 2010-05-14 20:33:42 +02:00
Roman S. Borschel
5dbd40563c Added control abstractions for transaction demarcation. 2010-05-13 13:19:59 +02:00
Benjamin Eberlei
d00f674a08 DDC-515 - Enhanced Validate-Schema-Command, integrated it with CLI and besides mapping<->database checks also do consistency checks of the mapping files 2010-05-11 23:08:36 +02:00
Christian Heinrich
f2213c4d00 Fixed #DDC-578 
Also added a new testcase
 2010-05-11 11:19:38 +02:00
Roman S. Borschel
f619a15a63 Removed EntityTransaction until it has a real purpose. Added the affected entity to OptimisticLockException. Updated functional optimistic locking tests accordingly. 2010-05-10 23:51:56 +02:00
Guilherme Blanco
d0325d7048 Merged with upstream/master 2010-05-08 12:42:06 -03:00
Roman S. Borschel
59d4e0c8e7 [DDC-481] Fixed. 2010-05-08 17:01:20 +02:00
Christian Heinrich
dc3844e167 Fixed #DDC-571 2010-05-08 14:29:43 +02:00
Roman S. Borschel
ee04b31da3 Included new PostgreSQL IDENTITY/SERIAL test in functional suite. 2010-05-08 14:20:44 +02:00
Roman S. Borschel
561236bd56 [DDC-576] Fixed. 2010-05-08 14:08:18 +02:00
Roman S. Borschel
8d52967fcd Polished QueryBuilder API documentation and added another test. 2010-05-07 13:36:25 +02:00
Guilherme Blanco
b12b8b0041 Revertd partially the support to DBAL\Transaction, it was wrong. Fixed implementation of ORM\EntityTransaction and fixed tests. 2010-05-06 18:39:19 -03:00
Benjamin Eberlei
c3303881a9 Fixed IBM DB2 Platform to support locking 2010-05-02 13:18:47 +02:00
Benjamin Eberlei
b8402c9563 Added Gearman Lock Test and Worker, verified lockings indeed works on MySQL, PostgreSQL and Oracle 2010-05-02 13:04:25 +02:00
Benjamin Eberlei
f65a555d04 Merge Upstream into Locking-Branch 2010-05-02 13:02:44 +02:00
Guilherme Blanco
4ab5dffc4c Fixed UnitOfWork and isRollbackOnly flag. 2010-05-01 11:49:14 -03:00
Roman S. Borschel
a9d88146f1 Merge commit 'upstream/master' 2010-05-01 16:06:16 +02:00
Benjamin Eberlei
302409dba4 Fixed Error due to merging tests/Doctrine/Tests/TestInit.php file 2010-05-01 13:51:29 +02:00
Roman S. Borschel
3899888a0c Merge commit 'upstream/master' 2010-05-01 12:17:03 +02:00
Roman S. Borschel
080f737338 [DDC-534] Fixed. 2010-05-01 12:14:16 +02:00
Benjamin Eberlei
604ed962e5 Merged Master into IBM DB2 branch 2010-05-01 04:07:32 +02:00
Benjamin Eberlei
427d4eed29 DDC-541 - Schema Table now return Pk, then Fk, then normal columns in that order 2010-05-01 03:57:58 +02:00
Benjamin Eberlei
6c7aaa727c Added tests for 41e830ca68, thereby finding two issues with XML and YAML Driver handling of Sequence-Generator 2010-05-01 03:28:18 +02:00
Benjamin Eberlei
9cee8bf890 Merge remote branch 'dc2master/master' 2010-05-01 03:12:27 +02:00
Roman S. Borschel
db2be55e27 [DDC-561] Fixed. 2010-04-30 17:30:27 +02:00
Guilherme Blanco
6705d9b9cc Introduced the concept of DBAL\Transaction and ORM\EntityTransaction. 2010-04-29 22:46:51 -03:00
Guilherme Blanco
50f3435e84 Optimized Query AST resultant of the parsing process phase 1 2010-04-29 22:15:36 -03:00
Benjamin Eberlei
f38584a51e DDC-545 - Add unittest for all drivers uniqueConstraint capabilities, fix bug in XML Driver that disallowed using them 2010-04-28 20:27:53 +02:00
Roman S. Borschel
8396e72a2c Fixed casing. 2010-04-26 14:25:23 +02:00
Jonathan H. Wage
6bda2b44fe Renaming PhpDriver to PHPDriver 2010-04-26 14:12:36 +02:00
Roman S. Borschel
d1d1cecc06 Restored missing files. 2010-04-26 14:12:20 +02:00
Roman S. Borschel
bff4f49b7a Merge commit 'upstream/master' 
Conflicts:
	lib/Doctrine/Common/Annotations/AnnotationReader.php
	lib/Doctrine/Common/Annotations/Parser.php
 2010-04-26 13:17:36 +02:00
Roman S. Borschel
b505a27370 Renamed StandardEntityPersister to BasicEntityPersister 2010-04-26 13:12:46 +02:00
Roman S. Borschel
760ea34a0c [DDC-497][DDC-500][DDC-342] Fixed. Persister polishing and refactoring. More to come for that, but after beta1. 2010-04-26 13:02:30 +02:00
Jonathan H. Wage
27a0058b89 Initial entry of StaticPHPDriver 2010-04-23 16:16:16 -04:00
Jonathan H. Wage
6d29f05d3a Renaming PhpDriver to PHPDriver 2010-04-23 14:37:29 -04:00
Guilherme Blanco
7006f4dd74 Merge commit 'upstream/master' 2010-04-22 11:35:18 -03:00
Guilherme Blanco
5ecca4f5e0 [2.0][DDC-524] Fixed issue with UPDATE/DELETE statements generating wrong SQL when using Association Paths. 2010-04-22 11:32:01 -03:00
Benjamin Eberlei
c763b47626 Merge commit 'dc2master/master' into lock-support 2010-04-21 20:30:41 +02:00