Fixed issue #16804: Upgrading from very old versions not possible

LimeSurvey · Nov 2, 2020 · 1ed2c14 · 1ed2c14
1 parent e823792
commit 1ed2c14
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -3356,8 +3356,9 @@ function upgradeSurveyTables181($sMySQLCollation)
                 case 'mysql':
                 case 'mysqli':
                     // Fixes 0000-00-00 00:00:00 datetime entries
-                    $oDB->createCommand()->update($sTableName,array('startdate'=>'1980-01-01 00:00:00'),"startdate=0");
-                    $oDB->createCommand()->update($sTableName,array('datestamp'=>'1980-01-01 00:00:00'),"datestamp=0");
+                    // Startdate and datestamp field only existed in versions older that 1.90 if Datestamps were activated
+                    try { setTransactionBookmark(); $oDB->createCommand()->update($sTableName,array('startdate'=>'1980-01-01 00:00:00'),"startdate=0"); } catch(Exception $e) { rollBackToTransactionBookmark();}
+                    try { setTransactionBookmark(); $oDB->createCommand()->update($sTableName,array('datestamp'=>'1980-01-01 00:00:00'),"datestamp=0"); } catch(Exception $e) { rollBackToTransactionBookmark();}
                     alterColumn($sTableName, 'token', "string(35) COLLATE '{$sMySQLCollation}'");
                     break;
                 default: die('Unknown database driver');