Permalink
Browse files

Backporting from 2.4 fix for booleans in mysql when running PHP 5.5

  • Loading branch information...
lorenzo committed Jul 2, 2013
1 parent 868dc2e commit 58149f23155cd167ac97302978bf2f3fa2a63fc4
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/Cake/Model/Datasource/Database/Mysql.php
@@ -221,10 +221,10 @@ public function resultSet($results) {
while ($numFields-- > 0) {
$column = $results->getColumnMeta($index);
- if (empty($column['native_type'])) {
- $type = ($column['len'] == 1) ? 'boolean' : 'string';
+ if ($column['len'] === 1 && (empty($column['native_type']) || $column['native_type'] === 'TINY')) {
+ $type = 'boolean';
} else {
- $type = $column['native_type'];
+ $type = empty($column['native_type']) ? 'string' : $column['native_type'];
}
if (!empty($column['table']) && strpos($column['name'], $this->virtualFieldSeparator) === false) {
$this->map[$index++] = array($column['table'], $column['name'], $type);

0 comments on commit 58149f2

Please sign in to comment.