aviat
/
Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

Database connection tweaks

This commit is contained in:
Timothy Warren 2012-05-02 12:53:34 -04:00
parent 31ba0881ea
commit dcdf581998
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
classes/query_builder.php
View File

@ -158,21 +158,17 @@ class Query_Builder {
// Convert array to object
if (is_array($params))
{
$p = new StdClass();
foreach($params as $key => $val)
{
$p->$key = $val;
}
$p = new ArrayObject($params);
$params = $p;
}
// Let the connection work with 'conn_db' or 'database'
$params->conn_db = ( ! isset($params->database))
? @$params->conn_db
: @$params->database;
// Let the connection work with 'conn_db' or 'database'
if (isset($params->database))
{
$params->conn_db = $params->database;
}
$params->type = strtolower($params->type);
$dbtype = ($params->type !== 'postgresql') ? $params->type : 'pgsql';
@ -213,6 +209,7 @@ class Query_Builder {
$this->db = new $dbtype($dsn);
}
// Set the connection name property, if applicable
if (isset($params->name))
{
$this->conn_name = $params->name;

6
tests/databases/mysql/mysql.php
View File

@ -25,10 +25,10 @@ class MySQLTest extends DBTest {
// Attempt to connect, if there is a test config file
if (is_file(QBASE_DIR . "test_config.json"))
{
$params = json_decode(file_get_contents(QBASE_DIR . "test_config.json"));
$params = $params->mysql;
$params = json_decode(file_get_contents(QBASE_DIR . "test_config.json"), TRUE);
$params = $params['mysql'];
$this->db = new MySQL("host={$params->host};port={$params->port};dbname={$params->database}", $params->user, $params->pass);
$this->db = new MySQL("host={$params['host']};port={$params['port']};dbname={$params['database']}", $params['user'], $params['pass']);
}
elseif (($var = getenv('CI')))
{

BIN
tests/db_files/FB_TEST_DB.FDB
View File

Binary file not shown.