diff options
author | Andrew Dolgov <[email protected]> | 2016-04-26 20:04:24 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2016-04-26 20:04:24 +0300 |
commit | 977cea1438dafcdc98756b070a1383e5887d64c1 (patch) | |
tree | 4a4e5d75d56c7c36c72a70d811d9db1926de7a52 /classes/db/pgsql.php | |
parent | 9e84bab449f9ed55e02e60378b0af1521026f3b8 (diff) |
actually check for failures properly in the dbupdater
Diffstat (limited to 'classes/db/pgsql.php')
-rw-r--r-- | classes/db/pgsql.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php index 6b772d9e1..7bacfef60 100644 --- 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"); |