more work on singleton-based DB

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index e1afb6bd6e927e71d6667cab611daed9d45a1f36..d9009f9652e47e134dd5b41427e0a91eeea81790 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -7,12 +7,14 @@
 
        chdir(dirname(__FILE__));
 
+       require_once "autoload.php";
        require_once "functions.php";
        require_once "rssfuncs.php";
        require_once "config.php";
        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');
@@ -20,7 +22,7 @@
        // Create a database connection.
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       init_connection($link);
+       init_plugins($link);
 
        $longopts = array("feeds",
                        "feedbrowser",
@@ -88,6 +90,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"])) {
@@ -353,4 +363,4 @@
 
        if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
                unlink(LOCK_DIRECTORY . "/$lock_filename");
-g?>
+?>