X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=097d2abe5626180c7fa300774661b81e8c0bf1eb;hb=b027028b5322fcbfb6de53e7a74529cbac7931de;hp=e0973cd7271e63f2102a3d09375d177f39c7d069;hpb=3293ee1f5f59dca3c19a9b9ac21dca90e572b8dd;p=timetracker.git diff --git a/dbinstall.php b/dbinstall.php index e0973cd7..097d2abe 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -789,10 +789,10 @@ if ($_POST) { if (is_a($result, 'PEAR_Error')) die($result->getMessage()); $row = $result->fetchRow(); if ($row['count'] == 0) - ttRoleHelper::createPredefinedRoles($team_id, $lang); + ttRoleHelper::createPredefinedRoles_1_17_44($team_id, $lang); // Obtain new role id based on legacy role. - $role_id = ttRoleHelper::getRoleByRank($legacy_role, $team_id); + $role_id = ttRoleHelper::getRoleByRank_1_17_44($legacy_role, $team_id); if (!$role_id) continue; // Role not found, nothing to do. $sql = "update tt_users set role_id = $role_id where id = $user_id and team_id = $team_id"; @@ -805,7 +805,7 @@ if ($_POST) { print "Updated $users_updated users...
\n"; } - if ($_POST["convert11744to11788"]) { + if ($_POST["convert11744to11797"]) { setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')"); setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'"); setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324"); @@ -899,6 +899,68 @@ if ($_POST) { setChange("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'"); setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where rank = 512"); setChange("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'"); + setChange("ALTER TABLE `tt_fav_reports` ADD `show_work_units` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_custom_field_1`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.92', modified = now() where param_name = 'version_db' and param_value = '1.17.88'"); + setChange("ALTER TABLE `tt_log` ADD `group_id` int(11) default NULL AFTER `user_id`"); + setChange("ALTER TABLE `tt_expense_items` ADD `group_id` int(11) default NULL AFTER `user_id`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.96', modified = now() where param_name = 'version_db' and param_value = '1.17.92'"); + setChange("create index group_idx on tt_log(group_id)"); + setChange("create index group_idx on tt_expense_items(group_id)"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.97', modified = now() where param_name = 'version_db' and param_value = '1.17.96'"); + } + + // The update_group_id function updates group_id field in tt_log and tt_expense_items tables. + if ($_POST["update_group_id"]) { + $mdb2 = getConnection(); + + $sql = "(select distinct user_id from tt_log where group_id is null) union distinct (select distinct user_id from tt_expense_items where group_id is null)"; + $res = $mdb2->query($sql); + if (is_a($res, 'PEAR_Error')) { + die($res->getMessage()); + } + $users_updated = 0; + $tt_log_records_updated = 0; + $tt_expense_items_updated = 0; + + // Iterate through result set. + while ($val = $res->fetchRow()) { + $user_id = $val['user_id']; + $sql = "select group_id from tt_users where id = $user_id"; + $result = $mdb2->query($sql); + if (is_a($result, 'PEAR_Error')) { + die($res->getMessage()); + } + $value = $result->fetchRow(); + $group_id = $value['group_id']; + + if ($group_id) { + $sql = "update tt_log set group_id = $group_id where user_id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) { + die($affected->getMessage()); + } + $tt_log_records_updated += $affected; + + $sql = "update tt_expense_items set group_id = $group_id where user_id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) { + die($affected->getMessage()); + } + $tt_expense_items_updated += $affected; + $users_updated++; + } else { + print "Error: Could not find group for user $user_id...
\n"; + } + } + print "Updated $tt_log_records_updated tt_log records...
\n"; + print "Updated $tt_expense_items_updated tt_expense_items records...
\n"; + } + + if ($_POST["convert11797to11800"]) { + setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL"); + setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`"); + setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'"); } if ($_POST["cleanup"]) { @@ -944,7 +1006,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.17.88) + Create database structure (v1.18.00)
(applies only to new installations, do not execute when updating)
@@ -984,8 +1046,13 @@ if ($_POST) {
- Update database structure (v1.17.44 to v1.17.88) - + Update database structure (v1.17.44 to v1.17.97) +
+ + + + Update database structure (v1.17.97 to v1.18.00) +