From 1909c98e6d3fe25a3e99cbfad1772dd21058c2c5 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Tue, 17 Apr 2018 12:24:00 +0200 Subject: [PATCH] Sqlite3Driver: for SQLite 3 is not needed to strip [] from column names --- src/Dibi/Drivers/Sqlite3Driver.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php index a02c334b..3ca94df9 100644 --- a/src/Dibi/Drivers/Sqlite3Driver.php +++ b/src/Dibi/Drivers/Sqlite3Driver.php @@ -401,15 +401,12 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver { $row = $this->resultSet->fetchArray($assoc ? SQLITE3_ASSOC : SQLITE3_NUM); $charset = $this->charset === null ? null : $this->charset . '//TRANSLIT'; - if ($row && ($assoc || $charset)) { - $tmp = []; + if ($row && $charset) { foreach ($row as $k => $v) { - if ($charset !== null && is_string($v)) { - $v = iconv($this->dbcharset, $charset, $v); + if (is_string($v)) { + $row[$k] = iconv($this->dbcharset, $charset, $v); } - $tmp[str_replace(['[', ']'], '', $k)] = $v; } - return $tmp; } return $row; }