Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED. #502

Merged
merged 1 commit into from Nov 6, 2012

Commits on Nov 5, 2012

  1. Fix for invalid 'double-ON' SQL generation with entity inheritance ty…

    …pe 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.
    gws committed Nov 5, 2012
    Copy the full SHA
    9e916a2 View commit details
    Browse the repository at this point in the history