Benjamin Eberlei
|
5362206297
|
Revert "Fixed ClassMetadataFactory which was throwing an exception if parent class on inheritance hierarchy is an abstract class and also extends from a mapped superclass (so it contains an inheritance already), but is not in the discriminatorMap."
This reverts commit 4603e94fe9 .
Making an exception go away is not a fix for something. :)
|
2011-06-30 20:12:22 +02:00 |
|
Benjamin Eberlei
|
e32e141012
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-06-30 20:10:05 +02:00 |
|
Guilherme Blanco
|
4603e94fe9
|
Fixed ClassMetadataFactory which was throwing an exception if parent class on inheritance hierarchy is an abstract class and also extends from a mapped superclass (so it contains an inheritance already), but is not in the discriminatorMap.
|
2011-06-30 15:04:57 -03:00 |
|
Benjamin Eberlei
|
8b7e2a9f32
|
Merge pull request #81 from schmittjoh/annotation
added @Annotation to annotations
|
2011-06-30 08:02:08 -07:00 |
|
Johannes Schmitt
|
5701036068
|
added @Annotation to annotations
|
2011-06-30 11:03:32 +02:00 |
|
Guilherme Blanco
|
0f68355ce0
|
Merge pull request #80 from pkruithof/patch-2
Changed order of elements
|
2011-06-29 06:09:36 -07:00 |
|
Peter Kruithof
|
9395eeed3d
|
Changed order of elements
|
2011-06-29 03:15:05 -07:00 |
|
Benjamin Eberlei
|
6d035be3e3
|
Bump Dev Version to 2.1.0-DEV
|
2011-06-28 21:11:14 +00:00 |
|
Benjamin Eberlei
|
01935e6661
|
Release 2.1.0RC2
|
2011-06-28 21:11:02 +00:00 |
|
Benjamin Eberlei
|
379584fb26
|
Bump dependencies of Common and DBAL to 2.1.0RC2
|
2011-06-28 21:10:43 +00:00 |
|
Benjamin Eberlei
|
f1c073e080
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-06-28 22:30:24 +02:00 |
|
Benjamin Eberlei
|
66e92b147d
|
Minor spelling mistake, thanks Alexandre Mathieu for reporting
|
2011-06-28 22:30:17 +02:00 |
|
Benjamin Eberlei
|
53c799987d
|
Merge pull request #78 from mweimerskirch/patch-1
Removed superfluous variable name in "@return" documentation
|
2011-06-28 12:49:37 -07:00 |
|
Benjamin Eberlei
|
8850efb0eb
|
Merge branch 'DDC-1230'
|
2011-06-28 21:38:06 +02: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 |
|
Michel Weimerskirch
|
e899205300
|
Removed superfluous variable name in "@return" documentation
|
2011-06-28 12:24:24 -07:00 |
|
Benjamin Eberlei
|
5afc097527
|
Bump DBAL dependency to latest master
|
2011-06-26 19:06:52 +02:00 |
|
Benjamin Eberlei
|
ed516edf90
|
Fix discriminator casing problem in Oracle
|
2011-06-26 17:49:34 +02:00 |
|
Benjamin Eberlei
|
52431251cb
|
Fix some of the problems with Oracle testsuite
|
2011-06-26 17:20:03 +02:00 |
|
Benjamin Eberlei
|
69944017d2
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-06-26 10:11:29 +02:00 |
|
Benjamin Eberlei
|
ca0bea1d8a
|
Merge branch 'DDC-1224'
|
2011-06-26 10:11:11 +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 |
|
Guilherme Blanco
|
ebe95af30c
|
Merge pull request #77 from rubensayshi/master
Fixed wrong keyname
|
2011-06-25 08:30:30 -07:00 |
|
Ruben de Vries
|
a607e2ec7a
|
fixed wrong keyname
|
2011-06-25 17:08:56 +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
|
0dd1dc20c8
|
DDC-1227 - Fix regression in QueryBuilder::add() due to Expr\From refactoring.
|
2011-06-25 10:25:22 +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
|
a5cddb0c11
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-06-20 21:26:33 +02:00 |
|
Benjamin Eberlei
|
3717ae3c53
|
strtolower() on cascade information avoids problem with case-sensitivity in YAML and annotations mapping driver.
|
2011-06-20 21:26:12 +02:00 |
|
Guilherme Blanco
|
2caf0fff60
|
Merge pull request #75 from joshiausdemwald/DatabaseDriver_Corrections
Suppressed an "undefined variable" notice by adding initialization code
|
2011-06-20 10:24:37 -07:00 |
|
Johannes Heinen
|
c05fffcc93
|
Suppressed php undefined variable notice adding initialization code to Doctrine\ORM\Mapping\Driver\DatabaseDriver.php
|
2011-06-20 19:07:03 +02:00 |
|
Benjamin Eberlei
|
fff0204e6d
|
Merge branch 'DDC-1211'
|
2011-06-19 10:25:42 +02:00 |
|
Benjamin Eberlei
|
c7c430032c
|
DDC-1211 - Fix bug with empty numeric literal
|
2011-06-19 10:17:35 +02:00 |
|
Benjamin Eberlei
|
1c2ade61ab
|
DDC-1214 - Fix UpdateCommand::getFullName()
|
2011-06-19 10:05:30 +02:00 |
|
Benjamin Eberlei
|
c62e27898c
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-06-19 09:42:45 +02:00 |
|
Benjamin Eberlei
|
6f8ac21273
|
Merge branch 'DDC-1189'
|
2011-06-19 09:40:38 +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
|
197744a57f
|
Bump Dev Version to 2.1.0RC2-DEV
|
2011-06-18 22:08:52 +00:00 |
|
Benjamin Eberlei
|
054ac220ac
|
Release 2.1.0RC1
|
2011-06-18 22:08:37 +00:00 |
|
Benjamin Eberlei
|
c6746d4a4a
|
Merge 2.0.x build.xml changes into master build.xml
|
2011-06-18 22:07:14 +00:00 |
|
Benjamin Eberlei
|
f0bc3d925d
|
Bump dependencies of Common and DBAL to 2.1.0RC1
|
2011-06-18 22:02:40 +00:00 |
|
Benjamin Eberlei
|
7810f5fe69
|
Add convenience helper for running tests against multiple different databases
|
2011-06-18 23:23:43 +02:00 |
|
Benjamin Eberlei
|
decd1482de
|
Fix bug in ChangeTrackingNotify code
|
2011-06-18 23:06:07 +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
|
1aa90dc872
|
Add UPGRADE note about annotations parser changes
|
2011-06-18 21:25:29 +02:00 |
|