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 error handling in mysqli driver #752

Merged
merged 1 commit into from
Dec 31, 2014
Merged

Fix error handling in mysqli driver #752

merged 1 commit into from
Dec 31, 2014

Conversation

nicolas-grekas
Copy link
Member

PHP already handles an internal stack of error handlers

@doctrinebot
Copy link

Hello,

thank you for creating this pull request. I have automatically opened an issue
on our Jira Bug Tracker for you. See the issue link:

http://www.doctrine-project.org/jira/browse/DBAL-1088

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

@stof
Copy link
Member

stof commented Dec 19, 2014

👍

@deeky666
Copy link
Member

@nicolas-grekas looks good to me but travis is failing now for mysqli. Can you please investigate?

@deeky666 deeky666 self-assigned this Dec 24, 2014
@nicolas-grekas nicolas-grekas changed the title Fix error handling restore Fix error handling in mysqli driver Dec 29, 2014
@nicolas-grekas
Copy link
Member Author

Tests are back to green for mysqli. Failure was related to a bug in MysqliStatement that is also fixed by this PR now.

@@ -300,7 +300,7 @@ public function fetchColumn($columnIndex = 0)
return false;
}

return $row[$columnIndex];
return isset($row[$columnIndex]) ? $row[$columnIndex] : null;
Copy link
Member

Choose a reason for hiding this comment

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

This other changed code-path requires a test case

Copy link
Member Author

Choose a reason for hiding this comment

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

There is one: the one that was failing before the patch :)

Copy link
Member

Choose a reason for hiding this comment

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

And it was explicitly testing for non-existing $columnIndex?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes...

Copy link
Member

Choose a reason for hiding this comment

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

Alright then :-)

@nicolas-grekas I'm always this paranoid just to make sure ;-)

Copy link
Member

Choose a reason for hiding this comment

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

@Ocramius @nicolas-grekas is right, there were tests introduced in #709. What is weird is that the tests were not failing in that PR already oO.

Copy link
Member

Choose a reason for hiding this comment

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

@deeky666 if the error handler kicked in, then of course the tests passed :)

Copy link
Member

Choose a reason for hiding this comment

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

@Ocramius but temporarily disabling the error handler is just for grabbing connection errors, no? It is restored afterwards anyways so failing queries are not affected by this or am I getting something wrong here?

Copy link
Member Author

Choose a reason for hiding this comment

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

It was not restored correctly before the patch. The side effect of this bug was that the silencing error handler was still in place. Thus, all later errors were silenced.

Copy link
Member

Choose a reason for hiding this comment

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

@nicolas-grekas I see. Thought it was just a "cleaner" implementation. So merging then. Thanks a lot! :)

@Ocramius
Copy link
Member

@deeky666 mergeable! :shipit:

deeky666 added a commit that referenced this pull request Dec 31, 2014
@deeky666 deeky666 merged commit 6d766f6 into doctrine:master Dec 31, 2014
@nicolas-grekas nicolas-grekas deleted the fix-error-handling branch December 31, 2014 13:09
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 24, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants