X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=097d2abe5626180c7fa300774661b81e8c0bf1eb;hb=3297bc03f58074f5b688d867f3477e6af47d73de;hp=51b01ede93da4219fa485a7b05e9477c2f43bba5;hpb=09da35919c86360c09fe365fd22c0be34df1c71f;p=timetracker.git
diff --git a/dbinstall.php b/dbinstall.php
index 51b01ede..097d2abe 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ if ($_POST) {
print "Updated $users_updated users...
\n";
}
- if ($_POST["convert11744to11796"]) {
+ 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");
@@ -904,6 +904,63 @@ if ($_POST) {
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"]) {
@@ -949,7 +1006,7 @@ if ($_POST) {
Create database structure (v1.17.96) + | Create database structure (v1.18.00)
(applies only to new installations, do not execute when updating) |