Implement our own error handler for db2_prepare #273

akrabat · 2017-10-13T10:02:32Z

db2_prepare() may issue a warning in addition to returning false.
If you have an error handler set (e.g. in the Expressive pipeline) then
the message created is "db2_prepare(): Statement Prepare Failed" which
is not helpful.

Therefore, we create our own error handler and trap this ourselves so
that we can throw an ErrorException with more information from
db2_stmt_errormsg().

I've left the previous handling as I don't know PHP extension code well enough to be 100% sure that db2_prepare() always generates a warning when it returns false.

Ocramius · 2017-10-13T10:04:30Z

@akrabat you know exactly what I'm gonna ask you :-P

akrabat · 2017-10-13T14:12:22Z

I can't run the integration tests against this client's IBM i DB2 and don't have my own, so unclear how to run them…

Ocramius · 2017-10-13T14:13:04Z

Yeah, I know the scenario very well, but we're also not merging anything without verification, sorry...

akrabat · 2017-10-13T14:13:07Z

Travis error is:

PHP Parse error:  syntax error, unexpected ':', expecting ';' or '{' in /home/travis/build/zendframework/zend-db/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php on line 95

Thoughts on how to fix?

Ocramius · 2017-10-13T14:14:12Z

@akrabat I think the wrong composer.lock was committed to this repository

michalbundyra · 2017-10-13T14:18:01Z

@Ocramius @akrabat tests on travis should works despite of committed composer.lock, maybe #259 will help

BTW currently we don't have composer.lock in zend-db at all

Ocramius · 2017-10-13T14:21:50Z

Hmm, not sure how this was installed during the composer update step

michalbundyra · 2017-10-13T14:23:24Z

@Ocramius
composer install --no-interaction --ignore-platform-reqs

https://travis-ci.org/zendframework/zend-db/jobs/287492129#L568
https://github.com/zendframework/zend-db/blob/master/.travis.yml#L81

--ignore-platform-reqs !!!

michalbundyra · 2017-10-13T14:24:27Z

@Ocramius and maybe composer.lock is cached on travis?

db2_prepare() may issue a [warning][1] in addition to returning false. If you have an error handler set (e.g. in the Expressive pipeline) then the message created is "db2_prepare(): Statement Prepare Failed" which is not helpful. Therefore, we create our own error handler and trap this ourselves so that we can throw an ErrorException with more information from db2_stmt_errormsg(). [1]: https://github.com/php/pecl-database-ibm_db2/blob/df913feb4dff56366ac4656b0bb6b39200794bde/ibm_db2.c#L4400

samsonasik · 2017-10-13T17:43:01Z

src/Adapter/Driver/IbmDb2/Statement.php

+     *
+     * @return callable
+     */
+    private function createErrorHandler() : callable


zend-db still use php 5.5/5.6 so the return type won't work

samsonasik · 2017-10-13T17:43:29Z

src/Adapter/Driver/IbmDb2/Statement.php

