dbupdater: use PDO

diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index 2d131fde7a5828ef1f442d36001b9bf0ba20240d..1014fa5a5942feb6e34c445f428a9f18af2723bd 100644 (file)
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -1,19 +1,19 @@
 <?php
 class DbUpdater {
 
-       private $dbh;
+       private $pdo;
        private $db_type;
        private $need_version;
 
-       function __construct($dbh, $db_type, $need_version) {
-               $this->dbh = $dbh;
+       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 = db_query("SELECT schema_version FROM ttrss_version");
-               return (int) db_fetch_result($result, 0, "schema_version");
+               $row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
+               return (int) $row['schema_version'];
        }
 
        function isUpdateRequired() {
@@ -26,6 +26,7 @@ class DbUpdater {
                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;
                }
        }
@@ -37,17 +38,17 @@ class DbUpdater {
 
                        if (is_array($lines)) {
 
-                               db_query("BEGIN");
+                               $this->pdo->beginTransaction();
 
                                foreach ($lines as $line) {
                                        if (strpos($line, "--") !== 0 && $line) {
-                                               if (!db_query($line, false)) {
+                                               if (!$this->pdo->query($line)) {
                                                        if ($html_output) {
                                                                print_notice("Query: $line");
-                                                               print_error("Error: " . db_last_query_error());
+                                                               print_error("Error: " . implode(", ", $this->pdo->errorInfo()));
                                                        } else {
                                                                _debug("Query: $line");
-                                                               _debug("Error: " . db_last_query_error());
+                                                               _debug("Error: " . implode(", ", $this->pdo->errorInfo()));
                                                        }
 
                                                        return false;
@@ -58,10 +59,10 @@ class DbUpdater {
                                $db_version = $this->getSchemaVersion();
 
                                if ($db_version == $version) {
-                                       db_query("COMMIT");
+                                       $this->pdo->commit();
                                        return true;
                                } else {
-                                       db_query("ROLLBACK");
+                                       $this->pdo->rollBack();
                                        return false;
                                }
                        } else {

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3c65b992b7f72e468525cd55de3256995f811ae1..f36ee8b1aebdbacaa8e6004c7d415e205e8822a3 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -855,7 +855,7 @@ class Handler_Public extends Handler {
 
                        <?php
                                @$op = $_REQUEST["subop"];
-                               $updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION);
+                               $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
 
                                if ($op == "performupdate") {
                                        if ($updater->isUpdateRequired()) {

diff --git a/update.php b/update.php
index 9012d717b29fc35eae449798ff618418a3a41862..7104f760a7265f39faeb556432ffba71a1d2b8f2 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -317,7 +317,7 @@
        if (isset($options["update-schema"])) {
                _debug("checking for updates (" . DB_TYPE . ")...");
 
-               $updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION);
+               $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
 
                if ($updater->isUpdateRequired()) {
                        _debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);