Benjamin Eberlei
dba8360166
Merge master into ImproveErrorMessages
2011-10-22 11:06:51 +02:00
Benjamin Eberlei
23560038b4
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-22 10:37:32 +02: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
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
46541755ca
Merge pull request #128 from alanbem/xml-schema-on-delete-fix
...
fixed wrong on-delete XML Schema mapping
2011-10-15 11:09:55 -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
d0383f93d0
Merge branch 'DDC-1383'
2011-10-15 19:14:40 +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
Alexander
d46352da01
Fixed tests + added dedicated tests for proxy loading and identifiers
2011-10-15 17:58:00 +02:00
Benjamin Eberlei
30149e48f9
Merge branch 'DDC-1411'
2011-10-15 17:53:11 +02:00
Benjamin Eberlei
52cea01563
DDC-1411 - Fixed onDelete handling in EntityGenerator
2011-10-15 17:53:04 +02:00
Benjamin Eberlei
f54cdf625e
Merge branch 'DDC-1414'
2011-10-15 17:47:17 +02:00
Benjamin Eberlei
cb21f3c5ff
DDC-1414 - Missing push to $newNodes
2011-10-15 17:47:09 +02:00
