felipe                                   Mon, 21 Jun 2010 21:38:35 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300637

Log:
- Fixed bug #49730 (Firebird - new PDO() returns NULL)

Bug: http://bugs.php.net/49730 (Open) Firebird - new PDO() returns NULL in CLI
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2010-06-21 17:38:21 UTC (rev 300636)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-06-21 21:38:35 UTC (rev 300637)
@@ -4,6 +4,7 @@
 - Fixed bug #52061 (memory_limit above 2G). (Felipe)
 - Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command).
   (Ilia, Felipe)
+- Fixed bug #49730 (Firebird - new PDO() returns NULL). (Felipe)

 17 Jun 2010, PHP 5.2.14RC1
 - Upgraded bundled PCRE to version 8.02. (Ilia)

Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c     
2010-06-21 17:38:21 UTC (rev 300636)
+++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c     
2010-06-21 21:38:35 UTC (rev 300637)
@@ -648,6 +648,14 @@
                        efree(vars[i].optval);
                }
        }
+
+       if (!dbh->methods) {
+               char errmsg[512];
+               ISC_STATUS *s = H->isc_status;
+               isc_interprete(errmsg, &s);
+               zend_throw_exception_ex(php_pdo_get_exception(), 
H->isc_status[1] TSRMLS_CC, "SQLSTATE[%s] [%d] %s",
+                               "HY000", H->isc_status[1], errmsg);
+       }

        if (!ret) {
                firebird_handle_closer(dbh TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to