Made quota_percent not null and default to 100 in db.

[timetracker.git] / dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index ea177e978bc8ea982293963175f81e02d26f20b6..74d566cc7185171f9069cbe2df911e428b23387c 100644 (file)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ if ($_POST) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11834"]) {
+  if ($_POST["convert11797to11836"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1042,6 +1042,8 @@ if ($_POST) {
     ttExecute("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.26') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
     ttExecute("ALTER TABLE `tt_users` ADD COLUMN `quota_percent` float(6,2) default NULL after `rate`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.34', modified = now() where param_name = 'version_db' and param_value = '1.18.26'");
+    ttExecute("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.34') set u.quota_percent = 100.00 where u.quota_percent is null");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.36', modified = now() where param_name = 'version_db' and param_value = '1.18.34'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1089,7 +1091,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.34)</b>
+    <td width="80%"><b>Create database structure (v1.18.36)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1134,8 +1136,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.34)</td>
-    <td><input type="submit" name="convert11797to11834" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.36)</td>
+    <td><input type="submit" name="convert11797to11836" value="Update"></td>
   </tr>
 </table>