Benjamin Eberlei
|
d7da292f60
|
Merge remote branch 'origin/master'
|
2011-07-09 14:43:04 +02:00 |
|
Benjamin Eberlei
|
689eaf3172
|
Merge branch 'DDC-1022'
|
2011-07-09 12:12:56 +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 |
|
Guilherme Blanco
|
9d1a647753
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-07-08 16:27:20 -03:00 |
|
Guilherme Blanco
|
b6bd46dbed
|
General fix for end point as file extension on Annotation driver.
|
2011-07-08 16:26:54 -03:00 |
|
Benjamin Eberlei
|
9a68074878
|
Clarify possible problem
|
2011-07-08 14:42:15 +02:00 |
|
Benjamin Eberlei
|
ac76dafe62
|
Add doccomments, refactor into listener and dump method to allow re-use
|
2011-07-08 14:32:12 +02:00 |
|
Benjamin Eberlei
|
ef663c83f3
|
DDC-1258 - Add Debug UnitOfWork Listener
|
2011-07-08 14:27:59 +02:00 |
|
Benjamin Eberlei
|
024b7b7cb6
|
Bump Dev Version to 2.2.0-DEV
|
2011-07-04 21:34:59 +00:00 |
|
Benjamin Eberlei
|
dfdb735306
|
Release 2.1.0
|
2011-07-04 21:34:47 +00:00 |
|
Benjamin Eberlei
|
cb49648eed
|
Bump Common and DBAL to 2.1
|
2011-07-04 21:33:36 +00:00 |
|
Guilherme Blanco
|
438dd9141f
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-07-04 11:38:45 -03:00 |
|
Guilherme Blanco
|
db37d974c8
|
Increasing visibility of AnnotationReader inside AnnotationDriver from private to protected.
|
2011-07-04 11:33:44 -03:00 |
|
Benjamin Eberlei
|
6b54cceed7
|
Moved AnnotationRegistry::registerFile() call to Configuration#newDefaultAnnotationDriver() and documented the migration in UPGRADE_TO_2_1
|
2011-07-03 12:21:04 +02:00 |
|
Benjamin Eberlei
|
73f908f25c
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-07-03 12:07:40 +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
|
ffca455788
|
Bump Dev Version to 2.1.0RC4-DEV
|
2011-07-02 20:29:02 +00:00 |
|
Benjamin Eberlei
|
e4f2a56277
|
Release 2.1.0RC3
|
2011-07-02 20:28:37 +00:00 |
|
Benjamin Eberlei
|
cbe14a694a
|
Update Common dependency to 2.1 RC3
|
2011-07-02 20:28:04 +00:00 |
|
Benjamin Eberlei
|
f589cd0d9f
|
Update common version
|
2011-07-02 20:30:35 +02:00 |
|
Benjamin Eberlei
|
43d8466fa9
|
Update annotation handling in AnnotationDriver to work with AnnotationRegistry and bump common dependency
|
2011-07-02 19:48:43 +02:00 |
|
Benjamin Eberlei
|
5299bd788f
|
DDC-1239 - Fix missing AND in Eager LEFT JOIN of entity persister when multiple join columns are used
|
2011-06-30 21:04:46 +02: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 |
|
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 |
|