]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 10:03:50 +0000 (11:03 +0100)
committerMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 10:03:50 +0000 (11:03 +0100)
* PHP-5.6:
  Updated NEWS for #68371
  Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES

1  2 
ext/pdo_pgsql/pgsql_driver.c

index ce8f678454df6b8a4b2a03db5df6521e8ed20052,557d57131f6b71aea84f3a89ac124322e6d3466a..8621b3673a01940190d2ce9ac9e4eb6af67d157a
@@@ -391,8 -388,12 +391,12 @@@ static int pdo_pgsql_get_attribute(pdo_
                        ZVAL_BOOL(return_value, H->disable_native_prepares);
                        break;
  
+               case PDO_PGSQL_ATTR_DISABLE_PREPARES:
+                       ZVAL_BOOL(return_value, H->disable_prepares);
+                       break;
                case PDO_ATTR_CLIENT_VERSION:
 -                      ZVAL_STRING(return_value, PG_VERSION, 1);
 +                      ZVAL_STRING(return_value, PG_VERSION);
                        break;
  
                case PDO_ATTR_SERVER_VERSION: