summaryrefslogtreecommitdiff
path: root/installer/test.php
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2010-04-15 07:28:05 +0000
committerthomascube <thomas@roundcube.net>2010-04-15 07:28:05 +0000
commit2491c6240cad60e68916a79c7a0689bedc2cefd9 (patch)
treef55f1ad34258ee2d89a3fe90bab3b8cbd05fed9e /installer/test.php
parenta35062a1eba5c6c15f703686cd4fecc5536d74df (diff)
Add minimal database schema check to installer and update script
Diffstat (limited to 'installer/test.php')
-rw-r--r--installer/test.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/installer/test.php b/installer/test.php
index 1495715d5..66698d7ad 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -164,15 +164,12 @@ if ($db_working) {
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 />';