pngcrush.sh

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

diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index f157342d43772dbcb9450e58f9f6eaf69c1c1279..c32afedee238dc8a62cb9d72933ac23d813abe77 100644 (file)
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -1,19 +1,19 @@
 <?php
 class DbUpdater {
 
-       private $dbh;
-       private $$this->dbh->type;
+       private $pdo;
+       private $db_type;
        private $need_version;
 
-       function __construct($dbh, $$this->dbh->type, $need_version) {
-               $this->dbh = $dbh;
-               $this->$this->dbh->type = $db_type;
+       function __construct($pdo, $db_type, $need_version) {
+               $this->pdo = Db::pdo(); //$pdo;
+               $this->db_type = $db_type;
                $this->need_version = (int) $need_version;
        }
 
        function getSchemaVersion() {
-               $result = $this->dbh->query("SELECT schema_version FROM ttrss_version");
-               return (int) $this->dbh->fetch_result($result, 0, "schema_version");
+               $row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
+               return (int) $row['schema_version'];
        }
 
        function isUpdateRequired() {
@@ -21,45 +21,56 @@ class DbUpdater {
        }
 
        function getSchemaLines($version) {
-               $filename = "schema/versions/".$this->$this->dbh->type."/$version.sql";
+               $filename = "schema/versions/".$this->db_type."/$version.sql";
 
                if (file_exists($filename)) {
                        return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
                } else {
+                       user_error("DB Updater: schema file for version $version is not found.");
                        return false;
                }
        }
 
-       function performUpdateTo($version) {
+       function performUpdateTo($version, $html_output = true) {
                if ($this->getSchemaVersion() == $version - 1) {
 
                        $lines = $this->getSchemaLines($version);
 
                        if (is_array($lines)) {
 
-                               $this->dbh->query("BEGIN");
+                               $this->pdo->beginTransaction();
 
                                foreach ($lines as $line) {
                                        if (strpos($line, "--") !== 0 && $line) {
-                                               $this->dbh->query($line);
+                                               if (!$this->pdo->query($line)) {
+                                                       if ($html_output) {
+                                                               print_notice("Query: $line");
+                                                               print_error("Error: " . implode(", ", $this->pdo->errorInfo()));
+                                                       } else {
+                                                               Debug::log("Query: $line");
+                                                               Debug::log("Error: " . implode(", ", $this->pdo->errorInfo()));
+                                                       }
+
+                                                       return false;
+                                               }
                                        }
                                }
 
-                               $$this->dbh->version = $this->getSchemaVersion();
+                               $db_version = $this->getSchemaVersion();
 
-                               if ($$this->dbh->version == $version) {
-                                       $this->dbh->query("COMMIT");
+                               if ($db_version == $version) {
+                                       $this->pdo->commit();
                                        return true;
                                } else {
-                                       $this->dbh->query("ROLLBACK");
+                                       $this->pdo->rollBack();
                                        return false;
                                }
                        } else {
-                               return true;
+                               return false;
                        }
                } else {
                        return false;
                }
        }
 
-} ?>
+}
\ No newline at end of file