Alexander
22b3b46b61
Removed unnecessary spaces in generated SQL
2011-10-31 22:08:40 +01:00
Alexander
3994b80aa4
Fix TODO: Inner join when all join columns are NOT nullable.
2011-10-31 21:36:55 +01: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
Jaik Dean
cdb452b27b
Fixed typos of 'discriminator'
2011-10-24 10:01:27 +01:00
Benjamin Eberlei
9b8d2d512b
Merge pull request #168 from dfreudenberger/master
...
postFlush event implementation
2011-10-23 01:12:27 -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
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
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
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
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
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
Christophe Coevoet
a8e6131e3b
Added the initializeObject method in the EntityManager
2011-10-16 17:00:33 +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
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
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
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
18fd29613c
Merge pull request #137 from docteurklein/fluent_query_expr
...
added fluent pattern to Query\Expr\Base::add* methods
2011-10-15 11:09:37 -07:00
Benjamin Eberlei
1f59001ff7
Merge pull request #130 from bmichotte/master
...
Fluent entity (master)
2011-10-15 11:01:19 -07:00
lenar
3dc30dee11
use the correct targetEntity
2011-10-15 20:00:02 +02:00
lenar
cab154b873
identifier referencing foreign entity can be defined in parent class too
2011-10-15 19:59:50 +02:00
Benjamin Eberlei
7f5844c209
Merge pull request #147 from asm89/assignid
...
Goetas: Better error handling on missing assigned id
2011-10-15 10:41:27 -07:00
Alexander
c5e51e6fa9
Merge branch 'master' into assignid
2011-10-15 19:33:42 +02:00
Alexander
fdb9fb1c2b
AssignedGenerator can always tell what field is missing an id
2011-10-15 19:33:29 +02:00
Benjamin Eberlei
b6c49863e8
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-15 19:14:53 +02:00
Benjamin Eberlei
08716d9f72
DDC-1383 - Proxy Generation in merge was flawed with inheritance
2011-10-15 19:14:30 +02:00
Benjamin Eberlei
73101be422
Merge pull request #143 from craue/patch-2
...
added missing type hint
2011-10-15 10:05:53 -07:00
Benjamin Eberlei
6f3667201c
Add @ignore and @internal to UnitOfWork#computeChangeSet
2011-10-15 18:11:14 +02:00
Benjamin Eberlei
52cea01563
DDC-1411 - Fixed onDelete handling in EntityGenerator
2011-10-15 17:53:04 +02:00
Benjamin Eberlei
cb21f3c5ff
DDC-1414 - Missing push to $newNodes
2011-10-15 17:47: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
e38076c19a
DDC-1421 - Fix potential bug and code-smells
2011-10-15 16:57:57 +02:00
Benjamin Eberlei
dd6f6cb097
Fix notice
2011-10-15 16:03:50 +02:00