archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
99637 commits 526 branches 1434 tags 881 MiB
Commit graph

186 commits

Author SHA1 Message Date
Adam Baratz
3d321a4aa4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  Ignore potentially misleading dberr values
 2016-09-26 17:13:14 -04:00
Chris Kings-Lynne
48b5a1f9b9 Ignore potentially misleading dberr values 
FreeTDS had a buggy behavior where it would pass invalid values:
https://sourceforge.net/p/freetds/bugs/59/

The fix for this issue -- bc22b2ef817fb5d102bd758111ff3634b39a1319 on their
repo -- was to always use SYBESMSG for dberr. This makes it so the existing
pdo_dblib code would work as is. But by ignoring the dberr value in this
function, it will behave correctly, even with older versions of FreeTDS.
 2016-09-26 17:07:46 -04:00
Adam Baratz
e14636f4bd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Limit size of result set for test query
 2016-09-21 16:23:58 -04:00
Adam Baratz
d334d319f0 Limit size of result set for test query 
This result set can be very large, depending on the database. This change
ensures this test won't be slow.
 2016-09-21 16:21:33 -04:00
Adam Baratz
5ab064caed Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  PHP bug 67130: nextRowset should work with unfetched rows
 2016-09-21 15:15:18 -04:00
Peter LeBrun
dfd6baee0c PHP bug 67130: nextRowset should work with unfetched rows 2016-09-21 14:27:23 -04:00
Adam Baratz
7726151aa8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move dtor before memory freed to avoid invalid read
 2016-09-21 12:02:17 -04:00
Adam Baratz
b29ad29b91 Move dtor before memory freed to avoid invalid read 2016-09-21 12:00:19 -04:00
Adam Baratz
2f99f702b7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip test for early TDS versions
 2016-09-14 11:07:26 -04:00
Adam Baratz
f559fb7556 Skip test for early TDS versions 2016-09-14 11:06:54 -04:00
Adam Baratz
f6b6e97b29 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add special case for earlier versions of TDS
  Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
  Free error and message strings when cleaning up PDO instances that use pdo_dblib
  Add common suite
 2016-09-13 17:02:53 -04:00
Adam Baratz
0de333bd62 Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib 2016-09-13 16:43:33 -04:00
Adam Baratz
69eef8c361 Free error and message strings when cleaning up PDO instances that use pdo_dblib 2016-09-13 16:43:30 -04:00
Adam Baratz
efadcb0390 Add common suite 2016-09-13 16:43:25 -04:00
Adam Baratz
c02ff02953 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions
 2016-09-13 16:33:18 -04:00
Adam Baratz
91c49c4ab0 Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions 2016-09-13 16:32:37 -04:00
Adam Baratz
421f654874 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Allow \PDO::setAttribute() to set pdo_dblib query timeouts
 2016-09-13 16:14:55 -04:00
Adam Baratz
9cdf2042bd Allow \PDO::setAttribute() to set pdo_dblib query timeouts 2016-09-13 16:13:26 -04:00
Adam Baratz
76af2def79 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Never quote values as raw binary data
 2016-09-12 17:44:33 -04:00
Adam Baratz
2302eef5c9 Never quote values as raw binary data 
This reverts a1a18fca6e which was intended to fix
bug #52885. That commit introduced a BC break which wasn't universally
desirable. The issue of quoting binary data (or NVARCHAR strings, or other
nonstandard types) will have to be addressed separately.
 2016-09-12 17:32:50 -04:00
Stanislav Malyshev
f57c059b96 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:21 -07:00
Stanislav Malyshev
b5f9427ca9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:18 -07:00
Stanislav Malyshev
cee363d609 Merge branch 'pull-request/2061' into PHP-5.6 
* pull-request/2061:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:11 -07:00
Stanislav Malyshev
498e36294e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use integer placeholders, since values can vary with the TDS version
 2016-09-05 00:19:34 -07:00
Stanislav Malyshev
54f6c8d6df Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use integer placeholders, since values can vary with the TDS version
 2016-09-05 00:19:26 -07:00
Adam Baratz
84d495055d Use integer placeholders, since values can vary with the TDS version 2016-09-05 00:17:59 -07:00
Anatol Belski
726e3b8ff0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  pdo_dblib: stringify uniqidentifier field
 2016-08-25 19:46:01 +02:00
Alexander Zhuravlev
a000bff2c3 pdo_dblib: stringify uniqidentifier field 
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

pdo_dblib: Stringify uniqidentifier field

Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

Tests added.

pdo_dblib: Stringify uniqidentifier field

Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

Tests fix.

pdo_dblib: Stringify uniqueidentifier field Added separate PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER attribute instead of PDO::ATTR_STRINGIFY_FETCHES.

pdo_dblib: Stringify uniqueidentifier field Added `getAttribute` support for PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER.

Simplify storage of stringify_uniqueidentifier attribute
 2016-08-25 19:37:21 +02:00
Lior Kaplan
283ee1f6dc Recognize TDS versions 7.3 and 7.4 2016-08-07 15:15:59 +03:00
Julien Pauli
1097fe03a1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false
 2016-07-08 15:55:22 +02:00
Adam Baratz
8db64e919c Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false 2016-07-08 15:54:52 +02:00
Nikita Popov
cc909a8923 Merge branch 'PHP-7.0' 2016-07-05 16:10:25 +02:00
Adam Baratz
f22bc6438d Use size_t instead of int for loop counter 2016-07-05 16:09:27 +02:00
Anatol Belski
6170b2fbae Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  fix bug #71667 (emulate how mssql extension names "computed" columns)
 2016-04-06 14:45:35 +02:00
Anatol Belski
ea64d290fe fix test 2016-04-06 14:44:23 +02:00
Adam Baratz
ed3edc2f05 fix bug #71667 (emulate how mssql extension names "computed" columns) 2016-04-06 14:41:55 +02:00
Anatol Belski
2267812cd2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  return zvals instead of strings, cast or not based on stringify attribute
 2016-04-06 12:23:14 +02:00
Adam Baratz
1e1500a2bc return zvals instead of strings, cast or not based on stringify attribute 2016-04-06 12:18:53 +02:00
Anatol Belski
fe757f09a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  add skip slow test
 2016-04-06 08:24:09 +02:00
Anatol Belski
354a682c38 fix test 2016-04-06 08:21:10 +02:00
Anatol Belski
fd9137c00c add skip slow test 2016-04-06 08:18:32 +02:00
Adam Baratz
a5e21665ee Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:24:15 +02:00
Adam Baratz
8a92fed532 Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:18:37 +02:00
Anatol Belski
b6e42834ed Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix #71943: dblib_handle_quoter needs to allocate an extra byte
 2016-04-04 17:38:04 +02:00
Adam Baratz
9fcfc18ca9 Fix #71943: dblib_handle_quoter needs to allocate an extra byte 2016-04-04 17:33:49 +02:00
Remi Collet
d45f478454 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix #ifdef usage
 2016-03-16 07:18:23 +01:00
Remi Collet
46293ed6d4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix #ifdef usage
 2016-03-16 07:18:09 +01:00
Remi Collet
478c807128 fix #ifdef usage 2016-03-16 07:17:49 +01:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
James Titcumb
c4b188871e Fix bug #71575 removing extra semicolons outside macros 2016-03-03 16:41:03 +01:00