LimeSurvey · dominikvitt · Apr 29, 2019 · Jan 3, 2018 · Jan 3, 2018 · Jan 3, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@
 language: php
 php:
     - 7.2
+env:
+  - DBENGINE=MYISAM
+  - DBENGINE=INNODB
 
 notifications:
   email:
@@ -31,6 +34,17 @@ before_script:
     - chmod -R 777 upload
     - chmod -R 777 themes  # Need 777 so both console and web server can cd into the folder.
     - chmod -R 777 tests/tmp
+    # InnoDb needs large_file_prefix & Barracuda file format
+    # https://discuss.gogs.io/t/solved-mysql-error-1064-while-running-first-install/1604
+    - mysql -uroot -e "Show  variables like '%large%';"
+    - mysql -uroot -e "SET @@global.innodb_large_prefix = 1;"
+    - mysql -uroot -e "SET @@global.innodb_file_format =  Barracuda;"
+    - mysql -uroot -e "SET @@global.innodb_file_format_max =  Barracuda;"
+
+    - mysql -uroot -e "Show  variables like '%large%';"
+    - mysql -uroot -e "Show  variables like '%innodb_file%';"
+    - mysql -uroot -e "Show  variables like '%innodb_default%';"
+
     - php application/commands/console.php install admin password TravisLS no@email.com verbose
     - cp application/config/config-sample-mysql.php application/config/config.php
     # Enable debug=2 in config file. OBS: This assumes debug is on line 61.

diff --git a/application/commands/InstallCommand.php b/application/commands/InstallCommand.php
@@ -103,6 +103,8 @@ protected function createDatabase()
         $this->output('Creating database...');
         App()->configure(array('components'=>array('db'=>array('autoConnect'=>false))));
         $this->connection = App()->db;
+
+
         App()->configure(array('components'=>array('db'=>array('autoConnect'=>true))));
         $connectionString = $this->connection->connectionString;
         $this->output($connectionString);
@@ -115,6 +117,14 @@ protected function createDatabase()
         }
 
         $sDatabaseName = $this->getDBConnectionStringProperty('dbname', $connectionString);
+        $dbEngine = getenv('DBENGINE');
+
+        if (!empty($this->connection) && $this->connection->driverName == 'mysql') {
+            $this->connection
+                ->createCommand(new CDbExpression(sprintf('SET default_storage_engine=%s;', $dbEngine)))
+                ->execute();
+        }
+
         try {
             switch ($this->connection->driverName) {
                 case 'mysqli':

diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
diff --git a/application/core/db/MysqlSchema.php b/application/core/db/MysqlSchema.php
@@ -15,7 +15,7 @@ public function __construct($conn)
     public function createTable($table, $columns, $options = null)
     {
         if (empty($options)) {
-            $options = 'ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci';
+            $options = 'DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci';
         }
 
         // Below copied from parent.

diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
@@ -311,10 +311,13 @@ function activateSurvey($iSurveyID, $simulate = false)
 
     $aTableDefinition = array();
     $bCreateSurveyDir = false;
+    $options = '';
     // Specify case sensitive collations for the token
     $sCollation = '';
     if (Yii::app()->db->driverName == 'mysqli' || Yii::app()->db->driverName == 'mysql') {
         $sCollation = " COLLATE 'utf8mb4_bin'";
+        $options .= sprintf(" ENGINE = %s ", Yii::app()->getConfig('mysqlEngine'));
+
     }
     if (Yii::app()->db->driverName == 'sqlsrv' || Yii::app()->db->driverName == 'dblib' || Yii::app()->db->driverName == 'mssql') {
         $sCollation = " COLLATE SQL_Latin1_General_CP1_CS_AS";
@@ -459,7 +462,7 @@ function activateSurvey($iSurveyID, $simulate = false)
     $sTableName = "{{survey_{$iSurveyID}}}";
     Yii::app()->loadHelper("database");
     try {
-        Yii::app()->db->createCommand()->createTable($sTableName, $aTableDefinition);
+        Yii::app()->db->createCommand()->createTable($sTableName, $aTableDefinition, $options);
         Yii::app()->db->schema->getTable($sTableName, true); // Refresh schema cache just in case the table existed in the past
     } catch (CDbException $e) {
         if (App()->getConfig('debug')) {
@@ -509,7 +512,7 @@ function activateSurvey($iSurveyID, $simulate = false)
 
         $sTableName = "{{survey_{$iSurveyID}_timings}}";
         try {
-            Yii::app()->db->createCommand()->createTable($sTableName, $aTimingTableDefinition);
+            Yii::app()->db->createCommand()->createTable($sTableName, $aTimingTableDefinition, $options);
             Yii::app()->db->schema->getTable($sTableName, true); // Refresh schema cache just in case the table existed in the past
         } catch (CDbException $e) {
             return array('error'=>'timingstablecreation');

diff --git a/application/models/Box.php b/application/models/Box.php
@@ -60,6 +60,7 @@ public function attributeLabels()
         );
     }
 
+
     /**
      * Retrieves a list of models based on the current search/filter conditions.
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,7 @@ public function attributeLabels() @@
             );
         }
         /**
          * Retrieves a list of models based on the current search/filter conditions.
          *
@@ Expand Down @@