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

[DDC-2310] [DDC-2675] [2.4] Fix SQL generation on table lock hint capable platforms #925

Merged
merged 1 commit into from
Nov 11, 2014

Conversation

deeky666
Copy link
Member

Backport of PR #910 for 2.4 branch.

@doctrinebot
Copy link

Hello,

thank you for creating this pull request. However did not open it on the "master"
branch. Our Git workflow requires all pull requests to go through "master" branch
and the release masters then merge them back into stable branches, if they are
bug fixes.

Please open the pull request again for the "master" branch and close
this one.

Nevertheless I have opened a Jira ticket for this Pull Request to track this
issue:

http://www.doctrine-project.org/jira/browse/DDC-2945

We use Jira to track the state of pull requests and the versions they got
included in.

@guilhermeblanco
Copy link
Member

@deeky666 can you rebase, please?

@deeky666
Copy link
Member Author

@guilhermeblanco done

@guilhermeblanco
Copy link
Member

@deeky666 now tests should also pass to merge... =P

@Ocramius
Copy link
Member

Ping @deeky666 (sorry, I know you're kinda busy: I'm going through unresolved issues)

@deeky666
Copy link
Member Author

@Ocramius @guilhermeblanco the failing test either requires a backport of doctrine/dbal#508 in DBAL first or adjusting assumptions in the test case? What is your preference? IMO it would make sense to backport the DBAL patch, too as it is related to this issue.

@Ocramius
Copy link
Member

@deeky666 backporting seems viable to me

@deeky666
Copy link
Member Author

@guilhermeblanco @Ocramius the test suite is still failing because ORM 2.4 branch uses DBAL ~2.4 as dependency in composer which currently fetches tag 2.4.2. Therefore the related DBAL 2.4 backport is not included which is mandatory for this backport PR to work. Shouldn't ORM's composer.json contain an extra entry in require-dev that fetches the according maintenance branch instead of the latest stable release?

@Ocramius
Copy link
Member

Shouldn't ORM's composer.json contain an extra entry in require-dev that fetches the according maintenance branch instead of the latest stable release?

There's no way to use require-dev to bump dependencies as far as I know, and even if there was, this would be trouble.

@Ocramius Ocramius self-assigned this Nov 11, 2014
@Ocramius
Copy link
Member

@deeky666 re-running the tests here, as a new DBAL version has already been released (v2.4.3)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants