mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-04 13:17:58 +02:00
Code Issues Releases Wiki Activity

Sqlite3Driver: removed support for charset conversion (BC break!)

Browse Source
This commit is contained in:
David Grudl
2018-04-17 12:19:48 +02:00
parent 045e45a8c6
commit cb067a6bec
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Dibi/Drivers/Sqlite3Driver.php
View File

@@ -20,8 +20,6 @@ use SQLite3;
* - database (or file) => the filename of the SQLite3 database * - database (or file) => the filename of the SQLite3 database
* - formatDate => how to format date in SQL (@see date) * - formatDate => how to format date in SQL (@see date)
* - formatDateTime => how to format datetime in SQL (@see date) * - formatDateTime => how to format datetime in SQL (@see date)
* - dbcharset => database character encoding (will be converted to 'charset')
* - charset => character encoding to set (default is UTF-8)
* - resource (SQLite3) => existing connection resource * - resource (SQLite3) => existing connection resource
* - lazy, profiler, result, substitutes, ... => see Dibi\Connection options * - lazy, profiler, result, substitutes, ... => see Dibi\Connection options
*/ */
@@ -43,11 +41,6 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
private $fmtDateTime; private $fmtDateTime;
/** @var string character encoding */
private $dbcharset;
private $charset;
/** /**
* @throws Dibi\NotSupportedException * @throws Dibi\NotSupportedException
@@ -66,6 +59,10 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
*/ */
public function connect(array &$config): void public function connect(array &$config): void
{ {
if (isset($config['dbcharset']) || isset($config['charset'])) {
throw new Dibi\NotSupportedException('Options dbcharset and charset are not longer supported.');
}
Dibi\Helpers::alias($config, 'database', 'file'); Dibi\Helpers::alias($config, 'database', 'file');
$this->fmtDate = $config['formatDate'] ?? 'U'; $this->fmtDate = $config['formatDate'] ?? 'U';
$this->fmtDateTime = $config['formatDateTime'] ?? 'U'; $this->fmtDateTime = $config['formatDateTime'] ?? 'U';
@@ -80,12 +77,6 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
} }
} }
$this->dbcharset = empty($config['dbcharset']) ? 'UTF-8' : $config['dbcharset'];
$this->charset = empty($config['charset']) ? 'UTF-8' : $config['charset'];
if (strcasecmp($this->dbcharset, $this->charset) === 0) {
$this->dbcharset = $this->charset = null;
}
// enable foreign keys support (defaultly disabled; if disabled then foreign key constraints are not enforced) // enable foreign keys support (defaultly disabled; if disabled then foreign key constraints are not enforced)
$version = SQLite3::version(); $version = SQLite3::version();
if ($version['versionNumber'] >= '3006019') { if ($version['versionNumber'] >= '3006019') {
@@ -109,10 +100,6 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
*/ */
public function query(string $sql): ?Dibi\ResultDriver public function query(string $sql): ?Dibi\ResultDriver
{ {
if ($this->dbcharset !== null) {
$sql = iconv($this->charset, $this->dbcharset . '//IGNORE', $sql);
}
$res = @$this->connection->query($sql); // intentionally @ $res = @$this->connection->query($sql); // intentionally @
if ($code = $this->connection->lastErrorCode()) { if ($code = $this->connection->lastErrorCode()) {
throw static::createException($this->connection->lastErrorMsg(), $code, $sql); throw static::createException($this->connection->lastErrorMsg(), $code, $sql);
@@ -350,13 +337,9 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
if (!$row) { if (!$row) {
return null; return null;
} }
$charset = $this->charset === null ? null : $this->charset . '//TRANSLIT'; if ($row && $assoc) {
if ($row && ($assoc || $charset)) {
$tmp = []; $tmp = [];
foreach ($row as $k => $v) { foreach ($row as $k => $v) {
if ($charset !== null && is_string($v)) {
$v = iconv($this->dbcharset, $charset, $v);
}
$tmp[str_replace(['[', ']'], '', $k)] = $v; $tmp[str_replace(['[', ']'], '', $k)] = $v;
} }
return $tmp; return $tmp;