summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
* Tweak uncaught exception message displayNikita Popov2015-05-176-6/+6
| | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions.
* Display EngineExceptions like ordinary exceptionsNikita Popov2015-05-156-6/+26
| | | | | | | | | TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup.
* Use zend_string to represent pdo_column_data.name and avoid duplication.Dmitry Stogov2015-05-051-5/+2
|
* Always throw TypeException on throwing zpp failuresNikita Popov2015-04-062-2/+2
| | | | | | | | | | | | | | Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to report FAILURE errors using a TypeException instead of a Warning, like it would happen in strict mode. Adds a zend_parse_parameters_throw() convenience function, which invokes zpp with this flag. Converts all cases I could identify, where we currently have throwing zpp usage in constructors and replaces them with this API. Error handling is still replaced to EH_THROW in some cases to handle other, domain-specific errors in constructors.
* Try fixing PDO MySQL pconnect testNikita Popov2015-04-041-0/+3
| | | | | | | | | Use less aggressive conversion to exceptions, in particular do not convert warnings that happen during check_liveness. If the server has gone away this will just reconnect and we still end up with a valid connection, so it shouldn't throw. Also drop some unnecessary checks for malloc returning NULL.
* Merge branch 'PHP-5.6'Ferenc Kovacs2015-04-021-1/+1
|\ | | | | | | | | * PHP-5.6: sigh, can't even copypaste without screwing up
| * Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2015-04-021-1/+1
| |\ | | | | | | | | | | | | * PHP-5.5: sigh, can't even copypaste without screwing up
| | * sigh, can't even copypaste without screwing upFerenc Kovacs2015-04-021-1/+1
| | |
* | | Merge branch 'PHP-5.6'Ferenc Kovacs2015-04-011-0/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: oop, put both the error number and message for both db object to the error message
| * | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2015-04-011-0/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: oop, put both the error number and message for both db object to the error message
| | * oop, put both the error number and message for both db object to the error ↵Ferenc Kovacs2015-04-011-0/+2
| | | | | | | | | | | | message
* | | Merge branch 'PHP-5.6'Ferenc Kovacs2015-04-011-3/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: test fixes
| * | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2015-04-011-3/+3
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: test fixes
| | * test fixesFerenc Kovacs2015-04-011-3/+3
| | |
* | | Patch improvement:Dmitry Stogov2015-03-303-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | Removed the corresponding core code. Fixed ext/com_dotnet and ext/date. Refactored ext/intl changes. Improved ext/fileinfo and ext/pdo changes. Fixed tests.
* | | cleanup mod version macros, round 3Anatol Belski2015-03-232-1/+4
| | |
* | | Errors converted to exceptions are not "recoverable" anymore.Dmitry Stogov2015-03-104-4/+4
| | |
* | | Like Shady, --with-mysql-sock is back.Adam Harvey2015-03-051-0/+12
| | | | | | | | | | | | As Matteo pointed out, MySQLi and PDO_MySQL both rely on this.
* | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-162-3/+3
| | | | | | | | | | | | which also comply with the current semantics for such macros
* | | Look for PDO include files in the right folderMaxime BESSON2015-02-061-2/+2
| | | | | | | | | | | | | | | | | | Configure scripts for extensions look for PDO include files in $prefix/include/php. This change makes them look into $phpincludedir instead, which may be different from $prefix/include/php.
* | | size_t cleanup for PDOStanislav Malyshev2015-01-262-12/+12
| | |
* | | Merge branch 'PHP-5.6'Anatol Belski2015-01-151-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS updated NEWS PDO_MySQL: Differentiate between linux and win32 when passing unix_socket Conflicts: ext/pdo_mysql/mysql_driver.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-151-3/+8
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.5: updated NEWS PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
| | * PDO_MySQL: Differentiate between linux and win32 when passing unix_socketsteffen2015-01-151-3/+8
| | | | | | | | | | | | | | | | | | Unix uses "127.0.0.1" as default host for named pipes, while when using Windows a "." is required as host by mysqlnd. (This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
| | * Bump yearXinchen Hui2015-01-155-5/+5
| | |
| * | bump yearXinchen Hui2015-01-155-5/+5
| | |
* | | bump yearXinchen Hui2015-01-155-5/+5
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-105-247/+247
| | |
* | | Merge branch 'PHP-5.6'Matteo Beccati2015-01-051-10/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Update test after fixing bug #68371
| * | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-051-10/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Update test after fixing bug #68371
| | * Update test after fixing bug #68371Matteo Beccati2015-01-051-10/+2
| | |
* | | Merge branch 'PHP-5.6'Matteo Beccati2015-01-052-0/+102
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
| * | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-052-0/+102
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
| | * Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵Matteo Beccati2015-01-052-0/+102
| | |\ | | | | | | | | | | | | attribute names
| | | * Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵Matteo Beccati2014-11-102-0/+102
| | | | | | | | | | | | | | | | attribute names
* | | | Use "float" and "integer" in typehint and zpp errorsAndrea Faulds2014-12-211-1/+1
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-134-76/+76
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-066-6/+369
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (35 commits) Fixed bug #68398 msooxml matches too many archives Fix zpp call in apache_getenv() Drop unnecessary zval containers fixed test C89 compat add include for missing localeconv_r proto updated NEWS Fixed bug #65230 setting locale randomly broken Fix compilation error (ref #68424) Removed useless handlers Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers. Revert unintentional docblock change Restored zip/oci8 PHP 4 code, add PHP 7 checks Note macro removal in UPGRADING.INTERNALS Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) Zend Engine 3 Updated NEWS Updated NEWS Updated NEWS Start adding new attribute to control multi statements ...
| * \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-12-061-4/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: C89 compat add include for missing localeconv_r proto
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-061-4/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: C89 compat add include for missing localeconv_r proto
| | | * | C89 compatAnatol Belski2014-12-061-4/+5
| | | | |
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-12-061-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.5: Fix compilation error (ref #68424)
| | | * | Fix compilation error (ref #68424)Matteo Beccati2014-12-061-2/+2
| | | | |
| * | | | Merge branch 'PHP-5.6'Julien Pauli2014-12-056-4/+366
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS Updated NEWS Start adding new attribute to control multi statements
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-056-4/+366
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Start adding new attribute to control multi statements
| | | * | Start adding new attribute to control multi statementspwolanin2014-12-056-4/+366
| | | |/
| | * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-261-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-2/+2
| | | |
* | | | converted ext/sqlite and ext/pdo_mysql to use static tsrmls cacheAnatol Belski2014-10-164-3/+12
|/ / /
View Lorry Controller Status