Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions src/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,33 @@ class Database
/**
* Array of connection arguments
*
* @param array $args
* @param array|PDO $args
*/
public function __construct($args)
{
if (!isset($args['database'])) {
throw new Exception('&args[\'database\'] is required');
}

if (!isset($args['username'])) {
throw new Exception('&args[\'username\'] is required');
if ($args instanceof PDO) {
// just a wrapper around another PDO existing object
$this->db = $args;
} else {
if (!isset($args['database'])) {
throw new Exception('&args[\'database\'] is required');
}

if (!isset($args['username'])) {
throw new Exception('&args[\'username\'] is required');
}

$type = isset($args['type']) ? $args['type'] : 'mysql';
$host = isset($args['host']) ? $args['host'] : 'localhost';
$charset = isset($args['charset']) ? $args['charset'] : 'utf8';
$port = isset($args['port']) ? 'port=' . $args['port'] . ';' : '';
$password = isset($args['password']) ? $args['password'] : '';
$database = $args['database'];
$username = $args['username'];

$this->db = new PDO("$type:host=$host;$port" . "dbname=$database;charset=$charset", $username, $password);
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}

$type = isset($args['type']) ? $args['type'] : 'mysql';
$host = isset($args['host']) ? $args['host'] : 'localhost';
$charset = isset($args['charset']) ? $args['charset'] : 'utf8';
$port = isset($args['port']) ? 'port=' . $args['port'] . ';' : '';
$password = isset($args['password']) ? $args['password'] : '';
$database = $args['database'];
$username = $args['username'];

$this->db = new PDO("$type:host=$host;$port" . "dbname=$database;charset=$charset", $username, $password);
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}

/**
Expand Down