+         * @return void
+         * @throws ErrorException if error is not within the error_reporting mask.
+         */
+        return function (int $errno, string $errstr, string $errfile, int $errline) : void {


remove return type as well

also, int and string type hint not supported in php 5.5/5.6

samsonasik · 2017-10-13T17:44:36Z

src/Adapter/Driver/IbmDb2/Statement.php

+        try {
+            set_error_handler($this->createErrorHandler());
+            $this->resource = db2_prepare($this->db2, $sql);
+        } catch (Throwable $e) {


should catch Exception for php 5.5/5.6 fallback as well ?

No - in 5.6, nothing is thrown.

akrabat · 2017-10-13T18:30:42Z

@Ocramius: Added an integration test. I can't prove it works on every IBM DB2 installation out there, but it does on one specific IBMI I:

$ vendor/phpunit/phpunit/phpunit test/Adapter/Driver/IbmDb2/StatementIntegrationTest.php
PHPUnit 4.8.36 by Sebastian Bergmann and contributors.

.....

Time: 1.58 seconds, Memory: 4.00MB

OK (5 tests, 8 assertions)

akrabat · 2017-10-13T18:38:24Z

@samsonasik Addressed your comments.

michalbundyra · 2017-10-14T17:41:26Z

test/Adapter/Driver/IbmDb2/StatementIntegrationTest.php

@@ -86,6 +87,23 @@ public function testPrepare()
    }

    /**
+     * @covers Zend\Db\Adapter\Driver\IbmDb2\Statement::prepare
+     * @expectedException RuntimeException


I would move it to function use, because right now it's not clear, which line should thrown that exception.

@webimpress I can't - it doesn't work on the AS/400 when I do that. I have no idea why.

Hm... so maybe exception is thrown not where you expecting it?

It was a PHP error. I'll have another look when I'm next connected to that computer.

akrabat · 2017-10-16T14:17:05Z

@webimpress Dunno what I did wrong last time, but it works this time!

$ vendor/phpunit/phpunit/phpunit  test/Adapter/Driver/IbmDb2/StatementIntegrationTest.php
PHPUnit 4.8.36 by Sebastian Bergmann and contributors.

.....

Time: 1.71 seconds, Memory: 4.00MB

michalbundyra · 2017-10-16T18:28:21Z

test/Adapter/Driver/IbmDb2/StatementIntegrationTest.php

+        $statement->initialize($db2Resource);
+        $this->setExpectedException(RuntimeException::class);
+        $statement->prepare("SELECT");
+        unset($resource, $db2Resource);


I think this line will be not even hit.

It will if the test fails :)

mwillbanks

Looks like everything is addressed 👍

mwillbanks · 2017-10-20T02:42:50Z

@akrabat can you see if you can solve the coveralls although?

akrabat · 2017-10-20T06:34:00Z

can you see if you can solve the coveralls although?

@mwillbanks The coveralls problem is that I've added new code that is covered by an integration test rather than a unit test.

That's what the error handler throws.

Mock the relevant db2_xxx functions by placing them into the Zend\Db\Adapter\Driver\IbmDb2 namespace so that they are preferred over the actual ones in the idm_db2 extension.

akrabat · 2017-10-20T08:05:13Z

@mwillbanks Thought some more and then wrote some unit tests.

ezimuel · 2017-11-23T13:40:10Z

@akrabat thanks for your contribution!

akrabat added 2 commits October 13, 2017 18:02

Add integration test

ddec03b

akrabat force-pushed the ibmdb2-error-improvement branch from 7c54f1e to ddec03b Compare October 13, 2017 17:03

samsonasik reviewed Oct 13, 2017

View reviewed changes

akrabat added 2 commits October 13, 2017 19:28

Remove PHP 7 type hints

50e1286

Make integration tests work on IBM i

192d30d

michalbundyra reviewed Oct 14, 2017

View reviewed changes

Use setExpectedException

c54f5e2

michalbundyra reviewed Oct 16, 2017

View reviewed changes

Remove code never called in test

b4db349

mwillbanks approved these changes Oct 20, 2017

View reviewed changes

froschdesign added the enhancement label Oct 20, 2017

akrabat added 2 commits October 20, 2017 08:30

Catch ErrorException

ac5e8e0

That's what the error handler throws.

Unit test Adapter\Driver\IbmDb2\Statement::prepare()

e493cda

Mock the relevant db2_xxx functions by placing them into the Zend\Db\Adapter\Driver\IbmDb2 namespace so that they are preferred over the actual ones in the idm_db2 extension.

akrabat added 2 commits October 20, 2017 08:45

Reset error_reporting() value in tearDown

c7d834d

Fix cs-check error

984e355

ezimuel merged commit 984e355 into zendframework:develop Nov 23, 2017

Implement our own error handler for db2_prepare #273

Implement our own error handler for db2_prepare #273

Uh oh!

Conversation

akrabat commented Oct 13, 2017

Uh oh!

Ocramius commented Oct 13, 2017

Uh oh!

akrabat commented Oct 13, 2017

Uh oh!

Ocramius commented Oct 13, 2017

Uh oh!

akrabat commented Oct 13, 2017

Uh oh!

Ocramius commented Oct 13, 2017

Uh oh!

michalbundyra commented Oct 13, 2017

Uh oh!

Ocramius commented Oct 13, 2017

Uh oh!

michalbundyra commented Oct 13, 2017

Uh oh!

michalbundyra commented Oct 13, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samsonasik Oct 13, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akrabat commented Oct 13, 2017

Uh oh!

akrabat commented Oct 13, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akrabat commented Oct 16, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mwillbanks left a comment

Choose a reason for hiding this comment

Uh oh!

mwillbanks commented Oct 20, 2017

Uh oh!

akrabat commented Oct 20, 2017

Uh oh!

akrabat commented Oct 20, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ezimuel commented Nov 23, 2017

Uh oh!

Uh oh!

samsonasik Oct 13, 2017 •

edited

Loading

akrabat commented Oct 20, 2017 •

edited

Loading