X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fdb.php;h=ac493f6d6a66c65ee27929a1a18ec7d0920bdfd8;hb=bb84330234c649fb0a8726e488fca012f5295ce4;hp=aba249a50b6779759a2b72fbb8648f7a08c8cc50;hpb=4ee398a41e2176d4a5c997920db35cb6bed12f2e;p=tt-rss.git

diff --git a/classes/db.php b/classes/db.php
old mode 100644
new mode 100755
index aba249a5..ac493f6d
--- a/classes/db.php
+++ b/classes/db.php
@@ -1,11 +1,25 @@
 <?php
-class Db implements IDb {
+class Db
+{
+
+	/* @var Db $instance */
 	private static $instance;
+
+	/* @var IDb $adapter */
 	private $adapter;
+
 	private $link;
+
+	/* @var PDO $pdo */
 	private $pdo;
 
-	private function __construct() {
+	private function __clone() {
+		//
+	}
+
+	private function legacy_connect() {
+
+		user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
 
 		$er = error_reporting(E_ALL);
 
@@ -25,34 +39,6 @@ class Db implements IDb {
 			exit(100);
 		}
 
-		$db_port = defined(DB_PORT) ? ';port='.DB_PORT : '';
-
-		$this->pdo = new PDO(DB_TYPE . ':dbname='.DB_NAME.';host='.DB_HOST.$db_port,
-			DB_USER,
-			DB_PASS);
-
-		$this->pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING );
-
-		if (!$this->pdo) {
-			print("Error connecting via PDO.");
-			exit(101);
-		}
-
-		if (DB_TYPE == "pgsql") {
-
-			$this->pdo->query("set client_encoding = 'UTF-8'");
-			$this->pdo->query("set datestyle = 'ISO, european'");
-			$this->pdo->query("set TIME ZONE 0");
-			$this->pdo->query("set cpu_tuple_cost = 0.5");
-
-		} else if (DB_TYPE == "mysql") {
-			$this->pdo->query("SET time_zone = '+0:0'");
-
-			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$this->pdo->query("SET NAMES " . MYSQL_CHARSET);
-			}
-		}
-
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
 		if (!$this->link) {
@@ -63,70 +49,68 @@ class Db implements IDb {
 		error_reporting($er);
 	}
 
-	private function __clone() {
-		//
-	}
+	// this really shouldn't be used unless a separate PDO connection is needed
+	// normal usage is Db::pdo()->prepare(...) etc
+	public function pdo_connect() {
 
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		$db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
+		$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
 
-		return self::$instance;
-	}
+		try {
+			$pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
+				DB_USER,
+				DB_PASS);
+		} catch (Exception $e) {
+			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
+			exit(101);
+		}
 
-    public static function pdo() {
-        if (self::$instance == null)
-            self::$instance = new self();
+		$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-        return self::$instance->pdo;
-    }
+		if (DB_TYPE == "pgsql") {
 
-	static function quote($str){
-		return("'$str'");
-	}
+			$pdo->query("set client_encoding = 'UTF-8'");
+			$pdo->query("set datestyle = 'ISO, european'");
+			$pdo->query("set TIME ZONE 0");
+			$pdo->query("set cpu_tuple_cost = 0.5");
 
-	function reconnect() {
-		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
-	}
+		} else if (DB_TYPE == "mysql") {
+			$pdo->query("SET time_zone = '+0:0'");
 
-	function connect($host, $user, $pass, $db, $port) {
-		//return $this->adapter->connect($host, $user, $pass, $db, $port);
-		return ;
-	}
+			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+				$pdo->query("SET NAMES " . MYSQL_CHARSET);
+			}
+		}
 
-	function escape_string($s, $strip_tags = true) {
-		return $this->adapter->escape_string($s, $strip_tags);
+		return $pdo;
 	}
 
-	function query($query, $die_on_error = true) {
-		return $this->adapter->query($query, $die_on_error);
-	}
+	public static function instance() {
+		if (self::$instance == null)
+			self::$instance = new self();
 
-	function fetch_assoc($result) {
-		return $this->adapter->fetch_assoc($result);
+		return self::$instance;
 	}
 
-	function num_rows($result) {
-		return $this->adapter->num_rows($result);
-	}
+	public static function get() {
+		if (self::$instance == null)
+			self::$instance = new self();
 
-	function fetch_result($result, $row, $param) {
-		return $this->adapter->fetch_result($result, $row, $param);
-	}
+		if (!self::$instance->adapter) {
+			self::$instance->legacy_connect();
+		}
 
-	function close() {
-		return $this->adapter->close();
+		return self::$instance->adapter;
 	}
 
-	function affected_rows($result) {
-		return $this->adapter->affected_rows($result);
-	}
+	public static function pdo() {
+		if (self::$instance == null)
+			self::$instance = new self();
 
-	function last_error() {
-		return $this->adapter->last_error();
-	}
+		if (!self::$instance->pdo) {
+			self::$instance->pdo = self::$instance->pdo_connect();
+		}
 
-	function last_query_error() {
-		return $this->adapter->last_query_error();
+		return self::$instance->pdo;
 	}
-}
\ No newline at end of file
+}