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
Alexander
8d1b852aa2
Added tests for not loading the entity + fixed a test
2011-10-15 17:31: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
84dbb08502
Merge branch 'DDC-1421'
2011-10-15 16:58:05 +02:00
Benjamin Eberlei
e38076c19a
DDC-1421 - Fix potential bug and code-smells
2011-10-15 16:57:57 +02:00
Benjamin Eberlei
3b46df68ea
Adjust README.markdown
2011-10-15 16:36:20 +02:00
Benjamin Eberlei
dd6f6cb097
Fix notice
2011-10-15 16:03:50 +02:00
Benjamin Eberlei
640facd26a
Remove unncessary line
2011-10-15 15:51:11 +02:00
Benjamin Eberlei
291d2fd624
UPGRADE_TO_2_2
2011-10-15 15:49:41 +02:00
Benjamin Eberlei
9ece0fe3c9
Merge branch 'DDC-1386'
2011-10-15 15:45:59 +02:00
Benjamin Eberlei
3801e0c230
Add way to keep track of read only objects in the UnitOfWork which are never updated during flush.
...
Changed the behavior of EntityManager#getPartialReference to be read-only. No changes are ever
done to this entities. Changed UnitOfWork#computeChangeSet to never create a changeset for
fields that are partially omitted from a DQL or NativeQuery.
To check if an entity is read only use the new API:
if ($entityManager->getUnitOfWork()->isReadOnly($entity))
2011-10-15 15:42:02 +02:00
Benjamin Eberlei
2166a21511
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-15 11:36:53 +02:00
Benjamin Eberlei
894bbb020c
DDC-1394 - Enhance test to verify
2011-10-15 09:57:35 +02:00
Guilherme Blanco
772b413579
Fixed bug with boolean values being converted to string.
2011-10-15 00:23:55 -03:00
Guilherme Blanco
2518f0687c
Removed invalid default argument.
2011-10-15 00:21:11 -03:00
Guilherme Blanco
f86e1ba66c
Added tests for DDC-1389. Everything is working in 2.2-DEV.
2011-10-15 00:18:57 -03:00
Benjamin Eberlei
4a920d0aad
Merge branch 'DDC-1418'
2011-10-13 23:40:11 +02:00
Fabien Potencier
6a72ba5f97
DDC-1418 - Add simplified XML and YAML drivers ported from the Symfony project, thanks Fabien
2011-10-13 23:39:11 +02:00
Benjamin Eberlei
92b16455c8
Merge branch 'DDC-1415'
2011-10-13 22:58:58 +02:00
Benjamin Eberlei
a36a1624fb
[DDC-1415] Add EntityEventDelegatee, allowing to restrict emitting events to certain entity classes only.
2011-10-13 22:58:22 +02:00
Benjamin Eberlei
97a6caf059
Update Common to latest to have the current Persistence Interface
2011-10-11 13:22:26 +02:00