summaryrefslogtreecommitdiff
path: root/ext/pdo
Commit message (Collapse)AuthorAgeFilesLines
* Bump yearXinchen Hui2014-01-039-9/+9
|
* Merge branch 'PHP-5.5' into PHP-5.6Rasmus Lerdorf2013-11-091-3/+2
|\ | | | | | | | | * PHP-5.5: Fix broken test
| * Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2013-11-091-3/+2
| |\ | | | | | | | | | | | | * PHP-5.4: Fix broken test
| | * Fix broken testRasmus Lerdorf2013-11-091-3/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Rasmus Lerdorf2013-11-073-20/+59
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
| * | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2013-11-073-20/+59
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings Conflicts: ext/pdo/pdo_sql_parser.c
| | * Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to stringsRasmus Lerdorf2013-11-073-21/+60
| | |
* | | Merge branch 'PHP-5.5'Xinchen Hui2013-11-051-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-11-051-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: configure.in ext/mysqlnd/mysqlnd.c main/php_version.h
| | * Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement ↵Xinchen Hui2013-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | throws an exception) I know zend_call_function will initilize retval_ptr_ptr, but still set it to NULL explict is more readable
* | | Implement variadic function syntaxNikita Popov2013-09-261-7/+3
| | | | | | | | | | | | As per RFC: https://wiki.php.net/rfc/variadics
* | | Merge branch 'PHP-5.5'Matteo Beccati2013-08-222-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed other compiler warnings
| * | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2013-08-222-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fixed other compiler warnings
| | * Fixed other compiler warningsMatteo Beccati2013-08-222-2/+2
| | |
* | | Merge branch 'PHP-5.5'Matteo Beccati2013-08-211-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed compiler warnings in ext/pgsql Fixed other compiler warnings in PDO_PGSQL Fixed compiler warning Update NEWS Conflicts: ext/pdo_pgsql/pgsql_driver.c
| * | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2013-08-211-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | * PHP-5.4: Fixed compiler warnings in ext/pgsql Fixed other compiler warnings in PDO_PGSQL Fixed compiler warning
| | * Fixed compiler warningMatteo Beccati2013-08-211-4/+4
| | | | | | | | | | | | | | | | | | | | | I moved the constant to the enum in order to avoid this: ext/pgsql/pgsql.c:3491: warning: comparison is always false due to limited range of data type Works in gcc 4.6, but I'm not sure about other compilers.
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-201-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Quash compile warning "warning: 'flags' may be used uninitialized in this function"
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-201-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Quash compile warning "warning: 'flags' may be used uninitialized in this function"
| | * Quash compile warning "warning: 'flags' may be used uninitialized in this ↵Christopher Jones2013-08-201-1/+1
| | | | | | | | | | | | function"
* | | Merge branch 'PHP-5.5'Michael Wallner2013-08-202-30/+35
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix bug #64953 (Postgres prepared statement positional parameter casting)
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-08-202-30/+35
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #64953 (Postgres prepared statement positional parameter casting) Conflicts: ext/pdo/pdo_sql_parser.c
| | * Fix bug #64953 (Postgres prepared statement positional parameter casting)Michael Wallner2013-08-202-31/+36
| | |
| | * typo fixesVeres Lajos2013-07-151-1/+1
| | |
| * | typo fixesVeres Lajos2013-07-151-1/+1
| | |
* | | typo fixesVeres Lajos2013-07-151-1/+1
| | |
* | | Fixed symbol exportAnatol Belski2013-06-272-2/+2
| | | | | | | | | | | | | | | That's needed for baabd1192973156ac79c35f6d1b0dced4af8e8fb to link properly.
* | | Merge branch 'PHP-5.5'Xinchen Hui2013-06-161-0/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-161-0/+4
| |\ \ | | |/
| | * Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to ↵Xinchen Hui2013-06-161-0/+4
| | | | | | | | | | | | the same db server)
| | * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-06-101-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Merge branch 'pull-request/341' Merge branch 'pull-request/341'
| * | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-06-102-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: typo fixes (argument) typo fixes (accommodate, parameter)
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-102-4/+4
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: typo fixes (argument) typo fixes (accommodate, parameter)
| | * typo fixes (accommodate, parameter)Veres Lajos2013-06-102-4/+4
| | |
* | | Allow PDO drivers custom methods to trigger errors/exceptionsMatteo Beccati2013-06-043-14/+51
|/ / | | | | | | | | | | Moved a few definitions from php_pdo_int.h to a new php_pdo_error.h header file that can be included if drivers need PDO's own error handling to be triggered within custom methods (e.g. PDO::pgsqlLOBOpen).
* | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2013-06-021-1/+8
|\ \ | |/ | | | | | | | | | | * PHP-5.4: Clean up leftover test files Improved test portability so that it doesn't fail with pdo_pgsql Fix PDO::inTransaction() test for pgsql
| * Improved test portability so that it doesn't fail with pdo_pgsqlMatteo Beccati2013-06-021-1/+8
| |
| * Happy New YearXinchen Hui2013-01-019-9/+9
| |
* | Add support for non-scalar Iterator keys in foreachNikita Popov2013-03-121-5/+4
| | | | | | | | RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
* | Fix test related to change for #bug64007 and also fix in newInstanceArgsXinchen Hui2013-01-222-4/+5
| |
* | Happy New YearXinchen Hui2013-01-019-9/+9
| |
* | Invoke re2c with --no-generation-date to prevent unintentional / unnecessary ↵Sebastian Bergmann2012-12-062-2/+2
| | | | | | | | changes in generated files.
* | Merge branch 'PHP-5.4'Xinchen Hui2012-10-101-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-101-0/+0
| |\
| | * Remove executable permission on incXinchen Hui2012-10-101-0/+0
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-105-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-105-0/+0
| |\ \ | | |/
| | * Remove executable permission on phptXinchen Hui2012-10-105-0/+0
| | |