From 2491c6240cad60e68916a79c7a0689bedc2cefd9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 15 Apr 2010 03:28:05 -0400
Subject: [PATCH] Add minimal database schema check to installer and update script
---
installer/test.php | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/installer/test.php b/installer/test.php
index 1495715..66698d7 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -164,15 +164,12 @@
echo '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
$db_working = false;
}
- /*
- else if (!$RCI->db_schema_check($update = !empty($_POST['updatedb']))) {
+ else if ($RCI->db_schema_check($DB, $update = !empty($_POST['updatedb']))) {
$RCI->fail('DB Schema', "Database schema differs");
-
- echo $update ? '<p class="warning">Failed to update the database schema! Please manually execute the SQL statements from the SQL/*.update.sql file on your database</p>' :
- '<p><input type="submit" name="updatedb" value="Update schema now" /></p>';
+ $updatefile = INSTALL_PATH . 'SQL/' . $DB->db_provider . '.update.sql';
+ echo '<p class="warning">Please manually execute the SQL statements from '.$updatefile.' on your database</p>';
$db_working = false;
}
- */
else {
$RCI->pass('DB Schema');
echo '<br />';
--
Gitblit v1.9.1