pdo connection string: properly check for DB_PORT

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

diff --git a/classes/db.php b/classes/db.php
index 695ca6ea2e47bcd2e523474bf5acafd769a05049..1a4d0b2eee86e2efd352746a09e3bd3d75343265 100644 (file)
--- a/classes/db.php
+++ b/classes/db.php
@@ -3,36 +3,61 @@ class Db implements IDb {
        private static $instance;
        private $adapter;
        private $link;
+       private $pdo;
 
        private function __construct() {
 
                $er = error_reporting(E_ALL);
 
-               if (defined('_ENABLE_PDO') && _ENABLE_PDO && class_exists("PDO")) {
-                       $this->adapter = new Db_PDO();
-               } else {
-                       switch (DB_TYPE) {
+               switch (DB_TYPE) {
                        case "mysql":
-                               if (function_exists("mysqli_connect")) {
-                                       $this->adapter = new Db_Mysqli();
-                               } else {
-                                       $this->adapter = new Db_Mysql();
-                               }
+                               $this->adapter = new Db_Mysqli();
                                break;
                        case "pgsql":
                                $this->adapter = new Db_Pgsql();
                                break;
                        default:
                                die("Unknown DB_TYPE: " . DB_TYPE);
-                       }
                }
 
-               if (!$this->adapter) die("Error initializing database adapter for " . DB_TYPE);
+               if (!$this->adapter) {
+                       print("Error initializing database adapter for " . DB_TYPE);
+                       exit(100);
+               }
+
+               $db_port = defined('DB_PORT') && 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) {
-                       die("Error connecting through adapter: " . $this->adapter->last_error());
+                       print("Error connecting through adapter: " . $this->adapter->last_error());
+                       exit(101);
                }
 
                error_reporting($er);
@@ -49,6 +74,13 @@ class Db implements IDb {
                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'");
        }
@@ -94,5 +126,7 @@ class Db implements IDb {
                return $this->adapter->last_error();
        }
 
-}
-?>
+       function last_query_error() {
+               return $this->adapter->last_query_error();
+       }
+}
\ No newline at end of file