fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix install problems

Browse source
This commit is contained in:
Kijin Sung 2020-06-30 20:05:08 +09:00
parent 0f561b3814
commit 8cd1cdff9f
6 changed files with 44 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

39
common/framework/db.php
View file

@ -69,15 +69,21 @@ class DB
return self::$_instances[$type];
}
// Check if configuration exists for the selected DB type.
$config = Config::get('db.' . $type) ?: array();
if (!count($config))
// Create an instance with the appropriate configuration.
if ($config = Config::get('db'))
{
throw new Exceptions\DBError('DB type \'' . $type . '\' is not configured.');
$typeconfig = isset($config[$type]) ? $config[$type] : [];
if (!count($typeconfig))
{
throw new Exceptions\DBError('DB type \'' . $type . '\' is not configured.');
}
return self::$_instances[$type] = new self($type, $typeconfig);
}
else
{
return new self($type, []);
}
// Create an instance and return it.
return self::$_instances[$type] = new self($type, $config);
}
/**
@ -93,6 +99,10 @@ class DB
$this->_prefix = $config['prefix'] ?: $this->_prefix;
$this->_charset = $config['charset'] ?: $this->_charset;
$this->_engine = $config['engine'] ?: $this->_engine;
if (!count($config))
{
return;
}
// Connect to the DB.
$dsn = 'mysql:host=' . $config['host'];
@ -212,6 +222,10 @@ class DB
{
return $this->setError(-1, 'Invalid query arguments.');
}
if (!$this->_handle)
{
return $this->setError(-1, 'DB is not configured.');
}
// Force the column list to a numerical array.
$column_list = is_array($column_list) ? array_values($column_list) : array();
@ -427,7 +441,7 @@ class DB
* @param string $query_string
* @return Helpers\DBStmtHelper
*/
public function _query(string $query_string)
public function _query($query_string)
{
$this->_last_stmt = $this->_handle->query($query_string);
return $this->_last_stmt;
@ -441,10 +455,15 @@ class DB
*
* @param \PDOStatement $stmt
* @param int $last_index
* @return array|object
* @return mixed
*/
public function _fetch(\PDOStatement $stmt, int $last_index = 0)
public function _fetch($stmt, $last_index = 0)
{
if (!($stmt instanceof \PDOStatement))
{
return null;
}
$result = array();
$index = $last_index;
$step = $last_index !== 0 ? -1 : 1;