more work on singleton-based DB

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

diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 39ed181d7a725e9e71d1b8d666ec534a912be1d5..0f38fb8cb5d124fd47cbcee815d89a4e6cf98d05 100644 (file)
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -1,80 +1,83 @@
 <?php
+class Db_Pgsql implements IDb {
+       private $link;
 
-class Db_Pgsql extends Db_Abstract
-{
-    public function connect($host, $user, $pass, $db)
-    {
-        $string = "dbname=$db user=$user";
-
-        if ($pass) {
-            $string .= " password=$pass";
-        }
-
-        if ($host) {
-            $string .= " host=$host";
-        }
-
-        if (defined('DB_PORT')) {
-            $string = "$string port=" . DB_PORT;
-        }
-
-        $link = pg_connect($string);
-
-        if (!$link) {
-            die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
-        }
-
-        $this->dbconn = $link;
-        return $link;
-    }
-
-    public function init()
-    {
-        pg_query($this->dbconn, "set client_encoding = 'UTF-8'");
-        pg_set_client_encoding("UNICODE");
-        pg_query($this->dbconn, "set datestyle = 'ISO, european'");
-        pg_query($this->dbconn, "set TIME ZONE 0");
-    }
-
-    public function escape_string($s, $strip_tags = true)
-    {
-        if ($strip_tags) $s = strip_tags($s);
-        return pg_escape_string($s);
-    }
-
-    public function query($query, $die_on_error = true)
-    {
-        $result = pg_query($this->dbconn, $query);
-        if (!$result) {
-            $query = htmlspecialchars($query); // just in case
-            if ($die_on_error) {
-                die("Query <i>$query</i> failed [$result]: " . ($this->dbconn ? pg_last_error($this->dbconn) : "No connection"));
-            }
-        }
-        return $result;
-    }
-
-    public function fetch_assoc($result) {
-        return pg_fetch_assoc($result);
-    }
-
-    public function num_rows($result) {
-        return pg_num_rows($result);
-    }
-
-    public function fetch_result($result, $row, $param) {
-        return pg_fetch_result($result, $row, $param);
-    }
-
-    public function close() {
-        return pg_close($this->dbconn);
-    }
-
-    public function affected_rows($result) {
-        return pg_affected_rows($result);
-    }
-
-    public function last_error() {
-        return pg_last_error($this->dbconn);
-    }
+       function connect($host, $user, $pass, $db, $port) {
+               $string = "dbname=$db user=$user";
+
+               if ($pass) {
+                       $string .= " password=$pass";
+               }
+
+               if ($host) {
+                       $string .= " host=$host";
+               }
+
+               if (is_numeric($port) && $port > 0) {
+                       $string = "$string port=" . $port;
+               }
+
+               $this->link = pg_connect($string);
+
+               if (!$this->link) {
+                       die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+               }
+
+               $this->init();
+
+               return $this->link;
+       }
+
+       function escape_string($s, $strip_tags = true) {
+               if ($strip_tags) $s = strip_tags($s);
+
+               return pg_escape_string($this->link, $s);
+       }
+
+       function query($query, $die_on_error = true) {
+               $result = pg_query($this->link, $query);
+
+               if (!$result) {
+                       $query = htmlspecialchars($query); // just in case
+                       if ($die_on_error) {
+                               die("Query <i>$query</i> failed [$result]: " . ($this->link ? pg_last_error($this->link) : "No connection"));
+                       }
+               }
+               return $result;
+       }
+
+       function fetch_assoc($result) {
+               return pg_fetch_assoc($result);
+       }
+
+
+       function num_rows($result) {
+               return pg_num_rows($result);
+       }
+
+       function fetch_result($result, $row, $param) {
+               return pg_fetch_result($result, $row, $param);
+       }
+
+       function close() {
+               return pg_close($this->link);
+       }
+
+       function affected_rows($result) {
+               return pg_affected_rows($result);
+       }
+
+       function last_error() {
+               return pg_last_error($this->link);
+       }
+
+       function init() {
+               $this->query("set client_encoding = 'UTF-8'");
+               pg_set_client_encoding("UNICODE");
+               $this->query("set datestyle = 'ISO, european'");
+               $this->query("set TIME ZONE 0");
+
+               return true;
+       }
 }
+?>