1
0
mirror of https://github.com/dg/dibi.git synced 2025-08-13 09:34:30 +02:00

Sqlite3Driver becomes alias for SqliteDriver

This commit is contained in:
David Grudl
2018-05-23 17:08:25 +02:00
parent 70b1e08d83
commit 3930dafe3f
26 changed files with 452 additions and 416 deletions

View File

@@ -1,5 +1,5 @@
[sqlite] ; default
driver = sqlite3
driver = sqlite
database = :memory:
system = sqlite

View File

@@ -1,5 +1,5 @@
[sqlite] ; default
driver = sqlite3
driver = sqlite
database = :memory:
system = sqlite

View File

@@ -1,5 +1,5 @@
[sqlite] ; default
driver = sqlite3
driver = sqlite
database = :memory:
system = sqlite

View File

@@ -32,7 +32,7 @@ Assert::same(
);
if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'], true)) {
if (!in_array($config['driver'], ['sqlite', 'pdo', 'sqlsrv'], true)) {
Assert::same(
['products.product_id', 'orders.order_id', 'customers.name', 'xXx'],
$info->getColumnNames(true)
@@ -43,7 +43,7 @@ if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'], true)) {
$columns = $info->getColumns();
Assert::same('product_id', $columns[0]->getName());
if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'], true)) {
if (!in_array($config['driver'], ['sqlite', 'pdo', 'sqlsrv'], true)) {
Assert::same('products', $columns[0]->getTableName());
}
Assert::null($columns[0]->getVendorInfo('xxx'));

View File

@@ -68,7 +68,7 @@ function reformat($s)
function num($n)
{
global $config;
if (substr($config['dsn'] ?? '', 0, 5) === 'odbc:' || $config['driver'] === 'sqlite') {
if (substr($config['dsn'] ?? '', 0, 5) === 'odbc:') {
$n = is_float($n) ? "$n.0" : (string) $n;
}
return $n;