Benjamin Eberlei
6136654dad
Release 2.2.0-BETA1
2011-12-20 22:39:27 +01:00
Fabio B. Silva
e45ebbac46
remove white spaces
2011-12-20 10:40:29 -02:00
Fabio B. Silva
24dc74a800
Fixed DDC-1539
2011-12-20 10:31:00 -02:00
Guilherme Blanco
f6eb83705a
Added coverage to DDC-1521. Small CS changes.
2011-12-20 00:05:14 -05:00
Vitali Yakavenka
4879c50c5d
Merge remote-tracking branch 'doctrine/master' into SupportCustomIdGenerators
2011-12-19 16:47:47 -08:00
Benjamin Eberlei
cd6131c9b8
Remove all trailing whitespaces
2011-12-19 22:56:19 +01:00
Fabio B. Silva
5c89d7ffcb
support for bit comparison
2011-12-19 16:24:16 -02:00
Benjamin Eberlei
b545525e13
Update ORM to Doctrine Common master
2011-12-19 18:03:53 +01:00
Benjamin Eberlei
bf32125bad
DDC-1545 - Fix issue with changing values from null to something new.
...
This issue was introduced by a side-effect in 2.1.3 with
d9f9228d95c5ab2a200b3e2d2b358c598267afb1. In this commit read-only
objects where prevented to be updated. This lead to an invalid check not
being performed in UnitOfWork#computeChangeSet which was present before
where an association that was null would be injected into the
originalEntityData using the UnitOfWork#setOriginalEntityProperty()
method in the AbstractHydrator.
This commit now explicitly sets this field to null using the same API so
that is present during UnitOfWork#computeChangeSet.
2011-12-19 17:55:19 +01:00
Benjamin Eberlei
a9035e1533
Merge remote-tracking branch 'origin/master'
2011-12-19 17:11:19 +01:00
Guilherme Blanco
68663fac4b
Fixed issue when one to one badly populated when containing null values. Fixed DDC-1548.
2011-12-19 10:55:29 -05:00
Benjamin Eberlei
b1b10042d2
Revert "Fixed issue with fetched association not being considered during changeSet calculation. Fixes DDC-1545."
...
This reverts commit a8478d5766
.
2011-12-19 16:31:26 +01:00
Benjamin Eberlei
40800bd3cd
DDC-1530 - Validate field types in SchemaValidator
2011-12-19 10:11:11 +01:00
Benjamin Eberlei
7f8f39168a
Merge pull request #227 from asm89/ddc-551-parameter-inference
...
[DDC-551] Add type inference to SQLFilter::setParameter() + cleaned tests
2011-12-19 00:47:58 -08:00
Alexander
bd07f8d3dd
[DDC-551] Add type inference to SQLFilter::setParameter() + cleaned tests
2011-12-19 08:43:42 +01:00
Guilherme Blanco
a8478d5766
Fixed issue with fetched association not being considered during changeSet calculation. Fixes DDC-1545.
2011-12-19 01:39:48 -05:00
Guilherme Blanco
f6d9344d89
Merge pull request #219 from FabioBatSilva/DDC-1468
...
Fixed DDC-1468
2011-12-18 19:20:33 -08:00
Alexander
de769c6c3c
[DDC-1505] joinColumn "nullable" should be handled true by default
2011-12-18 21:33:38 +01:00
Benjamin Eberlei
003d1410b0
Merge pull request #224 from doctrine/DDC-551
...
DDC-551 - Filter branch
2011-12-18 08:03:23 -08:00
Benjamin Eberlei
9cd8f85a8c
DDC-1456 - Disallow setting id generators on composite identifiers.
2011-12-18 00:32:35 +01:00
Benjamin Eberlei
072094f722
DDC-1368 - Fix tests
2011-12-17 23:38:39 +01:00
Benjamin Eberlei
170271fd72
DDC-1368 - Improve schema validator
2011-12-17 23:27:39 +01:00
Evan Coury
36a47e391c
DDC-1544 - Add unit test and assertions for ResolveTargetEntityListener
2011-12-17 15:00:05 -07:00
Benjamin Eberlei
267ce7df88
DDC-1544 - Add ResolveTargetEntityListener
2011-12-17 19:35:10 +01:00
Benjamin Eberlei
cfe1259400
DDC-1541 - Fix wrong references in ClassMetadataBuilder
2011-12-17 12:39:44 +01:00
Benjamin Eberlei
6015253064
DDC-1524 - Add validation and error messages for annotation named query code.
2011-12-17 12:35:22 +01:00
Benjamin Eberlei
98bd5cae64
Revert "Incorporated setAssociationTargetClass, which solves biggest problem of modular system in ZF. Any questions, pelase forward to @EvanDotPro."
...
This reverts commit cac9928f28
.
2011-12-17 11:36:23 +01:00
Guilherme Blanco
cac9928f28
Incorporated setAssociationTargetClass, which solves biggest problem of modular system in ZF. Any questions, pelase forward to @EvanDotPro.
2011-12-16 16:16:22 -05:00
Asmir Mustafic
289c186de5
orphanRemoval default is false
2011-12-16 16:16:52 +01:00
Benjamin Eberlei
5b5fb2b732
DDC-1514 - Fix complex self-referencing + proxy hydration problem.
2011-12-15 23:00:01 +01:00
Benjamin Eberlei
e8a47b3921
DDC-1519 - Fix bug in merging of entities that contain foreign identifiers
2011-12-15 20:49:25 +01:00
Fabio B. Silva
017a7d889f
Fixed DDC-1468
2011-12-15 17:12:01 -02:00
Guilherme Blanco
41a3d90a57
Merge pull request #214 from yethee/xml_driver
...
Fixed typo in the XmlDriver
2011-12-13 20:07:43 -08:00
Benjamin Eberlei
99e46a23c6
Bugfix in UnitOfWorklib/Doctrine/ORM/UnitOfWork.phptriggerEagerLoads()
2011-12-13 21:26:04 +01:00
Benjamin Eberlei
f7ede572e0
DDC-1415 - Remove EntityEventDelegatee, the API sucks and we need another approach.
2011-12-12 16:46:53 +01:00
Benjamin Eberlei
43ef8765fd
DDC-1527 - Port bugfix for master branch
2011-12-12 16:39:52 +01:00
Andrew Mackrodt
ef12a09ae0
Added remaining absolute namespace paths to phpdoc annotations - issue DDC-1025.
2011-12-11 21:56:27 +00:00
Andrew Mackrodt
2fdb55a878
Added absolute namespace paths to phpdoc annotations - issue DDC-1025.
2011-12-11 21:56:26 +00:00
Benjamin Eberlei
b6d776f75d
DDC-551 - rework walker filtering
2011-12-11 21:14:09 +01:00
Benjamin Eberlei
ad6130b02d
DDC-551 - Cleanup filters branch, especially inheritance related code and yoda conditions and some inconsistencies
2011-12-11 19:29:36 +01:00
Benjamin Eberlei
ca5dbb182a
DDC-551 - Make filters case-sensitive everywhere
2011-12-11 19:27:50 +01:00
Benjamin Eberlei
69b1eb5c64
DDC-551 - Fix locking mess with filters
2011-12-11 18:46:57 +01:00
Benjamin Eberlei
0f501114eb
Merge branch 'master' into DDC-551
2011-12-11 18:39:11 +01:00
Benjamin Eberlei
f7175c229e
DDC-551 - Fix some ugly yoda conditions and a wrong nesting.
2011-12-11 18:39:04 +01:00
Benjamin Eberlei
40d094fea2
DDC-1515 - Now the real bugfix
2011-12-11 17:08:58 +01:00
Benjamin Eberlei
57970499fd
Revert "DDC-1515 - Merge from 2.1.x"
...
This reverts commit bd0fb574e3
.
2011-12-11 16:11:16 +01:00
Benjamin Eberlei
bd0fb574e3
DDC-1515 - Merge from 2.1.x
2011-12-11 16:07:35 +01:00
Deni
2ce9246733
Fixed typo in the XmlDriver
2011-12-11 17:24:38 +04:00
Guilherme Blanco
954b5077e4
Fixed nesting recursion error in some situations. Complement to DDC-1276.
2011-12-09 10:59:53 -05:00
Guilherme Blanco
0febf06114
Made ClassMetadataBuilder support ClassMetadataInfo instead of ClassMetadata. Fixed DDC-1508.
2011-12-09 00:04:47 -05:00
Fabio B. Silva
8e50a31b98
trying remove whitespaces
2011-12-07 12:31:23 -02:00
Fabio B. Silva
c6a89c64f3
put return after comment
2011-12-07 12:16:27 -02:00
Fabio B. Silva
df19e68a86
Fixed DDC-1057
2011-12-07 11:23:15 -02:00
Alexander
5e91f0c1ca
[DDC-551] Update SQLWalker to reflect filter requirements for inheritance
2011-12-07 10:02:15 +01:00
Alexander
efe7a01482
[DDC-551] Fixed CS, comments by @stof
2011-12-05 23:00:52 +01:00
Alexander
f4663f4512
[DDC-551] Another batch of small refactorings
2011-12-05 22:19:54 +01:00
Alexander
e8d30068e2
[DDC-551] Various refactorings
2011-12-05 22:05:42 +01:00
Alexander
04635ad4ff
Merge remote-tracking branch 'upstream/master' into DDC-551
...
Conflicts:
lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
lib/Doctrine/ORM/Persisters/OneToManyPersister.php
2011-12-05 21:53:34 +01:00
Alexander
3b7d16c60f
[DDC-551] General cleanup of the code.
2011-12-05 21:14:31 +01:00
Fabio B. Silva
33c68df3ba
Fixed DDC-1170
2011-12-05 17:35:49 -02:00
Alexander
4c842974b4
[DDC-551] Add filters only on root entities in SingleTablePersister
2011-12-05 18:56:44 +01:00
Alexander
752b502326
[DDC-551] Add filters only on root entities in JoinedSubclassPersister
2011-12-05 18:26:56 +01:00
Alexander
e98c775f0d
Revert "[DDC-551] Initial support for filters in the JoinedSubclassPersister"
...
This reverts commit f6d5f0481e
.
2011-12-05 16:14:04 +01:00
Guilherme Blanco
0380d5ae58
Implemented multiple enhancements in InExpression support for DQL. Fixed DDC-1472 and DDC-1416.
2011-12-04 02:41:54 -05:00
Guilherme Blanco
a26990c3e8
DDC-1457: Fixed wrong docblock.
2011-12-04 02:14:47 -05:00
Guilherme Blanco
2f6b930a8d
Implemented missing support in CollectionMemberComparison. Removed old todo in ArrayHydrator. Finished implementation of IdentificationVariable in ArithmeticPrimary.
2011-12-03 15:19:21 -05:00
Guilherme Blanco
2642daa438
Fixed DDC-1236: GROUP BY now supports ResultVariable and IdentificationVariable. Composite PK is also supported. If you are willing to group by an aggregate function or a function itself, just place it in SELECT expression then refer to it in the GROUP BY clause. If you are not willing to have the function being part of your resultset, just mark the column as HIDDEN and you are done.
2011-12-01 23:52:35 -05:00
Benjamin Eberlei
619a31913a
DDC-1517 - Fix EntityRepository#find() and EntityManager#getReference() breaking on invalid or missing identifiers.
2011-12-01 21:18:39 +01:00
Guilherme Blanco
5e3e8b3957
More refactorings and optimizations.
2011-12-01 10:00:26 -05:00
Alexander
bf1cc29a2a
[DDC-551] Fixed some comments
2011-12-01 09:46:02 +01:00
Alexander
f6d5f0481e
[DDC-551] Initial support for filters in the JoinedSubclassPersister
...
Still some things to do.
2011-11-30 23:01:10 +01:00
Alexander
4c94a7ccc5
[DDC-551] Various minor fixes after merge and cleanup
2011-11-30 16:40:55 +01:00
Guilherme Blanco
5b73f1bd82
Improved code readability. Improved performance.
2011-11-30 09:57:54 -05:00
Vitali Yakavenka
353ba4dfd1
Remove trailing whitespaces and fix brace locations
2011-11-30 00:20:00 +03:00
Vitali Yakavenka
f13f44a2fc
Merge branch 'master' of git://github.com/doctrine/doctrine2 into SupportCustomIdGenerators
2011-11-29 23:42:01 +03:00
Guilherme Blanco
356f5874bf
Added support to removeElement remove items without initializing the PersistentCollection.
2011-11-29 11:29:17 -05:00
Guilherme Blanco
24f6b74427
Refactored UnitOfWork::createEntity, improving its performance.
2011-11-29 10:36:32 -05:00
Vitali Yakavenka
c92b78bc06
Cleanup formatting just a little
2011-11-29 00:48:08 +03:00
Vitali Yakavenka
b72d150d33
Rename custom-generator to custom-id-generator in XML mappint to match name in other mapping types
2011-11-28 23:36:23 +03:00
Vitali Yakavenka
a8787be0bf
Add missing files from last comming and newly required one after rebase
2011-11-28 23:31:06 +03:00
Vitali Yakavenka
84086915e4
Add support for custom ID generator in Yaml driver
2011-11-28 23:30:32 +03:00
Vitali Yakavenka
2b97f79bd3
Add support for custom ID generator in XML
2011-11-28 23:30:32 +03:00
Vitali Yakavenka
48b6356e53
Add support for GenerateValue(strategy='CUSTOM') in AnnotationDriver
2011-11-28 23:29:42 +03:00
Vitali
82daf651fb
Pass specified arguments to generator's constructor
2011-11-28 23:24:19 +03:00
Vitali
cd0915deb5
Introcude ClassMetadataInfo::GENERATOR_TYPE_CUSTOM for custom generators to follow current implementation
2011-11-28 23:24:18 +03:00
Vitali
ffc722a334
Allow loading of custom ID generator class by FQN in @GeneratedValue(type=)
2011-11-28 23:24:18 +03:00
Benjamin Eberlei
62ec98a9fc
Merge pull request #205 from Seldaek/psr0
...
PSR-0 compliance
2011-11-28 05:05:50 -08:00
Benjamin Eberlei
0c12d3ed5a
DDC-1512 - Make ClassMetadataFactory::isTransient() entity namespace aware.
2011-11-28 11:16:23 +01:00
Benjamin Eberlei
f2f32ca70f
DDC-1509 - Fix regression in doMerge() introduced with the DDC-1383 bugfix
2011-11-28 10:04:33 +01:00
Jordi Boggiano
b8ac2fb416
Add requires to new files for BC
2011-11-27 18:16:18 +01:00
Jordi Boggiano
10e74040af
PSR-0 compliance
2011-11-27 12:59:17 +01:00
Alexander
be48821e86
Merge remote-tracking branch 'origin/master' into DDC-551
...
Conflicts:
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
lib/Doctrine/ORM/Query.php
2011-11-23 22:43:42 +01:00
Guilherme Blanco
ef33454301
Reverted PR which broke suite. Issue is still valid, but it requires more investigation.
2011-11-23 08:40:47 -05:00
warezthebeef
b80ef58cab
Fixed array_flip breaking discriminator map SQL generation
2011-11-23 12:15:23 +13:00
Benjamin Eberlei
be4eb63c62
Merge branch 'DBAL-15'
2011-11-21 21:38:05 +01:00
jsor
16aa558292
Remove sql conversion from where clauses and update statements
2011-11-21 15:08:36 +01:00
Benjamin Eberlei
135e515e7f
DDC-1500 - Fix potential security problem in EntityRepository ORDER BY orientations
2011-11-21 15:04:46 +01:00
Jonathan Ingram
248c9bdeff
Fixed typo
2011-11-21 12:34:20 +11:00
Jan Sorgalla
4042bc53ce
Fix argument on wrong method call
2011-11-20 19:57:04 +01:00
Jan Sorgalla
841d12e9b6
Move check for conversion SQL to ClassMetadataInfo
2011-11-20 19:50:51 +01:00
Benjamin Eberlei
bda593a66d
DDC-1448 - Add support for ObjectManagerAware interface and PersistentObject in ORM
2011-11-19 13:06:24 +01:00
Benjamin Eberlei
53b3030aa2
Clarify EntityManager#transactional() docblock
2011-11-19 08:58:58 +01:00
Jan Sorgalla
6f35679911
Initial implementation of Doctrine\DBAL\Types\Type::convertToDatabaseValueSQL() and Doctrine\DBAL\Types\Type::convertToPHPValueSQL() integration
2011-11-19 00:35:29 +01:00
Benjamin Eberlei
f9a4dcb2d0
Remove code that could allow users of xml and yaml to define orphan removal on the wrong association sides.
2011-11-18 18:33:03 +01:00
Benjamin Eberlei
9e8a950f2e
DBAL-171 - Fix bug where params where resorted but types where not in DQL Query
2011-11-18 17:29:31 +01:00
Benjamin Eberlei
0d4e0626cf
Merge pull request #158 from goetas/cascade-all
...
Collapsed cascade elements, if cascade-all.
2011-11-18 06:49:40 -08:00
Benjamin Eberlei
ceadc95439
DDC-1496 - Fix bug with OneToMany collections having orphanRemoval=true and Collection#clear() being called.
2011-11-18 15:44:06 +01:00
Benjamin Eberlei
61e371cbdc
DDC-1069 - Fix error in docblocks of query builder
2011-11-18 14:43:47 +01:00
Asmir Mustafic
24432bd0ab
tabs
2011-11-18 11:00:20 +01:00
Asmir Mustafic
82a1626e82
Better generation of exported xml (valid with xsd)
2011-11-18 10:57:27 +01:00
Fabio B. Silva
aeb2ab132b
group by all fields when entity has foreign keys
2011-11-15 20:27:45 -02:00
Benjamin Eberlei
2d14be86f3
Merge pull request #192 from FabioBatSilva/DDC-1474
...
DDC-1474
2011-11-15 12:10:19 -08:00
Benjamin Eberlei
9916f34262
Merge pull request #191 from FabioBatSilva/DDC1430
...
DDC-1430
2011-11-15 11:07:30 -08:00
Benjamin Eberlei
a0ee72f264
Fix bug introduced in recent XmlDriver commit
2011-11-15 20:03:56 +01:00
Fabio B. Silva
3f8347a4d9
fixed DDC-1474
2011-11-15 17:00:19 -02:00
Guilherme Blanco
14f20c16bc
Changed the RSM to make is behavior as mixed if you alias an entity.
2011-11-15 15:14:57 -02:00
Fabio B. Silva
3dd5d14977
Fixed DDC-1430
2011-11-15 14:28:57 -02:00
Guilherme Blanco
77e076f1fd
Fixed DDC-1492.
2011-11-15 01:10:27 -02:00
Guilherme Blanco
45d95ad130
Fixed wrong indentation by my previous commit.
2011-11-15 01:09:48 -02:00
Benjamin Eberlei
9b32a2d87a
DDC-1452 - Fix missing fetched parameter in BasicEntityPersister
2011-11-14 23:37:02 +01:00
Benjamin Eberlei
34c94dbd94
DDC-1452 - Fixed bug with multiple fetch joins of the same "propery-path" of Class+field name combinations
2011-11-14 23:05:33 +01:00
Benjamin Eberlei
4c7e4296c9
Merge pull request #189 from FabioBatSilva/DDC-1404
...
DDC-1404
2011-11-14 10:32:31 -08:00
Fabio B. Silva
8af0f9d071
added support for Inherited Named Queries
2011-11-14 16:07:37 -02:00
Fabio B. Silva
0632b37492
fix default field type
2011-11-14 13:17:56 -02:00
Guilherme Blanco
81cc6d9da8
Implemented alias support for EntityResult. This addresses DDC-1096 and DDC-1424. Improved DQL Parser, SQL Walker and Hydrators in general. Performance is generally improved by a factor of 20%. There is still more to be done, like remove the isMixed in ResultSetMapping, mainly because this query - SELECT u AS user FROM User u -, it should return an array('user' => [User object]), while currently it doesn't due to this before mentioned 'bug' in RSM. Will open a separate ticket for this. Also, UnitOfWork and Hydrators share code that could be abstracted/improved.
2011-11-14 01:36:39 -02:00
Benjamin Eberlei
6b0cd7b604
Merge branch 'master' of github.com:doctrine/doctrine2
2011-11-13 17:17:06 +01:00
Benjamin Eberlei
4571e498b4
DDC-1477 - Adjust patch to really fix bug in Proxy generation
2011-11-13 17:16:43 +01:00
Benjamin Eberlei
4e10a95dca
Merge branch 'master' of https://github.com/thiagofesta/doctrine2 into thiagofesta-master
2011-11-13 17:05:23 +01:00
Benjamin Eberlei
e9068a1552
Merge pull request #175 from lsmith77/get_class_name
...
added EntityRepository::getClassName()
2011-11-13 07:57:58 -08:00
Benjamin Eberlei
64b649ef61
Merge pull request #160 from goetas/generation
...
Allow to unset one-to-one relation with generated class
2011-11-13 07:53:58 -08:00
Benjamin Eberlei
6520211df3
Merge everzet/PreFlush-event
2011-11-13 16:51:23 +01:00
Benjamin Eberlei
f7c46c7b33
DDC-1491 - Fix Schema Validator bug
2011-11-13 15:45:06 +01:00
Benjamin Eberlei
5aeabcb445
DDC-1490 - Fix id generation of sequence and identity to cast values to int
2011-11-13 15:36:48 +01:00
Benjamin Eberlei
a14ba1e561
DDC-1237 - Remove dependency to mbstring
2011-11-12 09:43:37 +01:00
Alexander
1f55351f19
Cleanup
2011-11-10 16:16:55 +01:00
Alexander
9c9f85ed4b
Only refresh the given entity if an entity is specified in the query hints
2011-11-09 22:52:48 +01:00
Guilherme Blanco
c391287cc4
More optimizations and increased code readability in Id Generators.
2011-11-08 18:36:18 -02:00
Alexander
39ed719c4c
Remove invalid(?) exception for now
2011-11-08 13:16:33 +01:00
Benjamin Eberlei
3914e4a5d0
Merge pull request #184 from asm89/InvalidFetchMode-exception
...
Throw exception on invalid fetch mode in annotations
2011-11-08 01:28:32 -08:00
Benjamin Eberlei
cce3798b4b
Merge pull request #183 from asm89/ProxyIdentifier-types
...
Proxy identifier type casting
2011-11-08 01:27:30 -08:00
Alexander
e99b800406
Throw exception on invalid fetch mode in annotations
2011-11-08 10:01:22 +01:00
Alexander
0cc176aae2
Do not cast BigInt to (int)
2011-11-08 09:47:33 +01:00
Alexander
6707129a3e
Added type casts to 'non-lazy' identifiers in proxies.
2011-11-08 09:43:06 +01:00
Guilherme Blanco
32b8d77580
Fixed CS issues. More tiny optimizations in UnitOfWork.
2011-11-07 01:27:20 -02:00
Guilherme Blanco
96aa25fb3e
Optimized more pieces of code in UnitOfWork.
2011-11-06 02:03:34 -02:00
Guilherme Blanco
ea69d9ca0c
Fixed wrong optimization. Optimized more pieces of code in UnitOfWork.
2011-11-05 19:21:35 -02:00
Guilherme Blanco
c6a3ff4da5
Optimizations in UnitOfWork.
2011-11-05 03:09:14 -02:00
everzet
9c4c06c422
optimized PreFlush (moved into computeChangeSet function)
2011-11-03 16:24:47 +02:00
Benjamin Eberlei
793a1032e6
Merge pull request #182 from asm89/innerjoin-fetch-eager
...
Eagerly fetched entities should only be inner joined if they are loaded
2011-11-03 03:58:21 -07:00
Alexander
ca438fa110
Eagerly fetched entities should only be inner joined if they are loaded
...
from the owning side.
2011-11-03 09:20:41 +01:00
Guilherme Blanco
305da5b8ff
Added missing indexBy.
2011-11-03 02:49:50 -02:00
Guilherme Blanco
3c31d88810
Major optimizations in SqlWalker code, reducing overhead, reducing lookahead checks.
2011-11-03 02:44:50 -02:00
Guilherme Blanco
d1bfd57fd9
Initial code optimization in Hydrators.
2011-11-02 22:08:24 -02:00
Alexander
53055f1fb2
[DDC-551] Fixed a bug in the sql generation for filters
2011-11-02 15:15:22 +01:00
Alexander
9ccce8ed74
[DDC-551] Add filters to eagerly joined entities in the persisters
2011-11-02 15:15:14 +01:00
Benjamin Eberlei
afb8d63fcb
Fixed some AbstractHydrator docblocks
2011-11-01 16:42:03 +01:00
Benjamin Eberlei
4b316ec54f
DDC-1389 - Add validation for empty discriminator map values
2011-10-31 23:35:41 +01:00
Benjamin Eberlei
c965d231b1
Rename method and refactor code a bit
2011-10-31 23:21:11 +01:00
Benjamin Eberlei
abb129028a
Merge branch 'DBAL-1420'
2011-10-31 23:13:33 +01:00
Benjamin Eberlei
e31e164896
DBAL-1420 - Use safe mode for schema validation. Dropping stuff isnt necessary here.
2011-10-31 23:12:52 +01:00
Benjamin Eberlei
c38d273c1f
Merge pull request #151 from doctrine/DDC-1385
...
DDC-1385
2011-10-31 15:10:54 -07:00
Alexander
53386e5247
Merge branch 'master' into innerjoin-on-fetch-eager
...
Conflicts:
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
2011-10-31 22:24:16 +01:00
Benjamin Eberlei
231d84b625
Fix xml fix again
2011-10-31 22:15:08 +01:00
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
1dc5b7fba4
DDC-1462 - Fix bug in slice when calling on a dirty collection that is marked extra lazy
2011-10-31 21:34:22 +01:00
Benjamin Eberlei
95193ab5f8
DDC-1399 - Fix extra lazy collections when inner collection contains values but persistent collection is marked not dirty because of flush()
2011-10-31 21:17:01 +01:00
Benjamin Eberlei
11f82bd41f
DDC-1439 - Fix validate mapping some more
2011-10-31 20:49:59 +01:00
Guilherme Blanco
d444f0e06b
Micro optimization in SqlWalker.
2011-10-30 16:22:45 -02:00
Guilherme Blanco
c246c6b28b
AssignedGenerator optimization.
2011-10-30 16:07:43 -02:00
Guilherme Blanco
3cfa479c01
Micro optimization in computeChangeSet when using readOnly entities.
2011-10-30 15:46:07 -02:00
Benjamin Eberlei
64d405f7dd
Merge origin/master into DDC-1384
2011-10-30 12:12:18 +01:00
Benjamin Eberlei
30731e0727
DDC-1384 - Fix all tests on Oracle
2011-10-29 23:58:09 +02:00
Benjamin Eberlei
50e028212d
DDC-1384 - Fix a bunch of Oracle test failures
2011-10-29 20:42:44 +02:00
Adrien BRAULT
e39bfced4a
Fix iterate method doc return type
2011-10-29 13:40:01 +02:00
Guilherme Blanco
15562d030e
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-29 02:00:55 -02:00
Guilherme Blanco
0ec2cc557f
Implemented support to entities with association marked as @Id support in many situations. Fixed DDC-1435.
2011-10-29 02:00:35 -02:00
Benjamin Eberlei
7be98f475e
DDC-1410 - Remove code-inlining that caused problems
2011-10-28 23:45:23 +02:00
Thiago Festa
66d2b9e0fb
The ProxyFactory was redeclaring methods serialize and unserialize on the cache file on some OSs.
2011-10-28 17:54:15 -02:00
Guilherme Blanco
3745e948c6
Made SimpleSelectExpression (Literal) be included as a scalar result. More general SQL Walker optimizations.
2011-10-28 14:25:12 -02:00
Guilherme Blanco
1f06e9fca5
Fixed issue with SimpleSelectExpression containing Literals. This issue is related to a previously fixed ticket DDC-1079.
2011-10-28 12:56:14 -02:00
Guilherme Blanco
7841ccb7c0
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-28 12:49:21 -02:00
Guilherme Blanco
1579c43433
Code beautification and docblocks enhancements.
2011-10-28 12:49:01 -02:00
Benjamin Eberlei
f34eb83a7c
DDC-1454 - Fix exists() for Joined table inheritance
2011-10-28 00:50:10 +02:00
Benjamin Eberlei
8db1a09001
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-28 00:26:54 +02:00
Benjamin Eberlei
4a0227e5f2
Revert Expr\Base patch
2011-10-28 00:24:41 +02:00
Benjamin Eberlei
5918058d86
Merge origin/master
2011-10-27 22:36:06 +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
Asmir Mustafic
d09285e9d3
Collapse cascade all test (YAML too)
2011-10-26 10:59:15 +02:00
Lukas Kahwe Smith
0a5a23628f
added EntityRepository::getClassName() to fullfill the ObjectRepository interface
...
see https://github.com/doctrine/common/pull/70
2011-10-25 23:21:39 +02:00
Eric Clemmons
5b64dbe195
Added error suppression to mkdir in ProxyFactory
...
See: Symfony\Component\HttpKernel\Kernel#buildContainre
2011-10-25 11:51:09 -07:00
Eric Clemmons
48bf5022e4
ProxyFactory always checks if directory is writable first
2011-10-24 19:45:23 -07:00
Eric Clemmons
99c1383ef5
If proxy directory doesn't exist & cannot be created via mkdir, a ProxyException is thrown
2011-10-24 19:32:38 -07: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
Asmir Mustafic
7efd615b8c
Coding standards
2011-10-24 12:00:11 +02:00
Jaik Dean
cdb452b27b
Fixed typos of 'discriminator'
2011-10-24 10:01:27 +01:00
Asmir Mustafic
5f80b57554
Improoved coding standards
2011-10-24 10:19:01 +02:00
Asmir Mustafic
1b83fcc46d
Coding standards
2011-10-24 09:20:24 +02:00
Benjamin Eberlei
adc4840cce
DDC-217 - Add support for QueryCacheProfiles and remove the old result caching code from ORM. Deprecate a bunch of methods in favor of using the AbstractQuery#getQueryCacheProfile method.
2011-10-23 23:28:23 +02:00
everzet
91d8829c43
removed non-used code
2011-10-23 18:50:24 +03:00
everzet
66e2a9260e
added PreFlush lifetime event and lifecycle callback
2011-10-23 18:39:16 +03: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
Alexander
079e2b1302
[DDC-1384] Fix for generating sql with aliases not longer than MaxIdentifierLength
2011-10-22 16:27:56 +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
719e05e53e
Extract more messages into ORMInvalidArgumentException
2011-10-22 12:57:55 +02:00
Benjamin Eberlei
a8906ce572
Stringify entity in all UnitOfWork exceptions
2011-10-22 12:49:33 +02:00
Benjamin Eberlei
5392737de4
Improved and extracted UnitOfWork error messages
2011-10-22 12:40:12 +02:00
Benjamin Eberlei
3aea203b9c
Throw exception if target entity is not found.
2011-10-22 11:28:07 +02:00
Benjamin Eberlei
dba8360166
Merge master into ImproveErrorMessages
2011-10-22 11:06:51 +02:00
Asmir Mustafic
d4059b88ca
Nullable relations, fixing join condition
2011-10-21 15:30:21 +02:00
armetiz
baef4f735f
Update lib/Doctrine/ORM/Query/Expr/Base.php
2011-10-21 16:30:06 +03:00
Alexander
07ce4092cd
Merge branch 'master' into DDC-551
2011-10-21 12:04:29 +02:00
armetiz
4a50eb4fa7
Update lib/Doctrine/ORM/Query/Expr.php
2011-10-21 11:55:54 +03:00
Asmir Mustafic
fe84a61d0b
Better code generation when association is nullable
2011-10-21 09:38:37 +02:00
Eric Clemmons
fde9d122cc
ProxyFactory checks presence of directory with is_dir
instead of file_exists
2011-10-20 13:33:20 -07:00
Eric Clemmons
92acd32410
ProxyFactory creates proxy's parent structure if it doesn't exist
2011-10-20 09:35:41 -07:00
Asmir Mustafic
596ba3d5b1
Collection inteface instead of ArrayCollection
2011-10-19 15:04:16 +02:00
Benjamin Eberlei
ca01065c6a
Bugfix in short identifier shortcut with association ids
2011-10-19 11:58:59 +02:00
Asmir Mustafic
be3adfb35e
With TO_MANY relations, class filed is instanceof ArrayCollection,
...
instead of targetEntity class type.
2011-10-19 09:25:40 +02:00
Asmir Mustafic
8f092812c4
Spaces
2011-10-19 09:17:30 +02:00
Asmir Mustafic
9c1202a766
Added <variableDefault> on generated class.
...
This allow to unset many-to-one and one-to-one relations
Example: $user->setGroup(null);
2011-10-19 09:15:41 +02:00
Asmir Mustafic
e19fd756cb
Better indentation for generated class
2011-10-19 09:07:18 +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
97321a1ff2
Collapsed cascade elements, if cascade-all.
...
(better readability for generated xml)
2011-10-18 16:18:25 +02: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
Benjamin Eberlei
8466060797
DDC-1385 - Add INDEX BY scalar variables on the top-level
2011-10-16 19:23:20 +02:00
Christophe Coevoet
a8e6131e3b
Added the initializeObject method in the EntityManager
2011-10-16 17:00:33 +02:00
Benjamin Eberlei
ee924ffaba
DDC-1385 - Fix scalar handling for array hydrator
2011-10-16 16:27:50 +02:00
Benjamin Eberlei
2730f64d90
DDC-1385 - Refactor ObjectHydrator
2011-10-16 16:13:59 +02:00
Benjamin Eberlei
cb0e5dbff3
DDC-1385 - Fixed Mixed result hydration using INDEX BY to work on the top-level indexes, not some weird result. This is a BC break to those that actually use this crazy logic, sorry for that :-)
2011-10-16 12:46:17 +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
Alexander
58b381bf24
[DDC-551] use isClean to check the filterCollection state..
2011-10-15 22:31:20 +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