diff options
author | Andrew Dolgov <[email protected]> | 2013-04-17 15:36:34 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-17 15:36:48 +0400 |
commit | 404e2e3603c852a3f82a21c14b8888005e2b3f99 (patch) | |
tree | 8814cfecfe167fc32d474d670bc47be32a9a5e25 /classes/db.php | |
parent | ba68b6815ab31d17cda113e7990eeb07558b02a9 (diff) |
more work on singleton-based DB
Diffstat (limited to 'classes/db.php')
-rw-r--r-- | classes/db.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/classes/db.php b/classes/db.php index 71fc01ae1..558d3e6b7 100644 --- a/classes/db.php +++ b/classes/db.php @@ -2,6 +2,7 @@ class Db implements IDb { private static $instance; private $adapter; + private $link; private function __construct() { switch (DB_TYPE) { @@ -12,11 +13,11 @@ class Db implements IDb { $this->adapter = new Db_Pgsql(); break; default: - die("Unknown DB_TYPE: " . DB_TYPE); + user_error("Unknown DB_TYPE: " . DB_TYPE); } - $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT); - $this->adapter->init(); + $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT); + } private function __clone() { @@ -40,6 +41,7 @@ class Db implements IDb { function connect($host, $user, $pass, $db, $port) { //return $this->adapter->connect($host, $user, $pass, $db, $port); + return $this->link; } function escape_string($s, $strip_tags = true) { |