Merges an updated upstream from main.

[timetracker.git] / dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index 1429a24f549fbfc43d14803154d5728280a454dc..8964d934eb251d0fccdaef2a59d7247f29756951 100644 (file)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -517,6 +517,11 @@ if ($_POST) {
     setChange("DROP INDEX name_idx on tt_invoices");
     setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
     setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");
     setChange("DROP INDEX name_idx on tt_invoices");
     setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
     setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");

+    setChange("ALTER TABLE tt_teams DROP locktime");
+  }
+  
+  if ($_POST["convert1900to1930"]){
+    setChange("CREATE TABLE `timetracker`.`tt_monthly_quota` ( `year` SMALLINT UNSIGNED NOT NULL , `month` TINYINT UNSIGNED NOT NULL , `quota` SMALLINT UNSIGNED NOT NULL , PRIMARY KEY (`year`, `month`))");

   }
 
   // The update_clients function updates projects field in tt_clients table.
   }
 
   // The update_clients function updates projects field in tt_clients table.


@@ -621,7 +626,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>

-    <td width="80%"><b>Create database structure (v1.9)</b>
+    <td width="80%"><b>Create database structure (v1.9.30)</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>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>


@@ -656,6 +661,10 @@ if ($_POST) {
     <td>Update database structure (v1.6 to v1.9)</td>
     <td><input type="submit" name="convert1600to1900" value="Update"><br></td>
   </tr>
     <td>Update database structure (v1.6 to v1.9)</td>
     <td><input type="submit" name="convert1600to1900" value="Update"><br></td>
   </tr>

+  <tr valign="top">
+    <td>Update database structure (v1.9 to v1.9.30)</td>
+    <td><input type="submit" name="convert1900to1930" value="Update"><br></td>
+  </tr>

 </table>
 
 <h2>DB Maintenance</h2>
 </table>
 
 <h2>DB Maintenance</h2>