[DDC-2123] [GH-502] Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED.

Fri, 9 Nov 2012 21:25:07 +0000

This issue is created automatically through a Github pull request on behalf of gwis:

Url: https://github.com/doctrine/doctrine2/pull/502

Message:

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.

Doctrine Project

[DDC-2123] [GH-502] Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED.