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 quoting when using inheritance as well #6416

Merged
merged 3 commits into from
May 2, 2017

Conversation

lcobucci
Copy link
Member

Related to #6402 and #6404

@lcobucci lcobucci added the Bug label Apr 30, 2017
@lcobucci lcobucci added this to the 2.6.0 milestone Apr 30, 2017
@lcobucci lcobucci self-assigned this Apr 30, 2017
* @param string $type
*
* @return string
*/
protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $type)
protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $quotedColumnName, $type)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Theoretically this is as minor BC break, should we add to UPGRADING.md?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a valid BC break since we do not allow custom persisters.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, change is fine here

@guilhermeblanco
Copy link
Member

develop is way ahead of the game and honestly any change around quoting is ok since it'll all changed already.

@Ocramius
Copy link
Member

Ocramius commented May 2, 2017

@guilhermeblanco just a note: rebasing on this will likely be annoying. Still, the fix is valid IMO, and it shall be merged in master

Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚢

* @param string $type
*
* @return string
*/
protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $type)
protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $quotedColumnName, $type)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, change is fine here

@Ocramius Ocramius merged commit 2c1ebc4 into doctrine:master May 2, 2017
@lcobucci lcobucci deleted the fix-quote-on-inheritance branch May 2, 2017 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants