Merge branch 'master' into develop

LimeSurvey · Mar 19, 2020 · 9709397 · 9709397
2 parents 11043f6 + de2cd28
commit 9709397
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -71,8 +71,12 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
     $oDB->schemaCachingDuration = 0; // Deactivate schema caching
     Yii::app()->setConfig('Updating', true);
     $options = "";
+    // The engine has to be explicitely set because MYSQL 8 switches the default engine to INNODB
     if ( Yii::app()->db->driverName == 'mysql' ) {
-        $options = 'ROW_FORMAT=DYNAMIC'; // Same than create-database
+        $options='ENGINE='.Yii::app()->getConfig('mysqlEngine').' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci';
+        if (Yii::app()->getConfig('mysqlEngine')=='INNODB') {
+            $options .= ' ROW_FORMAT=DYNAMIC'; // Same than create-database
+        }
     }
     try {
 
@@ -2600,6 +2604,8 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
                 'language' =>  "string(20) NOT NULL DEFAULT 'en'"
             ), $options);
             $oDB->createCommand()->createIndex('{{idx1_label_l10ns}}', '{{label_l10ns}}', ['label_id', 'language'], true);
+            // Remove invalid labels, otherwise update will fail because of index duplicates in the next query
+            $oDB->createCommand("delete from {{labels_update400}} WHERE code=''")->execute();
             $oDB->createCommand("INSERT INTO {{label_l10ns}}
                 (label_id, title, language)
                 SELECT {{labels}}.id ,{{labels_update400}}.title,{{labels_update400}}.language

diff --git a/locale/fi/fi.mo b/locale/fi/fi.mo
diff --git a/locale/fr/fr.mo b/locale/fr/fr.mo
diff --git a/locale/nl-informal/nl-informal.mo b/locale/nl-informal/nl-informal.mo
diff --git a/locale/nl/nl.mo b/locale/nl/nl.mo
diff --git a/locale/sv/sv.mo b/locale/sv/sv.mo