From 5ed4ee204f5e629013505c51bb702dc4f6b7de59 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 10 Aug 2010 06:32:50 +0000 Subject: - Fix path to SQL files when using pgsql/mysqli/sqlsrv drivers (#1486902) git-svn-id: https://svn.roundcube.net/trunk@3887 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/CHANGELOG | 1 + roundcubemail/bin/update.sh | 3 ++- roundcubemail/installer/test.php | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index fbb721bad..117e1cbb7 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -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/roundcubemail/bin/update.sh b/roundcubemail/bin/update.sh index 7a4d1cf17..2d59b26c1 100755 --- a/roundcubemail/bin/update.sh +++ b/roundcubemail/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/roundcubemail/installer/test.php b/roundcubemail/installer/test.php index b2d3b6f92..a465e2f0b 100644 --- a/roundcubemail/installer/test.php +++ b/roundcubemail/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 '

Please manually execute the SQL statements from '.$updatefile.' on your database.
'; echo 'See comments in the file and execute queries that are superscribed with the currently installed version number.

'; $db_working = false; -- cgit v1.2.3