diff options
author | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:50:43 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:50:43 +0200 |
commit | 1db998348e8850db79c4afa2d057fa31fb6bc12c (patch) | |
tree | 5e334c1b82e8be12799b729a0234f8cc0f19bb74 /system/database/drivers/mysqli/mysqli_utility.php | |
parent | 4b9d8f2fa62b62616d2d1043a6faa39d40989070 (diff) | |
parent | 4131d42c793c3db50b6184e5084332d5415c91cb (diff) |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_utility.php')
-rw-r--r-- | system/database/drivers/mysqli/mysqli_utility.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index 4a3dad4d1..1699b611f 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -155,9 +155,11 @@ class CI_DB_mysqli_utility extends CI_DB_utility { while ($field = $query->result_id->fetch_field()) { // Most versions of MySQL store timestamp as a string - $is_int[$i] = in_array(strtolower($field->type), - array('tinyint', 'smallint', 'mediumint', 'int', 'bigint'), //, 'timestamp'), - TRUE); + $is_int[$i] = ($field->type & MYSQLI_TYPE_TINY) + OR ($field->type & MYSQLI_TYPE_SHORT) + OR ($field->type & MYSQLI_TYPE_INT24) + OR ($field->type & MYSQLI_TYPE_LONG) + OR ($field->type & MYSQLI_TYPE_LONGLONG); // Create a string of field names $field_str .= $this->db->escape_identifiers($field->name).', '; |