Merge branch '2'

This commit is contained in:
Sam Minnee 2019-04-12 09:45:10 +12:00
commit 1b55ffaaf6

View File

@ -81,9 +81,15 @@ class PostgreSQLQuery extends Query
$record[$k] = $v; $record[$k] = $v;
$type = pg_field_type($this->handle, $i); $type = pg_field_type($this->handle, $i);
if (isset(self::$typeMapping[$type])) { if (isset(self::$typeMapping[$type])) {
if ($type === 'bool' && $record[$k] === 't') {
$record[$k] = 1;
// Note that boolean 'f' will be converted to 0 by this
} else {
settype($record[$k], self::$typeMapping[$type]); settype($record[$k], self::$typeMapping[$type]);
} }
} }
}
return $record; return $record;
} }