add schema checking to feed updating and update script

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index 9c62ccb2a58ca7a5e112ceb6c06aa463613b9a0b..1c43cdb94c2233be9aaf3c426e117590498b33bf 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -13,6 +13,7 @@
        require_once "sanity_check.php";
        require_once "db.php";
        require_once "db-prefs.php";
+       require_once "errorhandler.php";
 
        if (!defined('PHP_EXECUTABLE'))
                define('PHP_EXECUTABLE', '/usr/bin/php');
@@ -31,6 +32,7 @@
                        "quiet",
                        "log:",
                        "indexes",
+                       "update-schema",
                        "convert-filters",
                        "force-update",
                        "list-plugins",
@@ -72,6 +74,7 @@
                print "  --quiet              - don't output messages to stdout\n";
                print "  --log FILE           - log messages to FILE\n";
                print "  --indexes            - recreate missing schema indexes\n";
+               print "  --update-schema      - update database schema\n";
                print "  --convert-filters    - convert type1 filters to type2\n";
                print "  --force-update       - force update of all feeds\n";
                print "  --list-plugins       - list all available plugins\n";
@@ -86,6 +89,14 @@
                return;
        }
 
+       if (!isset($options['update-schema'])) {
+               $schema_version = get_schema_version($link);
+
+               if ($schema_version != SCHEMA_VERSION) {
+                       die("Schema version is wrong, please upgrade the database.\n");
+               }
+       }
+
        define('QUIET', isset($options['quiet']));
 
        if (isset($options["log"])) {
@@ -145,7 +156,9 @@
 
        if (isset($options["daemon"])) {
                while (true) {
-                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop");
+                       $quiet = (isset($options["quiet"])) ? "--quiet" : "";
+
+                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet");
                        _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
                        sleep(DAEMON_SLEEP_INTERVAL);
                }
@@ -153,7 +166,7 @@
 
        if (isset($options["daemon-loop"])) {
                if (!make_stampfile('update_daemon.stamp')) {
-                       die("error: unable to create stampfile\n");
+                       _debug("warning: unable to create stampfile\n");
                }
 
                // Call to the feed batch update function
@@ -288,6 +301,35 @@
 
        }
 
+       if (isset($options["update-schema"])) {
+               _debug("checking for updates (" . DB_TYPE . ")...");
+
+               $updater = new DbUpdater($link, DB_TYPE, SCHEMA_VERSION);
+
+               if ($updater->isUpdateRequired()) {
+                       _debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+                       _debug("WARNING: please backup your database before continuing.");
+                       _debug("Type 'yes' to continue.");
+
+                       if (read_stdin() != 'yes')
+                               exit;
+
+                       for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                               _debug("performing update up to version $i...");
+
+                               $result = $updater->performUpdateTo($i);
+
+                               _debug($result ? "OK!" : "FAILED!");
+
+                               if (!$result) return;
+
+                       }
+               } else {
+                       _debug("update not required.");
+               }
+
+       }
+
        if (isset($options["list-plugins"])) {
                $tmppluginhost = new PluginHost($link);
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL);