Merge branch 'PHP-7.4'

* PHP-7.4:
  Report len as -1 instead of INT_MAX
This commit is contained in:
Nikita Popov 2020-06-03 10:17:27 +02:00
commit 3f6a212be7
2 changed files with 2 additions and 2 deletions

View file

@ -284,7 +284,7 @@ static int pdo_sqlite_stmt_describe(pdo_stmt_t *stmt, int colno)
str = sqlite3_column_name(S->stmt, colno); str = sqlite3_column_name(S->stmt, colno);
stmt->columns[colno].name = zend_string_init(str, strlen(str), 0); stmt->columns[colno].name = zend_string_init(str, strlen(str), 0);
stmt->columns[colno].maxlen = 0xffffffff; stmt->columns[colno].maxlen = SIZE_MAX;
stmt->columns[colno].precision = 0; stmt->columns[colno].precision = 0;
switch (sqlite3_column_type(S->stmt, colno)) { switch (sqlite3_column_type(S->stmt, colno)) {

View file

@ -24,7 +24,7 @@ array(6) {
["name"]=> ["name"]=>
string(1) "1" string(1) "1"
["len"]=> ["len"]=>
int(4294967295) int(-1)
["precision"]=> ["precision"]=>
int(0) int(0)
["pdo_type"]=> ["pdo_type"]=>