actually check for failures properly in the dbupdater

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

diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 6b772d9e1de47e1d444f2dc8d20b7eec1f0ee7f3..7bacfef60df28046e617d5ba85be46e7dcfd30dd 100644 (file)
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -1,6 +1,7 @@
 <?php
 class Db_Pgsql implements IDb {
        private $link;
+       private $last_error;
 
        function connect($host, $user, $pass, $db, $port) {
                $string = "dbname=$db user=$user";
@@ -38,11 +39,11 @@ class Db_Pgsql implements IDb {
                $result = @pg_query($this->link, $query);
 
                if (!$result) {
-                       $error = @pg_last_error($this->link);
+                       $this->last_error = @pg_last_error($this->link);
 
                        @pg_query($this->link, "ROLLBACK");
                        $query = htmlspecialchars($query); // just in case
-                       user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
+                       user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
                                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
                }
                return $result;
@@ -73,6 +74,10 @@ class Db_Pgsql implements IDb {
                return pg_last_error($this->link);
        }
 
+       function last_query_error() {
+               return $this->last_error;
+       }
+
        function init() {
                $this->query("set client_encoding = 'UTF-8'");
                pg_set_client_encoding("UNICODE");