RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-17 00:18:42 +03:00
Code Issues Projects Releases Wiki Activity
6,225 Commits 5 Branches 0 Tags 32 MiB
775936399e
Commit Graph

2261 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Guilherme Blanco
356f5874bf Added support to removeElement remove items without initializing the PersistentCollection. 2011-11-29 11:29:17 -05: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
Benjamin Eberlei
2b7360e738 Merge pull request #200 from velovint/StandaloneTestsFailing 
Register DoctrineAnnotations on call to OrmTestCase::createAnnotationDri...
 2011-11-26 00:17:12 -08: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
Vitali
507c8f45b4 Register DoctrineAnnotations on call to OrmTestCase::createAnnotationDriver() 2011-11-20 17:02:15 +03: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
077d4a0e15 Fix travis configuration files 2011-11-13 22:04:48 +01:00
Benjamin Eberlei
0fdffb9dbc Fix postgresql travis phpunit configuration file 2011-11-13 17:57:54 +01:00
Benjamin Eberlei
c2bb281e80 Merge travis support from @pborreli - thanks! 2011-11-13 17:44:37 +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
Benjamin Eberlei
450d92872a Forward compatibility with DBAL master 2011-11-12 12:56:44 +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
Benjamin Eberlei
cfe7ab46f2 Merge branch 'master' of git://github.com/doctrine/doctrine2 2011-10-25 22:55:08 +02:00
Benjamin Eberlei
3b9312e291 Bump DBAL version and make TestUtil more lenient 2011-10-25 22:54:20 +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