summaryrefslogtreecommitdiff
path: root/installer/test.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-01-17 08:35:35 +0100
committerAleksander Machniak <alec@alec.pl>2013-01-17 08:35:35 +0100
commit393618dacb75c55fbf482e9ee5e368b852bfc6e7 (patch)
tree00fbf76a43db2ace0cae65f1fb47c95a2cf00583 /installer/test.php
parentb5b76d2ccb8e28183c078d242e1530508b2686ae (diff)
parentc101871d463963fe5426a2db3ba39cb524a96dbd (diff)
Merge branch 'schema_upgrades'
Diffstat (limited to 'installer/test.php')
-rw-r--r--installer/test.php13
1 files changed, 5 insertions, 8 deletions
diff --git a/installer/test.php b/installer/test.php
index b118924e4..bd49ac523 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -164,11 +164,9 @@ if ($db_working && $_POST['initdb']) {
}
else if ($db_working && $_POST['updatedb']) {
- if (!($success = $RCI->update_db($DB, $_POST['version']))) {
- $updatefile = INSTALL_PATH . 'SQL/' . (isset($RCI->db_map[$DB->db_provider]) ? $RCI->db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql';
- echo '<p class="warning">Please manually execute the SQL statements from '.$updatefile.' on your database.<br/>';
- echo 'See comments in the file and execute queries below the comment with the currently installed version number.</p>';
- }
+ if (!($success = $RCI->update_db($_POST['version']))) {
+ echo '<p class="warning">Database schema update failed.</p>';
+ }
}
// test database
@@ -183,9 +181,8 @@ if ($db_working) {
$RCI->fail('DB Schema', "Database schema differs");
echo '<ul style="margin:0"><li>' . join("</li>\n<li>", $err) . "</li></ul>";
$select = $RCI->versions_select(array('name' => 'version'));
- echo '<p class="suggestion">You should run the update queries to get the schmea fixed.<br/><br/>Version to update from: ' . $select->show() . '&nbsp;<input type="submit" name="updatedb" value="Update" /></p>';
-// echo '<p class="warning">Please manually execute the SQL statements from '.$updatefile.' on your database.<br/>';
-// echo 'See comments in the file and execute queries that are superscribed with the currently installed version number.</p>';
+ $select->add('0.9 or newer', '');
+ echo '<p class="suggestion">You should run the update queries to get the schema fixed.<br/><br/>Version to update from: ' . $select->show() . '&nbsp;<input type="submit" name="updatedb" value="Update" /></p>';
$db_working = false;
}
else {