Added file_key field to tt_files table.

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index f41fa84..22f2d0a 100644 (file)
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -166,7 +166,7 @@ class ttFileHelper {
 
     if (!$file_id || !$file_key) {
       if ($file_error) {
-        // Add an error message from file storage facility if we have it.
+        // Add an error from file storage facility if we have it.
         $this->errors->add($file_error);
       }
       return false;

diff --git a/dbinstall.php b/dbinstall.php
index 11cd7e9..37b1d09 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";
   }
 
-  if ($_POST["convert11797to11859"]) {
+  if ($_POST["convert11797to11860"]) {
     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`");
@@ -1129,6 +1129,8 @@ if ($_POST) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.55', modified = now() where param_name = 'version_db' and param_value = '1.18.54'");
     ttExecute("CREATE TABLE `tt_files` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned,`org_id` int(10) unsigned,`remote_id` bigint(20) unsigned,`entity_type` varchar(32),`entity_id` int(10) unsigned,`file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`description` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned,`status` tinyint(1) default 1,PRIMARY KEY  (`id`))");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.59', modified = now() where param_name = 'version_db' and param_value = '1.18.55'");
+    ttExecute("ALTER TABLE `tt_files` ADD `file_key` varchar(32) AFTER `remote_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.60', modified = now() where param_name = 'version_db' and param_value = '1.18.59'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1178,7 +1180,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.59)</b>
+    <td width="80%"><b>Create database structure (v1.18.60)</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>
@@ -1223,8 +1225,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.59)</td>
-    <td><input type="submit" name="convert11797to11859" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.60)</td>
+    <td><input type="submit" name="convert11797to11860" value="Update"></td>
   </tr>
 </table>
 

diff --git a/mysql.sql b/mysql.sql
index fcc4371..d52882c 100644 (file)
--- a/mysql.sql
+++ b/mysql.sql
@@ -543,6 +543,7 @@ CREATE TABLE `tt_files` (
   `group_id` int(10) unsigned,                   # group id
   `org_id` int(10) unsigned,                     # organization id
   `remote_id` bigint(20) unsigned,               # file id in storage facility
+  `file_key` varchar(32),                        # file key
   `entity_type` varchar(32),                     # type of entity file is associated with (project, task, etc.)
   `entity_id` int(10) unsigned,                  # entity id
   `file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # file name
@@ -571,4 +572,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.59', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.60', now()); # TODO: change when structure changes.