Benjamin Eberlei
c6730de3d1
Merge remote-tracking branch 'origin/2.2'
2012-01-02 15:13:26 +01:00
Benjamin Eberlei
239ffe468a
Merge pull request #237 from asm89/ddc-551-collections-filters
...
[DDC-551] Support for inheritance with filters in lazy collections
2012-01-02 06:11:34 -08:00
Benjamin Eberlei
b558ffd694
Merge pull request #244 from kimhemsoe/fix_ddc224_test
...
Fixed DDC214 test.
2011-12-31 02:27:28 -08:00
Guilherme Blanco
9f3967d65d
Merge pull request #245 from milokmet/DDC-1572
...
[DDC-1572] Allow LIKE pattern to be a function or path expression
2011-12-30 20:17:38 -08:00
Guilherme Blanco
e43897916a
Merge pull request #246 from FabioBatSilva/DDC-1557
...
[DDC 1557] Support for DQL function on subselect
2011-12-29 11:22:23 -08:00
Miloslav Kmet
ae4321b4e3
[DDC-1572] Allow LIKE pattern to be a function or path expression
2011-12-29 19:51:48 +01:00
Fabio B. Silva
bf8924df14
some tests
2011-12-29 14:47:23 -02:00
Fabio B. Silva
4cc61bf2ee
fix DDC-1557
2011-12-29 14:30:29 -02:00
Kim Hemsø Rasmussen
82bea24426
Fixed DDC214 test.
2011-12-29 02:05:54 +01:00
Benjamin Eberlei
87e0c69381
Merge remote-tracking branch 'origin/2.2' into 2.2
2011-12-28 20:29:53 +01:00
Benjamin Eberlei
a6deb51a05
DDC-1360 - Bugfix in quoting mechanism inside ClassMetadataInfo
2011-12-28 20:29:01 +01:00
Benjamin Eberlei
9d398afa56
DDC-1360 - Bugfix in quoting mechanism inside ClassMetadataInfo
2011-12-28 20:28:17 +01:00
Guilherme Blanco
abb258c951
Merge pull request #241 from FabioBatSilva/DDC-559
...
[DDC 559, DDC 852] Naming Strategy
2011-12-24 08:45:38 -08:00
Fabio B. Silva
e3acf43dbc
move naming classes to Doctrine\ORM\Mapping
2011-12-24 12:01:25 -02:00
Fabio B. Silva
1eddb53d6c
fix CS and use php constants
2011-12-24 11:45:51 -02:00
Fabio B. Silva
223577d8b5
fix QueryDqlFunctionTest#testFunctionSubstring order
2011-12-23 14:57:43 -02:00
Fabio B. Silva
8bdb713073
add support for NamingStrategy
2011-12-23 14:41:03 -02:00
Fabio B. Silva
eac34b6d6a
test ClassMetadata whit UnderscoreNamingStrategy
2011-12-23 14:13:21 -02:00
Fabio B. Silva
8b1f60c9f8
add UnderscoreNamingStrategy
2011-12-23 12:16:36 -02:00
Fabio B. Silva
8368f0e4b9
change default namming strategy
2011-12-23 11:03:28 -02:00
Alexander
4cf5f70bea
Update test
2011-12-22 23:21:56 +01:00
Alexander
c3c174512a
Added tests for OneToMany associations and lazy collection to CTI entity
2011-12-22 21:10:13 +01:00
Alexander
f49a4e9c40
Added tests for OneToMany associations and lazy collection to STI entity
2011-12-22 20:50:57 +01:00
Alexander
223c47069e
Added tests for ManyToMany associations and lazy collection to CTI entity
2011-12-22 17:49:57 +01:00
Fabio B. Silva
a038e6cbad
test case
2011-12-22 14:07:58 -02:00
Fabio B. Silva
909dbdf29d
default NamingStrategy
2011-12-22 12:07:18 -02:00
Fabio B. Silva
c2cee0d6eb
error messages
2011-12-22 11:05:11 -02:00
Alexander
62be27b295
Added tests for ManyToMany associations and lazy collection to STI entity
2011-12-22 00:25:21 +01:00
Benjamin Eberlei
f6f2acad4c
Merge Improve Error Messages into 2.2
2011-12-21 23:56:25 +01:00
Fabio B. Silva
e90545cef5
ORDER BY CmsArticle#topic
2011-12-20 17:22:14 -02:00
Fabio B. Silva
0a01b14830
fix QueryTest#testJoinQueries order
2011-12-20 16:14:01 -02:00
Fabio B. Silva
24dc74a800
Fixed DDC-1539
2011-12-20 10:31:00 -02:00
Guilherme Blanco
772f58a95b
Removed test since I'm unable to test now.
2011-12-20 00:48:19 -05: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
Benjamin Eberlei
f2d8102bbf
Fix bug in test, removed an assertion that is not necessary and violates sqlites autoincrement assumptions
2011-12-19 22:32:50 +01:00
Fabio B. Silva
5c89d7ffcb
support for bit comparison
2011-12-19 16:24:16 -02: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
Alexander
108cb53eef
Merge pull request #229 from bschussek/DDC-1545
...
DDC-1545
2011-12-19 03:22:49 -08:00
Bernhard Schussek
e035fe7949
Fixed class name of test for DDC-1545
2011-12-19 11:20:37 +01:00
Alexander
4f67ea3869
Merge pull request #228 from asm89/ddc-551-parameter-inference
...
Fixed testsuite
2011-12-19 01:02:30 -08:00
Alexander
8c6c49a6ee
Fixed testsuite
2011-12-19 09:55:49 +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
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
Alexander
5160bdc1a8
[DDC-551] Fix testcase on pgsql
2011-12-18 19:58:32 +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
Bernhard Schussek
9b877499c7
Added test case for DDC-1545
2011-12-18 12:13:58 +01:00
Benjamin Eberlei
9cd8f85a8c
DDC-1456 - Disallow setting id generators on composite identifiers.
2011-12-18 00:32:35 +01:00
Evan Coury
36a47e391c
DDC-1544 - Add unit test and assertions for ResolveTargetEntityListener
2011-12-17 15:00:05 -07: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
Guilherme Blanco
65c2b498ad
Removed broken test.
2011-12-12 23:40:48 -05:00
Benjamin Eberlei
43ef8765fd
DDC-1527 - Port bugfix for master branch
2011-12-12 16:39:52 +01:00
Benjamin Eberlei
0f501114eb
Merge branch 'master' into DDC-551
2011-12-11 18:39:11 +01:00
Benjamin Eberlei
40d094fea2
DDC-1515 - Now the real bugfix
2011-12-11 17:08:58 +01:00
Benjamin Eberlei
f6d2b00d5c
DDC-1400 - var_dump(), seriously?
2011-12-11 16:42:59 +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
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
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
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
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
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
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
9d1402e4a5
Fix PHPMappingDriver tests
2011-11-28 23:30:32 +03:00
Vitali Yakavenka
84086915e4
Add support for custom ID generator in Yaml driver
2011-11-28 23:30:32 +03:00
Vitali Yakavenka
0a4fbc9770
Remove test for custom ID generator from AnnotationDriverTest as it duplicates one in AbstractMappingDriverTest
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
6bcfaed640
Remove explicit annotation registration after it was merged into OrmTestCase
2011-11-28 23:30:32 +03:00
Vitali Yakavenka
e2953c8cd4
Rename test accoring to what it tests
2011-11-28 23:29:42 +03:00
Vitali Yakavenka
48b6356e53
Add support for GenerateValue(strategy='CUSTOM') in AnnotationDriver
2011-11-28 23:29:42 +03:00
Vitali Yakavenka
955497e3d5
Remove unnecessary mock
2011-11-28 23:24:19 +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
Vitali
3f942e05f3
Register annotations to make ClassMetadataFactoryTest pass alone
2011-11-28 23:22:08 +03: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
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
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
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
dc0a03ab30
DDC-1400 working testcase
2011-11-19 08:50:49 +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
166c05dfaa
Fix tests to be more stable
2011-11-18 17:42:32 +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
b44ff9b849
Merge pull request #194 from FabioBatSilva/DDC-1430-PGSQL-TEST
...
DDC-1430 - fix broken test on postgres
2011-11-18 05:14:15 -08:00
Benjamin Eberlei
2187f33477
Add test for DDC-1436 and DDC-1452 showing they are the same issues
2011-11-18 13:28:56 +01:00
Fabio B. Silva
f4da4591fa
fix broken test on postgres
2011-11-16 09:48:11 -02:00
Fabio B. Silva
aeb2ab132b
group by all fields when entity has foreign keys
2011-11-15 20:27:45 -02:00
Fabio B. Silva
4cbd5eac95
Test Foreign Keys
2011-11-15 18:54:53 -02:00
Benjamin Eberlei
2d14be86f3
Merge pull request #192 from FabioBatSilva/DDC-1474
...
DDC-1474
2011-11-15 12:10:19 -08:00
Fabio B. Silva
08edf34057
move tests to SelectSqlGenerationTest
2011-11-15 17:27:17 -02: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
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
98033cc878
Merge branch 'master' into DDC-1452
2011-11-14 21:53:36 +01:00
Benjamin Eberlei
909504c074
DDC-1461 - Fix test failures
2011-11-14 21:05:44 +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
c648981f28
DDC-1461 - Verified deferred explicit works
2011-11-13 23:14:31 +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
6520211df3
Merge everzet/PreFlush-event
2011-11-13 16:51:23 +01:00
Benjamin Eberlei
01697fee3d
Fix failing PostgreSQL tests
2011-11-12 22:16:39 +01:00
Alexander
1f55351f19
Cleanup
2011-11-10 16:16:55 +01:00
Alexander
3131103801
Failing test case
2011-11-09 22:15:22 +01:00
Benjamin Eberlei
d9ec0a59ec
Merge pull request #186 from asm89/fix-tests-phpunit-3.6
...
Fixed failing tests in PHPUnit 3.6.2 (expecting \Exception was deprecated)
2011-11-09 01:04:38 -08:00
Alexander
2ddfc6af5a
Fixed failing tests in PHPUnit 3.6.2 (expecting \Exception was deprecated)
2011-11-09 08:20:35 +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
6707129a3e
Added type casts to 'non-lazy' identifiers in proxies.
2011-11-08 09:43:06 +01: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
3c31d88810
Major optimizations in SqlWalker code, reducing overhead, reducing lookahead checks.
2011-11-03 02:44:50 -02:00
Guilherme Blanco
058242fa27
Fixed missing changes.
2011-11-03 02:37:54 -02:00
Benjamin Eberlei
d532de9da3
Fix docblocks ObjectHydratorTest
2011-11-01 17:43:23 +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
Alexander
22b3b46b61
Removed unnecessary spaces in generated SQL
2011-10-31 22:08:40 +01:00
Alexander
0f938b8c1d
Added tests for inner join generation with eager loading
2011-10-31 21:53:46 +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
Benjamin Eberlei
64d405f7dd
Merge origin/master into DDC-1384
2011-10-30 12:12:18 +01:00
Benjamin Eberlei
94c288a6a8
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-30 08:26:03 +01:00
Benjamin Eberlei
2c036b3185
Fix glitch in testsuites tearDown()
2011-10-30 08:25:19 +01:00
Benjamin Eberlei
1bbec8dd33
Clarify error message
2011-10-30 00:25:49 +02: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
Benjamin Eberlei
fb55e8094b
DDC-1384 - Made tests case-insenstive to work with latest change regarding column sizes
2011-10-29 18:48:34 +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
7d921a8220
DDC-1452 - Attach working testcase
2011-10-29 00:22:45 +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
Benjamin Eberlei
f34eb83a7c
DDC-1454 - Fix exists() for Joined table inheritance
2011-10-28 00:50:10 +02:00
Benjamin Eberlei
5918058d86
Merge origin/master
2011-10-27 22:36:06 +02:00
Asmir Mustafic
d09285e9d3
Collapse cascade all test (YAML too)
2011-10-26 10:59:15 +02:00
Asmir Mustafic
035ca8e500
Collapse cascade all test
2011-10-26 10:14:59 +02:00
Jaik Dean
cdb452b27b
Fixed typos of 'discriminator'
2011-10-24 10:01:27 +01:00
Asmir Mustafic
cb76222e63
Collapse cascade persist, remove, refresh, detach, merge into
...
cascade-all (implemented currently only for XML annotation)
2011-10-24 09:54:31 +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
Alexander
80c9690926
Fix mysql testsuite
2011-10-23 22:06:03 +02:00
Alexander
f1df4ffca4
Fix testsuite
2011-10-23 21:37:29 +02:00
everzet
20ed8869e4
added test for PreFlush lifetime event
2011-10-23 18:41:41 +03:00
Benjamin Eberlei
9b8d2d512b
Merge pull request #168 from dfreudenberger/master
...
postFlush event implementation
2011-10-23 01:12:27 -07: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
b910a487c5
DDC-720 - Wait, we should really test it only changes the passed entity.
2011-10-22 14:31:23 +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
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
Benjamin Eberlei
23560038b4
Merge branch 'master' of github.com:doctrine/doctrine2
2011-10-22 10:37:32 +02:00
Alexander
07ce4092cd
Merge branch 'master' into DDC-551
2011-10-21 12:04:29 +02: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
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
Benjamin Eberlei
ee924ffaba
DDC-1385 - Fix scalar handling for array hydrator
2011-10-16 16:27:50 +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
33bcf7ad6f
Added coverage to DDC-1161.
2011-10-16 01:42: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
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
08716d9f72
DDC-1383 - Proxy Generation in merge was flawed with inheritance
2011-10-15 19:14:30 +02:00
Alexander
d46352da01
Fixed tests + added dedicated tests for proxy loading and identifiers
2011-10-15 17:58:00 +02:00
Benjamin Eberlei
cb28bfd484
Improve Error Messages in ClassMetadata and UnitOfWork
2011-10-15 17:38:55 +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
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
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
Alexander
097d573d26
Merge branch 'master' into DDC-551
...
Conflicts:
lib/Doctrine/ORM/Configuration.php
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
2011-10-14 12:33:39 +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
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
Guilherme Blanco
ebe933810e
Implemented HIDDEN support in DQL. Fixes DDC-1363.
2011-10-03 02:07:07 -03:00
Guilherme Blanco
80284a273d
Merge pull request #133 from FabioBatSilva/DDC-1335
...
Fixes DDC-1335.
Patch looks perfect to me. @beberlei please merge into 2.1 =)
2011-09-25 14:52:56 -07:00
Benjamin Eberlei
9f96d4a31a
DDC-1392 - Fix bug with merging unitialized proxies
2011-09-25 18:08:41 +02:00
Fabio B. Silva
5fe996baf9
change tests for DDC-1135
2011-09-25 12:20:48 -03:00
Fabio B. Silva
728724bed5
fix DDC-1135
2011-09-24 16:16:25 -03:00
Fabio B. Silva
e94b902a9b
tests for DDC-1335
2011-09-24 16:10:10 -03:00
Fabio B. Silva
f4c5c4ba01
branch for DDC-1335
2011-09-23 18:10:58 -03:00
Guilherme Blanco
a86038b484
Fixed issue with CaseExpression not working in Subselects.
2011-09-21 17:30:45 -03:00
Alexander
63a3fb5ad8
[DDC-551] Moved SQLFilter logic to a separate FilterCollection class
2011-09-15 21:38:47 +02:00
Guilherme Blanco
918e2d2018
Fixed remaining Doctrine packages upgrade.
2011-09-13 01:14:36 -03:00
Guilherme Blanco
3bb803fd69
Cherry picked FabioBatSilva upgrade of Common lib.
2011-09-13 00:59:24 -03:00
Fabio B. Silva
3707b34cbb
Change repository type for EntityRepository
2011-09-08 17:21:06 -03:00
Fabio B. Silva
43ccd9ead6
tests for DDC-753
2011-09-08 15:54:49 -03:00
Fabio B. Silva
19d0887bb0
check if parent class is a mapped superclass
2011-09-08 13:41:16 -03:00
Fabio B. Silva
7f0275155d
php mapping
2011-09-08 13:17:53 -03:00
Fabio B. Silva
6a89de51e5
change tests
2011-09-08 12:55:55 -03:00
Fabio B. Silva
54a53b1d03
tests for DDC-869
2011-09-08 11:56:05 -03:00
Fabio B. Silva
f6d34bbb9d
Merge remote-tracking branch 'upstream/master' into DDC-869
2011-09-08 11:54:04 -03:00
Guilherme Blanco
a7f3af8328
Added IDENTITY DQL Function. Fixes DDC-1339.
2011-09-08 02:10:48 -03:00
Fabio B. Silva
b2d98495b1
mapping files
2011-09-07 18:29:43 -03:00
Fabio B. Silva
25ecd45fd1
Merge remote-tracking branch 'upstream/master' into DDC-869
2011-09-07 17:27:59 -03:00
Fabio B. Silva
82f7d6cad2
starts work with mapped superclass repository
2011-09-07 17:27:05 -03:00
Guilherme Blanco
bd5393a318
Added coverage for orphanRemoval in OneToOne when unlinking an entity.
2011-09-07 13:12:02 -03:00
Guilherme Blanco
2cfc61db84
Fixed bug with orphanRemoval not removing associated Entity on OneToMany and OneToOne relationships. As defined in ClassMatedataInfo, in these situations, when orphanRemoval=true, cascade=remove is implicit. This fixes DDC-1321.
2011-09-06 01:58:16 -03:00
Guilherme Blanco
6bbf2d9da3
Added support for ResultVariable referencing in ArithmeticPrimary. Fixes DDC-1346.
2011-09-05 03:16:01 -03:00
Benjamin Eberlei
09ac3a9eb2
DDC-659 - Add ClassMetadataBuilder for PHP based metadata management
2011-09-04 14:13:20 +02:00
Benjamin Eberlei
342c3ba941
Initial work on ClassMetdataBuilder
2011-09-04 10:08:33 +02:00
Guilherme Blanco
3b3186ee98
Added support to user provide an array of Entities as a DQL parameter. Fixes DDC-1356.
2011-09-01 19:11:57 -03:00
Benjamin Eberlei
8b38e68e23
DDC-1350 - Bugfixes in Doctrine\ORM\Tools\Setup
2011-08-30 20:40:26 +02:00
Guilherme Blanco
12f46e936c
Merge branch 'master' of github.com:doctrine/doctrine2
2011-08-28 13:48:24 -03:00
Guilherme Blanco
e7f471ef3e
Fixed issue with CTI during DQL update that was incorrectly setting parameter types during multi table execution. Fixes DDC-1341.
2011-08-28 13:48:15 -03:00
Benjamin Eberlei
0a6709acba
Fix tests with regard to repositoryClass handling and applying the default namespace
2011-08-28 16:00:21 +02:00
Benjamin Eberlei
b145f061c9
DDC-1348 - Fix bug with UnitOfWork::getEntityState()
2011-08-28 15:58:08 +02:00
Benjamin Eberlei
e6a73803a4
Merge branch 'DDC-1306'
2011-08-27 20:44:15 +02:00
Benjamin Eberlei
3b4b38e184
DDC-1306, DDC-1113 - Fix issues with inheritance and commit order
2011-08-27 20:41:52 +02:00
Benjamin Eberlei
8c2db89f2b
DDC-1340 - Fix bug with merge() and optimistic lock exception
2011-08-21 15:01:57 +02:00
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