Alexander
ed0fb4ece7
Merge branch 'master' into DDC-551
...
Conflicts:
lib/Doctrine/ORM/Persisters/OneToManyPersister.php
2011-08-16 16:59:48 +02:00
Guilherme Blanco
7433148f17
Fixed bug in XMLDriver where relation indexes are treathed as elements but documented as attributes.
2011-08-16 11:36:41 -03:00
Alexander
3800581947
[DDC-551] Altered persisters to make filters work with EXTRA_LAZY associations
2011-08-16 16:24:50 +02:00
Alexander
2653d735e2
[DDC-551] Added state of the complete filter collection to the EM
...
Previously it was sufficient to use the old parser result for a Query if
the DQL didn't change (Query::STATE_CLEAN), but now there must also be
no changes to the filter collection of the EntityManager.
In the old situation each Query object would create a hash of all the
filter objects on it's own. That was not very efficient.
This commit adds the state of the current filter collection to the
EntityManager. The state will be set to FILTERS_STATE_DIRTY as a filter
is enabled, removed or a parameter is set on a filter. The hash is also
computed by the EntityManager, but only if the filter collection is
dirty. This will prevent recalculation of the hash with each query.
2011-08-16 13:34:42 +02:00
Alexander
3b1ddb0346
[DDC-551] Added filters to SQLWalker
2011-08-16 12:21:43 +02:00
Guilherme Blanco
6857134f36
Fixed issue with duplicated commas if Entity has no fields.
2011-08-15 12:47:17 -03:00
Guilherme Blanco
f148912a28
[DDC-934][DDC-1100][DDC-1331] Implemented support to multi-values in INSTANCE OF expression.
2011-08-15 01:53:56 -03:00
Guilherme Blanco
b9a24b5487
Merge pull request #93 from kwiateusz/UnitTestsUpdate
...
Last change from assertTrue($a instanceof $b) to assertInstanceOf
2011-08-14 21:05:15 -07:00
Benjamin Eberlei
2ee3cdeb0c
Merge pull request #106 from FabioBatSilva/master
...
[DDC-1325] @Target annotation
2011-08-14 10:22:13 -07:00
Guilherme Blanco
a0ca506db7
Added support to SingleValuePathExpression in ORDER BY.
2011-08-14 00:46:02 -03:00
Guilherme Blanco
63a2f02f4d
[DDC-408][DDC-1150][DDC-1277] Implemented support to parameter expanding on associations.
2011-08-13 21:28:54 -03:00
Fabio B. Silva
a04d2933fa
@Target annotation and support to common 2.2-DEV
2011-08-13 16:28:05 -03:00
Guilherme Blanco
e13720c33d
Merge pull request #103 from rdohms/patch-1
...
Add getReader to AnnotationDriver
2011-08-10 11:11:41 -07:00
Rafael Dohms
07e1c1e2e1
Added method to retrieve currently used Reader. This allows projects that use Doctrine to recycle the reader to use with other annotation-driven packages, like DMS\Filter and Symfony\Validator
2011-08-10 15:10:09 -03:00
Guilherme Blanco
816ce41f63
Added support to CaseExpression. Added support to nest AndX and OrX QueryBuilder composite expressions, since they do not mess with generated queries.
2011-08-08 02:09:25 -03:00
Benjamin Eberlei
1666d59da4
Merge branch 'DDC-1300'
2011-08-06 20:25:52 +02:00
Benjamin Eberlei
bcc7bb1c9c
DDC-1300 - Fix bug in fetch join hydration of entities with foreign key identifier
2011-08-06 20:25:45 +02:00
Benjamin Eberlei
15c877b8e8
Merge branch 'master' of github.com:doctrine/doctrine2
2011-08-06 18:15:00 +02:00
Guilherme Blanco
19682bf87a
Merge pull request #102 from schmittjoh/configUpdate
...
updated configuration
2011-08-05 07:56:31 -07:00
Johannes Schmitt
7e47a601b0
updated configuration
2011-08-05 16:48:05 +02:00
Benjamin Eberlei
c85de03b66
Add phar packaging target and distribute phar into download folder
2011-08-01 23:09:03 +02:00
Benjamin Eberlei
d3beb7e23e
Merge branch 'DDC-1313'
2011-08-01 21:45:39 +02:00
Benjamin Eberlei
ba882be76b
DDC-1313 - Optimize behavior of DriverChain::getAllClassNames()
2011-08-01 21:45:21 +02:00
Benjamin Eberlei
e12a5fb328
Merge branch 'master' of github.com:doctrine/doctrine2
2011-07-31 11:41:30 +02:00
Benjamin Eberlei
d583b149ac
Merge pull request #98 from asm89/master
...
[DDC-1301] Fixed tests teardown for mysql suite
2011-07-31 02:41:19 -07:00
Benjamin Eberlei
4675f65bea
Merge branch 'DDC-1302'
2011-07-31 11:34:27 +02:00
Benjamin Eberlei
816039f23f
DDC-1302 - Fix bug in XmlDriver not handling orphan removal
2011-07-31 11:32:57 +02:00
Alexander
953a0f6572
[DDC-1301] Fixed tests teardown for mysql suite
2011-07-29 09:35:59 +02:00
Benjamin Eberlei
c34612b8e9
[DDC-1298] DDC117Link file got lost from 2.1.x to master somehow
2011-07-28 23:44:11 +02:00
Benjamin Eberlei
f8558d7740
Merge branch 'master' of github.com:doctrine/doctrine2
2011-07-28 23:26:24 +02:00
Benjamin Eberlei
5c47c07794
Merge pull request #97 from asm89/DDC-1301
...
[DDC-1301] Fixed count() for fetch="EXTRA_LAZY" on OneToMany association
2011-07-28 14:26:15 -07:00
Benjamin Eberlei
3d788a10cf
Merge branch 'master' of github.com:doctrine/doctrine2
2011-07-28 23:19:44 +02:00
Benjamin Eberlei
8f589e5876
Merge pull request #92 from mridgway/DDC-1275
...
DDC-1275: Added join columns to result set mapping
2011-07-28 14:18:55 -07:00
Michael Ridgway
1250cd7a5a
F[DDC-1275] ixed check for owning side of a toOne relationship
2011-07-28 10:50:22 -04:00
Alexander
d439f67df5
[DDC-1301] Prefixed all Legacy models properties with _
2011-07-28 12:25:23 +02:00
Alexander
d7dbde8f3e
[DDC-1301] Fixed count() for fetch="EXTRA_LAZY" on OneToMany association
2011-07-28 11:01:52 +02:00
Alexander
b2951691e2
[DDC-1301] Added tests for fetch="EXTRA_LAZY" count() on a "legacy" database
2011-07-28 11:01:28 +02:00
Benjamin Eberlei
656beb635c
Merge branch 'DDC-1298'
2011-07-27 23:26:06 +02:00
Benjamin Eberlei
196632978c
DDC-1298 - Fix bug in SQLWalker with derived entities that have no fields of their own.
2011-07-27 23:22:20 +02:00
kwiateusz
a47af43bc1
Last change from assertTrue($a instanceof $b) to assertInstanceOf
2011-07-27 08:54:06 +02:00
Michael Ridgway
7f20a32db3
Removing debug comment
2011-07-26 17:39:57 -04:00
Michael Ridgway
154fd60d85
DDC-1275: Added join columns to result set mapping
2011-07-26 17:35:06 -04:00
Benjamin Eberlei
a0b7c3e76d
Add UPGRADE_TO_2_2 file
2011-07-26 23:16:38 +02:00
Benjamin Eberlei
7584ef6ba1
Merge branch 'master' of github.com:doctrine/doctrine2
2011-07-26 23:14:57 +02:00
Benjamin Eberlei
57cfcfd20e
Merge pull request #79 from mridgway/DDC-725
...
[DDC-725] Removed onUpdate property on join columns
2011-07-26 14:14:30 -07:00
Benjamin Eberlei
e73605e177
Merge pull request #90 from mweimerskirch/patch-2
...
Corrected typo
2011-07-26 14:12:19 -07:00
Benjamin Eberlei
6abe8e412c
Merge branch 'master' of github.com:doctrine/doctrine2
2011-07-26 23:03:30 +02:00
Benjamin Eberlei
79d99b11ad
Merge pull request #91 from kwiateusz/UnitTestsUpdate
...
Removed deprecated assertType (thanks @kwiateusz)
2011-07-26 14:03:04 -07:00
Benjamin Eberlei
41a9e9689b
Merge branch 'DDC-1215'
2011-07-26 23:00:11 +02:00
Benjamin Eberlei
598ab36968
[DDC-1215] Fix EntityGenerator inheritance regenerating properties and methods
2011-07-26 22:59:55 +02:00
