Fixed issue #13700: SQL error when trying to change changing user pas…

…sword on MSSQL DB
LimeSurvey · May 23, 2018 · 83dd978 · 83dd978
1 parent 34b1e4d
commit 83dd978
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -13,7 +13,7 @@
 
 
 $config['versionnumber'] = '3.8.0';
-$config['dbversionnumber'] = 348;
+$config['dbversionnumber'] = 349;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '30032';

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -915,7 +915,7 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
             alterColumn('{{conditions}}','value','string',false,'');
             alterColumn('{{participant_shares}}','can_edit',"string(5)",false);
 
-            alterColumn('{{users}}','password',"binary",false);
+             alterColumn('{{users}}','password',"binary",false);
             dropColumn('{{users}}','one_time_pw');
             addColumn('{{users}}','one_time_pw','binary');
 
@@ -2208,6 +2208,13 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
             $oDB->createCommand()->update('{{settings_global}}', ['stg_value'=>348], "stg_name='DBVersion'");
             $oTransaction->commit();
         }
+        if ($iOldDBVersion < 349) {
+            $oTransaction = $oDB->beginTransaction();
+            dropColumn('{{users}}','one_time_pw');
+            addColumn('{{users}}','one_time_pw','text');
+            $oDB->createCommand()->update('{{settings_global}}', ['stg_value'=>349], "stg_name='DBVersion'");
+            $oTransaction->commit();
+        }
 
     } catch (Exception $e) {
         Yii::app()->setConfig('Updating', false);

diff --git a/installer/create-database.php b/installer/create-database.php
@@ -789,7 +789,7 @@ function createDatabase($oDB){
             'htmleditormode' => "string(7) default 'default'",
             'templateeditormode' => "string(7) NOT NULL default 'default'",
             'questionselectormode' => "string(7) NOT NULL default 'default'",
-            'one_time_pw' => "binary",
+            'one_time_pw' => "text",
             'dateformat' => "integer NOT NULL DEFAULT 1",
             'created' => "datetime",
             'modified' => "datetime",