mirror of
https://github.com/doctrine/orm.git
synced 2026-03-24 06:52:09 +01:00
[PR #502] [MERGED] Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED. #8290
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/doctrine/orm/pull/502
Author: @gws
Created: 11/5/2012
Status: ✅ Merged
Merged: 11/6/2012
Merged by: @guilhermeblanco
Base:
master← Head:master📝 Commits (1)
9e916a2Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED.📊 Changes
2 files changed (+14 additions, -1 deletions)
View changed files
📝
lib/Doctrine/ORM/Query/SqlWalker.php(+6 -1)📝
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php(+8 -0)📄 Description
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.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.