Determine language for atom entry without a loop.

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

diff --git a/classes/db.php b/classes/db.php
index aba249a50b6779759a2b72fbb8648f7a08c8cc50..96a8882751078adb63d72e7ac623d9e2a87ea741 100644 (file)
--- 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,19 +39,32 @@ class Db implements IDb {
                        exit(100);
                }
 
-               $db_port = defined(DB_PORT) ? ';port='.DB_PORT : '';
+               $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
-               $this->pdo = new PDO(DB_TYPE . ':dbname='.DB_NAME.';host='.DB_HOST.$db_port,
-                       DB_USER,
-                       DB_PASS);
+               if (!$this->link) {
+                       print("Error connecting through adapter: " . $this->adapter->last_error());
+                       exit(101);
+               }
 
-               $this->pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING );
+               error_reporting($er);
+       }
+
+       private function pdo_connect() {
 
-               if (!$this->pdo) {
-                       print("Error connecting via PDO.");
+               $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
+               $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
+
+               try {
+                       $this->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);
+
                if (DB_TYPE == "pgsql") {
 
                        $this->pdo->query("set client_encoding = 'UTF-8'");
@@ -52,81 +79,27 @@ class Db implements IDb {
                                $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) {
-                       print("Error connecting through adapter: " . $this->adapter->last_error());
-                       exit(101);
-               }
-
-               error_reporting($er);
-       }
-
-       private function __clone() {
-               //
        }
 
        public static function get() {
                if (self::$instance == null)
                        self::$instance = new self();
 
-               return self::$instance;
-       }
-
-    public static function pdo() {
-        if (self::$instance == null)
-            self::$instance = new self();
-
-        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);
-       }
-
-       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);
-       }
+               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_connect();
+               }
 
-       function last_query_error() {
-               return $this->adapter->last_query_error();
+               return self::$instance->pdo;
        }
 }
\ No newline at end of file