From b3b5b9665d8c895f19509f4cef97750717da660b Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 8 Mar 2020 11:55:46 +0100 Subject: [PATCH] Fix regression in testing database schema on MSSQL (#7227) --- CHANGELOG | 1 + installer/test.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 037a17a6e..470971d7a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,7 @@ CHANGELOG Roundcube Webmail - Fix invalid Content-Type for messages with only html part and inline images - Mail_Mime-1.10.7 (#7261) - Fix missing contact display name in QR Code data (#7257) - Fix so button label in Select image/media dialogs is "Close" not "Cancel" (#7246) +- Fix regression in testing database schema on MSSQL (#7227) RELEASE 1.4.3 ------------- diff --git a/installer/test.php b/installer/test.php index d18b6a949..132fe1ef0 100644 --- a/installer/test.php +++ b/installer/test.php @@ -190,7 +190,9 @@ if ($db_working) { // more database tests if ($db_working) { // Using transactions to workaround SQLite bug (#7064) - $DB->startTransaction(); + if ($DB->db_provider == 'sqlite') { + $DB->startTransaction(); + } // write test $insert_id = md5(uniqid()); @@ -208,7 +210,9 @@ if ($db_working) { echo '
'; // Transaction end - $DB->rollbackTransaction(); + if ($DB->db_provider == 'sqlite') { + $DB->rollbackTransaction(); + } // check timezone settings $tz_db = 'SELECT ' . $DB->unixtimestamp($DB->now()) . ' AS tz_db';