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,354 Commits 5 Branches 0 Tags 32 MiB
c7c430032c
Commit Graph

705 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Benjamin Eberlei
b7cac8c310 Fixed pecl/ibm_db2 Driver and Connection to run smoothly against the complete test-suite (depending on a c-patch to the extension though) 2010-04-20 23:20:42 +02:00
Roman S. Borschel
4b71afe7c2 Improving metadata caching performance by only serializing what is absolutely necessary. 2010-04-18 22:47:03 +02:00
Benjamin Eberlei
024b2bab91 DDC-496 Finished first versions of platform and schema manager for DB2, DDC-528 Added support for PDO_IBM driver, passing all but 3 tests that are related to CLOB fields 2010-04-18 19:12:38 +02:00
Roman S. Borschel
01c2c06bbf [DDC-512] Fixed. 2010-04-15 18:36:17 +02:00
Roman S. Borschel
e83bfeede3 Simplified and streamlined configuration classes. 2010-04-15 11:55:03 +02:00
Guilherme Blanco
26ff265652 [2.0][DDC-431] Added coverage, fixing the ticket. 2010-04-14 23:27:33 -03:00
Guilherme Blanco
c4ffd04da0 [2.0][DDC-430] Added coverage, fixing the ticket. 2010-04-14 22:49:53 -03:00
Guilherme Blanco
d045c6f6c1 Merge commit 'upstream/master' 2010-04-14 21:35:10 -03:00
Roman S. Borschel
f3c672a2e5 Merged from upstream/master. 2010-04-14 17:21:15 +02:00
Roman S. Borschel
d4232d906e [DDC-388] Fixed. 2010-04-14 17:07:08 +02:00
Jonathan H. Wage
d656566791 Merge remote branch 'upstream/master' 2010-04-14 10:32:11 -04:00
Jonathan H. Wage
ceb05e85ef Removing ClassMetadataReader 2010-04-14 10:31:50 -04:00
Roman S. Borschel
7fefe3f4b4 Merge commit 'upstream/master' 2010-04-14 10:50:37 +02:00
Guilherme Blanco
889094709e [2.0] Added support to IdentificationVariable that was missing in ArithmeticPrimary (it was not correctly handling it). Uncommented a unit test that added coverage to it. 2010-04-14 00:04:44 -03:00
Guilherme Blanco
f3d91b9ea9 [2.0] Fixed E_NOTICE being throwing when ->getSingleScalarResult() is called and no result is found. Added coverage for this and also for multiple result (NonUniqueResultException). 2010-04-13 22:06:01 -03:00
Jonathan H. Wage
12c9ca971b Merge remote branch 'origin/master' 2010-04-13 14:14:02 -04:00
Jonathan H. Wage
afc4d82793 Fixing typo in tests xml mapping file 2010-04-13 14:13:15 -04:00
Guilherme Blanco
dd2dd80281 [2.0][DDC-493] Added coverage to DDC-493 and optimized DDC-513 unit tests. Previous commit fixed the issue. 2010-04-13 00:40:45 -03:00
Guilherme Blanco
56a8f5cd53 [2.0][DDC-448][DDC-513] Fixed issue with Joined Inheritance Type and One To One Associations. 2010-04-13 00:29:29 -03:00
Roman S. Borschel
6d08164162 Merge commit 'upstream/master' 2010-04-13 00:50:12 +02:00
Roman S. Borschel
db603547a2 Added failing test for DDC-388. Naming refactorings and comment cleanups. 2010-04-13 00:49:19 +02:00
Benjamin Eberlei
dfbd9e6e2f DDC-178 - Add additional tests for Locking Support 2010-04-11 16:43:33 +02:00
Benjamin Eberlei
6e5b1bbe60 DDC-510 - Refactored Metadata Driver to be an required option, even for Annotations - allowing to use the specified paths in ORM Tooling Commands 2010-04-10 17:35:18 +02:00
Benjamin Eberlei
4a1c3785ec Merge commit 'dc2master/master' into lock-support 2010-04-10 10:12:35 +02:00
Roman S. Borschel
7cc56c45d3 [DDC-193] Fixed. 2010-04-10 00:00:36 +02:00
Benjamin Eberlei
e6a44b145f [DDC-178] First approach to Locking support 2010-04-08 22:50:06 +02:00
Benjamin Eberlei
324b3ee426 Fix Testsuite to work with Git 2010-04-07 20:47:36 +02:00
Benjamin Eberlei
36b3e180a8 Fix Testsuite to work with Git 2010-04-07 20:35:33 +02:00
beberlei
95994f7a44 [2.0] DDC-341 - Added Composite Model-Set and 3 tests, fixed two bugs in SqlWalker with Composite Key support 2010-04-02 21:37:15 +00:00
beberlei
5b10b7098f [2.0] DDC-484 - Fix reference to Doctrine\ORM\ORMException in ProxyException, added two unit-tests for missing tests of ProxyException throws 2010-04-02 15:05:53 +00:00
guilhermeblanco
c9de54b4a2 [2.0] Changed Connection::execute() to Connection::executeQuery() as defined as a todo. 2010-03-31 21:13:34 +00:00
guilhermeblanco
b0963d91c7 [2.0][DDC-274] Moved Sql to SQL loggers. Also implemented some todos. 2010-03-31 20:47:35 +00:00
guilhermeblanco
511bf2248e [2.0] Fixed and added some missing/wrong docblocks. Renamed Assigned to AssignedGenerator as scheduled to be renamed. 2010-03-30 21:14:17 +00:00
romanb
354ede1e04 [2.0][DDC-354][DDC-425] Fixed. Encapsulated SQL logging better in the DBAL. Added binding types to DBAL mapping types as well as using these binding types in the persisters. Query and NativeQuery now support PDO binding types as well as DBAL mapping types when binding parameters. 2010-03-29 13:20:41 +00:00
beberlei
24d8e94280 [2.0] DDC-478 - Fix QueryBuilder Expr\Between Support 2010-03-28 10:30:43 +00:00
romanb
49621286a2 [2.0][DDC-479] Fixed. 2010-03-26 22:07:31 +00:00
jwage
0b68e9473d [2.0][DDC-449] Fixing issue with ClassMetadataReader and existing driver sources being added 2010-03-24 15:31:54 +00:00
guilhermeblanco
b175427043 [2.0][DDC-458] Fixed issue with IN () support when providing numeric values separated by comma without spaces. 2010-03-23 17:42:34 +00:00
beberlei
5018985807 [2.0] DDC-239 - Added several new mapping validations for duplicate association/field and or column name definitions, and in combination with the discriminator column name. 2010-03-20 19:23:13 +00:00