diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rwxr-xr-x | bin/update.sh | 3 | ||||
| -rw-r--r-- | installer/test.php | 3 |
3 files changed, 5 insertions, 2 deletions
@@ -2,6 +2,7 @@ CHANGELOG RoundCube Webmail =========================== - Improve handling of single-part messages with bogus BODYSTRUCTURE (#1486898) +- Fix path to SQL files when using pgsql/mysqli/sqlsrv drivers (#1486902) RELEASE 0.4 ----------- diff --git a/bin/update.sh b/bin/update.sh index 7a4d1cf17..2d59b26c1 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -114,7 +114,8 @@ if ($RCI->configured) { $success = false; } else if ($RCI->db_schema_check($DB, false)) { - $updatefile = INSTALL_PATH . 'SQL/' . $DB->db_provider . '.update.sql'; + $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql', 'sqlsrv' => 'mssql'); + $updatefile = INSTALL_PATH . 'SQL/' . (isset($db_map[$DB->db_provider]) ? $db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql'; echo "WARNING: Database schema needs to be updated!\n"; echo "Open $updatefile and execute all queries that are superscribed with the currently installed version number\n"; $success = false; diff --git a/installer/test.php b/installer/test.php index b2d3b6f92..a465e2f0b 100644 --- a/installer/test.php +++ b/installer/test.php @@ -166,7 +166,8 @@ if ($db_working) { } else if ($RCI->db_schema_check($DB, $update = !empty($_POST['updatedb']))) { $RCI->fail('DB Schema', "Database schema differs"); - $updatefile = INSTALL_PATH . 'SQL/' . $DB->db_provider . '.update.sql'; + $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql', 'sqlsrv' => 'mssql'); + $updatefile = INSTALL_PATH . 'SQL/' . (isset($db_map[$DB->db_provider]) ? $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 that are superscribed with the currently installed version number.</p>'; $db_working = false; |