1
0
Fork 0
mirror of synced 2025-04-02 04:46:16 +03:00
doctrine2/lib/Doctrine/ORM
Gordon Stratton 9e916a2893 Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED.
In SqlWalker::walkJoin(), SqlWalker::walkRangeVariableDeclaration() can be
called which may produce an 'ON' clause if the entity inheritance type is
JOINED. As walkJoin() may then produce another ON clause, this results in
invalid SQL (e.g. '... ON foo = bar ON (baz = quux) ...' when the inheritance
type is JOINED.

This adds a test and a fix for the problem, by checking for an inheritance type
of JOINED in walkJoin() and using AND instead of ON in the appropriate place.

It seems like this part of the code is begging to be refactored. This is my
first foray into Doctrine internals and can't see a way to do this without
stomping all over the rest of the code, but this section seems ripe for cleanup
by somebody who is familiar.
2012-11-05 01:19:25 -08:00
..
Event fixed use statements 2012-10-12 13:53:20 +02:00
Id fixed use statements 2012-10-12 13:53:20 +02:00
Internal fixed use statements 2012-10-12 13:53:20 +02:00
Mapping Merge pull request #481 from beejeebus/master 2012-10-21 20:54:22 -07:00
Persisters Update lib/Doctrine/ORM/Persisters/BasicEntityPersister.php 2012-11-02 18:37:46 +01:00
Proxy fixed use statements 2012-10-12 13:53:20 +02:00
Query Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED. 2012-11-05 01:19:25 -08:00
Tools Removed an unused private method in the SchemaValidator 2012-11-03 16:37:34 +01:00
AbstractQuery.php Compare to null instead of using isset 2012-11-04 19:04:13 -08:00
Configuration.php Merge pull request #434 from bamarni/filter-objects 2012-11-02 17:52:23 -07:00
EntityManager.php fixed use statements 2012-10-12 13:53:20 +02:00
EntityNotFoundException.php LGPL => MIT 2012-05-26 14:37:00 +02:00
EntityRepository.php fix typo 2012-10-12 13:37:17 +02:00
Events.php remove svn markers 2012-06-19 15:27:41 -03:00
NativeQuery.php Removed un-necessary getIterator(). 2012-05-29 15:14:08 -04:00
NonUniqueResultException.php LGPL => MIT 2012-05-26 14:37:00 +02:00
NoResultException.php LGPL => MIT 2012-05-26 14:37:00 +02:00
OptimisticLockException.php LGPL => MIT 2012-05-26 14:37:00 +02:00
ORMException.php Fixed is_subclass_of comparing an interface which brought our requirement to 5.3.9. Changed to reflection approach which still keep us at the same dependency as before. 2012-07-26 15:50:51 -04:00
ORMInvalidArgumentException.php Fix ORMInvalidArgumentException factory methods with return instead of throw 2012-08-29 14:02:51 +02:00
PersistentCollection.php Fixes PersistentCollection::matching() when collection is not initialized and there are NEW entities in the collection 2012-09-07 10:46:34 +02:00
PessimisticLockException.php remove svn markers 2012-06-19 15:27:41 -03:00
Query.php Add some corrections 2012-06-05 21:32:53 +02:00
QueryBuilder.php Remove extra space from QueryBuilder::addCriteria() 2012-08-20 20:27:55 +04:00
README.markdown [2.0] Adding blank README files 2010-04-06 03:04:02 +00:00
TransactionRequiredException.php remove svn markers 2012-06-19 15:27:41 -03:00
UnexpectedResultException.php LGPL => MIT 2012-05-26 14:37:00 +02:00
UnitOfWork.php Prevented "Undefined index" notice when updating 2012-10-17 21:50:09 +02:00
Version.php Bump Version to 2.4.0-DEV 2012-07-16 15:25:20 +02:00