Improved sfety of inner join for timesheet assignment.

[timetracker.git] / dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index e33635aafd610330da6c844bda8dd1e9d4b92d30..65a6776daeeac7ac571be240bfe041ce2e3f3466 100644 (file)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ if ($_POST) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 

-  if ($_POST["convert11797to11850"]) {
+  if ($_POST["convert11797to11851"]) {

     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`");
     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`");


@@ -1120,6 +1120,9 @@ if ($_POST) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.49', modified = now() where param_name = 'version_db' and param_value = '1.18.48'");
     ttExecute("ALTER TABLE `tt_timesheets` ADD `project_id` int(11) default NULL AFTER `client_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.50', modified = now() where param_name = 'version_db' and param_value = '1.18.49'");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.49', modified = now() where param_name = 'version_db' and param_value = '1.18.48'");
     ttExecute("ALTER TABLE `tt_timesheets` ADD `project_id` int(11) default NULL AFTER `client_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.50', modified = now() where param_name = 'version_db' and param_value = '1.18.49'");

+    ttExecute("drop index timesheet_idx on tt_expense_items");
+    ttExecute("ALTER TABLE `tt_expense_items` DROP `timesheet_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.51', modified = now() where param_name = 'version_db' and param_value = '1.18.50'");

 }
 
   if ($_POST["cleanup"]) {
 }
 
   if ($_POST["cleanup"]) {


@@ -1168,7 +1171,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.18.50)</b>
+    <td width="80%"><b>Create database structure (v1.18.51)</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>


@@ -1213,8 +1216,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
   </tr>
   </tr>
   <tr valign="top">

-    <td>Update database structure (v1.17.97 to v1.18.50)</td>
-    <td><input type="submit" name="convert11797to11850" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.51)</td>
+    <td><input type="submit" name="convert11797to11851" value="Update"></td>

   </tr>
 </table>
 
   </tr>
 </table>