zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-02 14:25:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix dbName bug

Browse Source
This commit is contained in:
Jerry
2023-06-07 13:16:54 +08:00
committed by Jerry Ma
parent 033088d06d
commit 61e60e7218
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ZM/Store/Database/DBWrapper.php
View File

@@ -24,19 +24,27 @@ class DBWrapper
$db_type = $options['dbType'] ?? ZM_DB_POOL; $db_type = $options['dbType'] ?? ZM_DB_POOL;
try { try {
if ($db_type === ZM_DB_POOL) { if ($db_type === ZM_DB_POOL) {
// 设置 dbName
$options['dbName'] = $name;
// pool 为连接池格式 // pool 为连接池格式
$db_list = config()->get('global.database'); $db_list = config()->get('global.database');
if (isset($db_list[$name]) || (is_countable($db_list) ? count($db_list) : 0) === 1) { if (isset($db_list[$name]) || (is_countable($db_list) ? count($db_list) : 0) === 1) {
if ($name === '') { if ($name === '') {
$name = array_key_first($db_list); $name = array_key_first($db_list);
} }
$this->connection = DriverManager::getConnection(['driverClass' => $this->getConnectionClass($db_list[$name]['type']), ...$options]); $this->connection = DriverManager::getConnection(array_merge(
['driverClass' => $this->getConnectionClass($db_list[$name]['type']), 'dbName' => $name],
$options
));
} else { } else {
throw new DBException('Cannot find database config named "' . $name . '" !'); throw new DBException('Cannot find database config named "' . $name . '" !');
} }
} elseif ($db_type === ZM_DB_PORTABLE) { } elseif ($db_type === ZM_DB_PORTABLE) {
// portable 为sqlite单文件模式 // portable 为sqlite单文件模式
$this->connection = DriverManager::getConnection(['driverClass' => SQLiteDriver::class, 'filename' => $name, ...$options]); $this->connection = DriverManager::getConnection(array_merge(
['driverClass' => SQLiteDriver::class, 'filename' => $name],
$options
));
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new DBException($e->getMessage(), $e->getCode(), $e); throw new DBException($e->getMessage(), $e->getCode(), $e);