Fixed issue #3987: Upgrade now showing start and endtime

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8189 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 22, 2009 · befe970 · befe970
1 parent ce6718a
commit befe970
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/admin/update/upgrade-mssql.php b/admin/update/upgrade-mssql.php
@@ -20,10 +20,11 @@
 function db_upgrade($oldversion) {
 /// This function does anything necessary to upgrade
 /// older versions to match current functionality
-global $modifyoutput, $dbprefix;
-echo str_pad('Loading... ',4096)."<br />\n";
+    global $modifyoutput, $dbprefix;
+    echo str_pad('Starting database update ('.date('Y-m-d H:i:s').')',4096)."<br />\n";
     if ($oldversion < 111) {
-      // Language upgrades from version 110 to 111 since the language names did change
+
+    // Language upgrades from version 110 to 111 since the language names did change
 
        $oldnewlanguages=array('german_informal'=>'german-informal',
                               'cns'=>'cn-Hans',
@@ -37,13 +38,13 @@ function db_upgrade($oldversion) {
 
         foreach  ($oldnewlanguages as $oldlang=>$newlang)
         {
-            modify_database("","update [prefix_answers] set [language`='$newlang' where language='$oldlang'");  echo $modifyoutput;      flush();
-            modify_database("","update [prefix_questions] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput;flush();
-            modify_database("","update [prefix_groups] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput;flush();
-            modify_database("","update [prefix_labels] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput;flush();
-            modify_database("","update [prefix_surveys] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput;flush();
-            modify_database("","update [prefix_surveys_languagesettings] set [surveyls_language`='$newlang' where surveyls_language='$oldlang'");echo $modifyoutput;flush();
-            modify_database("","update [prefix_users] set [lang`='$newlang' where lang='$oldlang'");echo $modifyoutput;flush();
+            modify_database("","update [prefix_answers] set [language`='$newlang' where language='$oldlang'");  echo $modifyoutput; flush();
+            modify_database("","update [prefix_questions] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput; flush();
+            modify_database("","update [prefix_groups] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput; flush();
+            modify_database("","update [prefix_labels] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput; flush();
+            modify_database("","update [prefix_surveys] set [language`='$newlang' where language='$oldlang'");echo $modifyoutput; flush();
+            modify_database("","update [prefix_surveys_languagesettings] set [surveyls_language`='$newlang' where surveyls_language='$oldlang'");echo $modifyoutput; flush();
+            modify_database("","update [prefix_users] set [lang`='$newlang' where lang='$oldlang'");echo $modifyoutput; flush();
         }
 
 
@@ -354,11 +355,11 @@ function db_upgrade($oldversion) {
         modify_database("", "ALTER TABLE [prefix_surveys] ALTER COLUMN [expires] datetime NULL"); echo $modifyoutput; flush();
         modify_database("", "UPDATE [prefix_settings_global] SET [stg_value]='142' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();
     }
+    echo '<br /><br />Database update finished ('.date('Y-m-d H:i:s').')<br />';
   	return true;
 }
 
 
-
 function upgrade_survey_tables117()
 {
     global $modifyoutput;

diff --git a/admin/update/upgrade-mysql.php b/admin/update/upgrade-mysql.php
@@ -21,7 +21,7 @@ function db_upgrade($oldversion) {
 /// This function does anything necessary to upgrade
 /// older versions to match current functionality
 global $modifyoutput, $databasename, $databasetabletype;
-echo str_pad('Loading... ',4096)."<br />\n";
+    echo str_pad('Starting database update ('.date('Y-m-d H:i:s').')',4096)."<br />\n";
     if ($oldversion < 111) {
       // Language upgrades from version 110 to 111 since the language names did change
 
@@ -342,6 +342,8 @@ function db_upgrade($oldversion) {
         modify_database("","ALTER TABLE `prefix_surveys` CHANGE `startdate` `startdate` datetime"); echo $modifyoutput; flush();
         modify_database("", "UPDATE `prefix_settings_global` SET `stg_value`='142' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();
     }
+
+    echo '<br /><br />Database update finished ('.date('Y-m-d H:i:s').')<br />';
     return true;
 }
 

diff --git a/admin/update/upgrade-postgres.php b/admin/update/upgrade-postgres.php
@@ -18,7 +18,9 @@
 // For this there will be a settings table which holds the last time the database was upgraded
 
 function db_upgrade($oldversion) {
-global $modifyoutput;
+global $modifyoutput, $databasename, $databasetabletype; 
+
+    echo str_pad('Starting database update ('.date('Y-m-d H:i:s').')',4096)."<br />\n";
 
 	if ($oldversion < 127) {
         modify_database("","create index answers_idx2 on prefix_answers (sortorder)"); echo $modifyoutput;  flush();
@@ -182,6 +184,7 @@ function db_upgrade($oldversion) {
         modify_database("", "UPDATE prefix_settings_global SET stg_value='142' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();
 	}
 
+    echo '<br /><br />Database update finished ('.date('Y-m-d H:i:s').')<br />';
     return true;
 }