Changeset 3887 in subversion

Timestamp:

Aug 10, 2010 2:32:50 AM (3 years ago)

Author:

alec

Message:

• Fix path to SQL files when using pgsql/mysqli/sqlsrv drivers (#1486902)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• bin/update.sh (modified) (1 diff)
• installer/test.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -3 +3 @@
 
 - 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

trunk/roundcubemail/bin/update.sh

@@ -115 +115 @@
     }
     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";

trunk/roundcubemail/installer/test.php

@@ -167 +167 @@
     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>';