Fixed issue #CR-1392: SQL not compatible with MSSQL and Postgres (#3700)

LimeSurvey · Jan 16, 2024 · 356f60b · 356f60b
1 parent bb0854a
commit 356f60b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -12,7 +12,7 @@
  */
 
 $config['versionnumber'] = '6.4.2';
-$config['dbversionnumber'] = 620;
+$config['dbversionnumber'] = 621;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;

diff --git a/application/helpers/update/updates/Update_621.php b/application/helpers/update/updates/Update_621.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace LimeSurvey\Helpers\Update;
+
+use LimeSurvey\Helpers\Update\DatabaseUpdateBase;
+
+class Update_621 extends DatabaseUpdateBase
+{
+    /**
+     * @inheritDoc
+     */
+    public function up()
+    {
+        $table = \Yii::app()->db->schema->getTable('{{users}}');
+        if (isset($table->columns['user_status']) && $table->columns['user_status']->dbType != 'integer') {
+            \alterColumn('{{users}}', 'user_status', "integer", false, 1);
+        }
+    }
+}
diff --git a/installer/create-database.php b/installer/create-database.php
@@ -1098,7 +1098,7 @@ function populateDatabase($oDB)
             'validation_key_expiration' => 'datetime',
             'last_forgot_email_password' => 'datetime',
             'expires' => 'datetime',
-            'user_status' => 'BOOLEAN DEFAULT TRUE'
+            'user_status' => 'integer NOT NULL DEFAULT 1'
         ), $options);
 
         $oDB->createCommand()->createIndex('{{idx1_users}}', '{{users}}', 'users_name', true);