Logger_SQL: use separate PDO connection

[tt-rss.git] / classes / db.php

diff --git a/classes/db.php b/classes/db.php
old mode 100644 (file)
new mode 100755 (executable)
index 05fb82d..ac493f6
--- a/classes/db.php
+++ b/classes/db.php
@@ -1,5 +1,6 @@
 <?php
-class Db implements IDb {
+class Db
+{
 
        /* @var Db $instance */
        private static $instance;
@@ -12,10 +13,6 @@ class Db implements IDb {
        /* @var PDO $pdo */
        private $pdo;
 
-       private function __construct() {
-
-       }
-
        private function __clone() {
                //
        }
@@ -52,105 +49,68 @@ class Db implements IDb {
                error_reporting($er);
        }
 
-       private function pdo_connect() {
+       // this really shouldn't be used unless a separate PDO connection is needed
+       // normal usage is Db::pdo()->prepare(...) etc
+       public function pdo_connect() {
 
-               $db_port = defined('DB_PORT') && DB_PORT ? ';port='.DB_PORT : '';
+               $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
+               $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
 
-               $this->pdo = new PDO(DB_TYPE . ':dbname='.DB_NAME.';host='.DB_HOST.$db_port,
-                       DB_USER,
-                       DB_PASS);
-
-               if (!$this->pdo) {
-                       print("Error connecting via PDO.");
+               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);
                }
 
-               $this->pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING );
+               $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
                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");
+                       $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");
 
                } else if (DB_TYPE == "mysql") {
-                       $this->pdo->query("SET time_zone = '+0:0'");
+                       $pdo->query("SET time_zone = '+0:0'");
 
                        if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                               $this->pdo->query("SET NAMES " . MYSQL_CHARSET);
+                               $pdo->query("SET NAMES " . MYSQL_CHARSET);
                        }
                }
+
+               return $pdo;
        }
 
-       public static function get() {
+       public static function instance() {
                if (self::$instance == null)
                        self::$instance = new self();
 
-               if (!self::$instance->link) {
-                       self::$instance->legacy_connect();
-               }
-
                return self::$instance;
        }
 
-       public static function pdo() {
-        if (self::$instance == null)
-            self::$instance = new self();
+       public static function get() {
+               if (self::$instance == null)
+                       self::$instance = new self();
 
-        if (!self::$instance->pdo) {
-                       self::$instance->pdo_connect();
+               if (!self::$instance->adapter) {
+                       self::$instance->legacy_connect();
                }
 
-        return self::$instance->pdo;
-    }
-
-       static function quote($str){
-               return("'$str'");
-       }
-
-       function reconnect() {
-               $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
-       }
-
-       function connect($host, $user, $pass, $db, $port) {
-               //return $this->adapter->connect($host, $user, $pass, $db, $port);
-               return ;
-       }
-
-       function escape_string($s, $strip_tags = true) {
-               return $this->adapter->escape_string($s, $strip_tags);
-       }
-
-       function query($query, $die_on_error = true) {
-               return $this->adapter->query($query, $die_on_error);
+               return self::$instance->adapter;
        }
 
-       function fetch_assoc($result) {
-               return $this->adapter->fetch_assoc($result);
-       }
-
-       function num_rows($result) {
-               return $this->adapter->num_rows($result);
-       }
-
-       function fetch_result($result, $row, $param) {
-               return $this->adapter->fetch_result($result, $row, $param);
-       }
-
-       function close() {
-               return $this->adapter->close();
-       }
-
-       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
+}