summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
* Fix intermittent error in pdo_mysql___construct_options.phptNikita Popov2019-12-062-10/+1
| | | | For the love of god, don't write tests based on mt_rand!
* Make test more robustChristoph M. Becker2019-11-041-2/+5
| | | | | | Time flies, so obviously the reported uptime may differ a bit (as already occasionally noticed on CI); we cater to that by allowing a delay of up to one second.
* Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-10-074-2/+8
|\ | | | | | | | | * PHP-7.3: Fix #78623: Regression caused by "SP call yields additional empty result set"
| * Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-074-2/+8
| |\ | | | | | | | | | | | | * PHP-7.2: Fix #78623: Regression caused by "SP call yields additional empty result set"
| | * Fix #78623: Regression caused by "SP call yields additional empty result set"Christoph M. Becker2019-10-074-2/+8
| | | | | | | | | | | | This reverts commit 41a4379cb45419a376043ca5f8c5a2bca82cea7c.
* | | Fix borked SKIPIFsFabien Villepinte2019-09-3010-20/+20
| | |
* | | Fix double free of DSN credentialsNikita Popov2019-09-091-2/+2
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-09-034-8/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #41997: SP call yields additional empty result set
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-034-8/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix #41997: SP call yields additional empty result set
| | * Fix #41997: SP call yields additional empty result setChristoph M. Becker2019-09-034-8/+2
| | | | | | | | | | | | | | | | | | | | | When stored procedures are called, the "final result set is a status result that includes no result set". Calling `::nextRowset()` on the actual last result set should return FALSE, since there is actually no further result set to be processed.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-08-201-0/+58
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: fix the problem for connect_attr, set db condition, and add a new attribute _server_host
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-08-201-0/+58
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: fix the problem for connect_attr, set db condition, and add a new attribute _server_host
| | * fix the problem for connect_attr, set db condition, and add a new attribute ↵Qianqian Bu2019-08-201-0/+58
| | | | | | | | | | | | _server_host
* | | Cleanup of remaining E_STRICT in testsGeorge Peter Banyard2019-07-231-6/+2
| | |
* | | Remove PHP_MYSQL variablePeter Kokot2019-07-141-8/+7
| | | | | | | | | | | | | | | | | | PHP_MYSQL variable was once defined by the ext/mysql (--with-mysql). Closes GH-4399
* | | Simplify PHP_CHECK_PDO_INCLUDES callsPeter Kokot2019-07-081-16/+1
| | | | | | | | | | | | | | | | | | | | | Conditional checks were once used for backwards compatibility with phpize from PHP versions that didn't have this macro call yet. Closes GH-4376
* | | PDO: support username & password specified in DSNSjon Hortensius2019-07-021-3/+13
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-071-1/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-06-071-1/+4
| |\ \ | | |/
| | * Enable STRICT_TRANS_TABLES in new testNikita Popov2019-06-071-1/+4
| | | | | | | | | | | | The part testing error cases relies on this.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-073-4/+302
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-06-073-4/+302
| |\ \ | | |/
| | * Fixed bug #38546Cameron Porter2019-06-073-4/+302
| | | | | | | | | | | | | | | | | | Properly support binding boolean parameters with emulated prepared statements disabled. Also add the necessary mysqlnd support for MYSQL_TYPE_TINY.
* | | [ci skip] Migrate tests READMEs to MarkdownPeter Kokot2019-05-122-16/+33
| | |
* | | Normalize comments in *nix build system m4 filesPeter Kokot2019-05-121-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Normalization include: - Use dnl for everything that can be ommitted when configure is built in favor of the shell comment character # which is visible in the output. - Line length normalized to 80 columns - Dots for most of the one line sentences - Macro definitions include similar pattern header comments now
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-04-292-89/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix tests
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-04-292-89/+7
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix tests
| | * Fix testsChristoph M. Becker2019-04-292-89/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests are obviously meant to test successful and failing uri: DSNs, but did not pass proper file:// URIs, so actually ended up testing for invalid data source URIs twice. We fix this, and adjust the expectations accordingly. We also unfork the -win32 variant, since both test cases are almost identical, and the expected error message may be either one.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-04-282-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Make MySQLPDOTest::extractVersion() more liberal
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-04-282-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Make MySQLPDOTest::extractVersion() more liberal
| | * Make MySQLPDOTest::extractVersion() more liberalChristoph M. Becker2019-04-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL/MariaDB version strings may have suffixes which may contain dots; for instance, Debian stretch has 5.5.5-10.1.37-MariaDB-0+deb9u1 or such. Therefore, we make the version extraction more liberal, and only require that there are at least three parts separated by dot, and ignore additional parts. We also fix an erroneous test expectation, which would be triggered on CI now, right away. This patch has been provided by petk@.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-04-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #77944: Wrong meta pdo_type for bigint on LLP64
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-04-271-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix #77944: Wrong meta pdo_type for bigint on LLP64
| | * Fix #77944: Wrong meta pdo_type for bigint on LLP64Christoph M. Becker2019-04-271-1/+1
| | | | | | | | | | | | | | | | | | When actually fetching the data, bigint (unsigned) column values are returned as integers on LLP64 architectures, so their pdo_type has to be PDO::PARAM_INT accordingly.
* | | Replace dirname(__FILE__) by __DIR__ in testsFabien Villepinte2019-03-15120-446/+446
| | |
* | | Use EXPECT when possibleGabriel Caruso2019-03-112-2/+2
| | | | | | | | | | | | EXPECTF logic in run-tests.php is considerable, so let's avoid it.
* | | Add AS_HELP_STRING to *nix build configure optionsPeter Kokot2019-03-071-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | The Autoconf's default AS_HELP_STRING macro can properly format help strings [1] so watching out if columns are aligned manually is not anymore. [1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings
* | | Remove unused PDO_MYSQL_LIB_CHK m4 macroPeter Kokot2019-02-211-10/+0
| | | | | | | | | | | | | | | | | | This was once used by the ext/mysql extension named as MYSQL_LIB_CHK. The call got removed via fd1578c196575c7e120a84ee030bb87c14a199b0. In PDO this is not called anymore and can be removed.
* | | Implement fine-grained conflict handlingNikita Popov2019-02-201-0/+1
| | | | | | | | | | | | | | | | | | Tests can specify conflict keys, either in --CONFLICTS-- or a per-directory CONFLICTS file. Non-conflicting tests may be run in parallel.
* | | Merge branch 'PHP-7.3' into PHP-7.4Darek Slusarczyk2019-02-114-3/+69
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Darek Slusarczyk2019-02-114-3/+69
| |\ \ | | |/
| | * Merge branch 'PHP-7.1' into PHP-7.2Darek Slusarczyk2019-02-114-3/+69
| | |\
| | | * security fix - by default 'local infile' is disabled:Darek Slusarczyk2019-02-114-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - set default for mysqli.allow_local_infile=0 - explicitly disable PDO::MYSQL_ATTR_LOCAL_INFILE in case of lack of driver options - add getAttribute support for PDO::MYSQL_ATTR_LOCAL_INFILE - update existing tests where needed - add new tests [checking default value and setting on] the 'local infile' in ext/mysqli and ext/pdo_mysql
| | | * Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-1540-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| | | * Trim trailing whitespace in *.phptPeter Kokot2018-10-149-20/+20
| | | |
| | | * Sync leading and final newlines in source code filesPeter Kokot2018-10-143-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| | | * Trim trailing whitespace in source code filesPeter Kokot2018-10-134-8/+8
| | | |
| | | * Convert CRLF line endings to LFPeter Kokot2018-10-131-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
| | * | Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-1540-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| | * | Trim trailing whitespace in *.phptPeter Kokot2018-10-149-20/+20
| | | |