Guilherme Blanco
1579c43433
Code beautification and docblocks enhancements.
2011-10-28 12:49:01 -02:00
Guilherme Blanco
c5ef21864f
Fixed bug with fetch=EAGER associations that have already been hydrated during querying.
2011-10-26 15:04:49 -02:00
Benjamin Eberlei
cfe7ab46f2
Merge branch 'master' of git://github.com/doctrine/doctrine2
2011-10-25 22:55:08 +02:00
Benjamin Eberlei
3b9312e291
Bump DBAL version and make TestUtil more lenient
2011-10-25 22:54:20 +02:00
Benjamin Eberlei
a02b0c9269
Merge pull request #165 from armetiz/patch-3
...
Update lib/Doctrine/ORM/Query/Expr/Base.php
2011-10-24 03:42:04 -07:00
Benjamin Eberlei
0cdf1e042c
Merge pull request #173 from jaikdean/master
...
Fixed a couple of typos of 'discriminator'
2011-10-24 03:41:19 -07:00
Jaik Dean
cdb452b27b
Fixed typos of 'discriminator'
2011-10-24 10:01:27 +01:00
Benjamin Eberlei
993d6f5ac8
Merge pull request #171 from asm89/fix-mysql-tests
...
Fix mysql testsuite
2011-10-23 13:12:09 -07:00
Alexander
80c9690926
Fix mysql testsuite
2011-10-23 22:06:03 +02:00
Benjamin Eberlei
d9740e2028
Merge pull request #170 from asm89/fix-tests
...
Fix testsuite
2011-10-23 12:39:00 -07:00
Alexander
f1df4ffca4
Fix testsuite
2011-10-23 21:37:29 +02:00
Benjamin Eberlei
9b8d2d512b
Merge pull request #168 from dfreudenberger/master
...
postFlush event implementation
2011-10-23 01:12:27 -07:00
Benjamin Eberlei
fd00f2d371
Merge pull request #166 from doctrine/DDC-720
...
DDC-720 - Add support to flush only one entity through EntityManager#flush()
2011-10-23 01:07:14 -07:00
Benjamin Eberlei
5d3298e706
DDC-720 - Correct mentioned issues by @asm89
2011-10-23 10:05:46 +02:00
Daniel Freudenberger
fa8000fa5c
dispatch the event after the snapshot was taken
2011-10-23 01:27:09 +02:00
Daniel Freudenberger
5e28273548
fixed typo in docblock
2011-10-22 18:57:48 +02:00
Daniel Freudenberger
46a3fecb4f
added the postFlush event
2011-10-22 18:38:51 +02:00
Benjamin Eberlei
b910a487c5
DDC-720 - Wait, we should really test it only changes the passed entity.
2011-10-22 14:31:23 +02:00
Benjamin Eberlei
f569a2a389
DDC-720 - Add support to flush only one entity (within cascade rules) through EntityManager#flush()
2011-10-22 13:44:33 +02:00
Benjamin Eberlei
23560038b4
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-22 10:37:32 +02:00
armetiz
baef4f735f
Update lib/Doctrine/ORM/Query/Expr/Base.php
2011-10-21 16:30:06 +03:00
Benjamin Eberlei
01f1924a89
Merge pull request #163 from armetiz/patch-2
...
Update lib/Doctrine/ORM/Query/Expr.php
2011-10-21 05:18:01 -07:00
armetiz
4a50eb4fa7
Update lib/Doctrine/ORM/Query/Expr.php
2011-10-21 11:55:54 +03:00
Benjamin Eberlei
ca01065c6a
Bugfix in short identifier shortcut with association ids
2011-10-19 11:58:59 +02:00
Benjamin Eberlei
7345c795ac
Merge pull request #154 from Partugal/master
...
Fix isTransient call on uninitialized ClassMetadataFactory
2011-10-19 00:04:14 -07:00
Benjamin Eberlei
753f75cfb9
Merge pull request #156 from goetas/xmlassoc
...
Set association-key attribute in xml mapping
2011-10-19 00:03:55 -07:00
Asmir Mustafic
0d57ffbc3b
Set association-key attribute in xml mapping
2011-10-18 15:48:56 +02:00
Sergey Linnik
c3ec6e383c
Fix isTransient call on uninitialized ClassMetadataFactory
2011-10-18 01:14:07 +04:00
Benjamin Eberlei
0b1f6e3539
Merge pull request #153 from asm89/shesek-patch-1
...
Support NULL in EntityRepository's magic findBy and findOneBy methods
2011-10-17 12:05:07 -07:00
Alexander
b8af241504
Added a testcase for findBy(.. => null) and renamed 'old' testcase
2011-10-17 20:53:04 +02:00
Alexander
91bc9c0329
Adjusted test to verify that findBy*(null) is now supported
2011-10-17 18:56:06 +02:00
Alexander
fea855004c
Merge remote-tracking branch 'doctrine/master' into shesek-patch-1
2011-10-17 18:55:48 +02:00
Guilherme Blanco
83a8ed01e7
Merge pull request #94 from kwiateusz/findByOnePatch
...
Now findByOne really retrieve only one entity adding limit to query.
2011-10-17 06:24:37 -07:00
Benjamin Eberlei
2b663ff2bc
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-16 22:47:28 +02:00
Benjamin Eberlei
1a602a8cb3
Merge branch 'DDC-1278'
2011-10-16 22:45:50 +02:00
Benjamin Eberlei
939fbf9c24
DDC-1278 - Clean up event handling of new clear functionality.
2011-10-16 22:45:06 +02:00
Benjamin Eberlei
22a04fd6de
Merge dominikl/DDC-1278 into doctrine/DDC-1278
2011-10-16 22:41:16 +02:00
Benjamin Eberlei
ba5e73213b
Merge pull request #150 from stof/initialize_object
...
Added the initializeObject method in the EntityManager
2011-10-16 08:04:46 -07:00
Christophe Coevoet
a8e6131e3b
Added the initializeObject method in the EntityManager
2011-10-16 17:00:33 +02:00
Benjamin Eberlei
fc738455b6
Merge branch 'DDC-1358'
2011-10-16 11:17:04 +02:00
Benjamin Eberlei
0252d55c67
DDC-1358 - Fix bug where multiple NULL root entity combined with scalar results will break the object and array hydrator.
...
This case likeli only occurs when doing native queries. A guard clause that prevents hydration from breaking
when RIGHT JOIN queries with null root entities appear has been added aswell.
2011-10-16 11:15:45 +02:00
Guilherme Blanco
eeba947ea7
Code optimizations. Fixed unused argument in OrmTestCase as referred in DDC-766.
2011-10-16 02:10:59 -02:00
Guilherme Blanco
33bcf7ad6f
Added coverage to DDC-1161.
2011-10-16 01:42:36 -02:00
Benjamin Eberlei
4474d305cb
DDC-1210 - Optimize UnitOfWork collection handling internally.
2011-10-15 21:47:16 +02:00
Benjamin Eberlei
7c244abc1c
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-15 21:09:36 +02:00
Benjamin Eberlei
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
Benjamin Eberlei
7e571212a7
Merge pull request #109 from alOneh/patch-1
...
Remove trailing spaces
2011-10-15 11:39:56 -07:00
Benjamin Eberlei
75e1d17d18
Merge branch 'ValidateJoinColumnsMatching'
2011-10-15 20:33:46 +02:00
Benjamin Eberlei
a82bffbfc9
Make SchemaValidator catch errors such as very invalid schema using only part of the primary key for join columns
2011-10-15 20:31:56 +02:00
