X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=dbinstall.php;h=d84cf4f3fe750a3e45acb57f2931701666e6d7a3;hb=6cb9c41aae566dcc564fa8ad3a6c6ee4facdf373;hp=e8c688486d761c7ca7c0ffdd190685a68cf67179;hpb=a84f7509ea5462f08ca01c5435e0217045391a45;p=timetracker.git
diff --git a/dbinstall.php b/dbinstall.php
index e8c68848..d84cf4f3 100755
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -61,7 +61,7 @@ if ($request->isGet()) {
// spit white space before output in some situations such as in PDF reports.
$file = fopen(APP_DIR.'/WEB-INF/config.php', 'r');
$line = fgets($file);
- if (strcmp('Error: WEB-INF/config.php file does not start with PHP opening tag.
');
}
fclose($file);
@@ -709,13 +709,32 @@ if ($_POST) {
setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
}
- if ($_POST["convert11400to11707"]) {
+ if ($_POST["convert11400to11734"]) {
setChange("ALTER TABLE `tt_teams` DROP `address`");
setChange("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
setChange("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");
setChange("ALTER TABLE `tt_fav_reports` ADD `show_paid` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_invoice`");
setChange("ALTER TABLE `tt_expense_items` ADD `paid` tinyint(4) NULL default '0' AFTER `invoice_id`");
setChange("ALTER TABLE `tt_monthly_quotas` MODIFY `quota` decimal(5,2) NOT NULL");
+ setChange("ALTER TABLE `tt_teams` MODIFY `workday_hours` decimal(5,2) DEFAULT '8.00'");
+ setChange("ALTER TABLE `tt_teams` ADD `config` text default NULL AFTER `custom_logo`");
+ setChange("ALTER TABLE `tt_monthly_quotas` ADD `minutes` int(11) DEFAULT NULL");
+ setChange("ALTER TABLE `tt_teams` ADD `workday_minutes` smallint(4) DEFAULT '480' AFTER `workday_hours`");
+ setChange("UPDATE `tt_teams` SET `workday_minutes` = 60 * `workday_hours`");
+ setChange("ALTER TABLE `tt_teams` DROP `workday_hours`");
+ setChange("UPDATE `tt_monthly_quotas` SET `minutes` = 60 * `quota`");
+ setChange("ALTER TABLE `tt_monthly_quotas` DROP `quota`");
+ setChange("ALTER TABLE `tt_teams` DROP `uncompleted_indicators`");
+ setChange("ALTER TABLE `tt_users` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("ALTER TABLE `tt_teams` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");
+ setChange("create unique index role_idx on tt_roles(team_id, rank, status)");
+ setChange("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");
+ setChange("ALTER TABLE `tt_users` ADD `role_id` int(11) default NULL AFTER `role`");
+ setChange("CREATE TABLE `tt_site_config` (`param_name` varchar(32) NOT NULL, `param_value` text default NULL, `created` datetime default CURRENT_TIMESTAMP, `updated` datetime ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`param_name`))");
+ setChange("INSERT INTO `tt_site_config` (`param_name`, `param_value`) VALUES ('version_db', '1.17.34')");
}
if ($_POST["cleanup"]) {
@@ -748,6 +767,7 @@ if ($_POST) {
setChange("OPTIMIZE TABLE tt_tmp_refs");
setChange("OPTIMIZE TABLE tt_user_project_binds");
setChange("OPTIMIZE TABLE tt_users");
+ setChange("OPTIMIZE TABLE tt_roles");
}
print "done.
\n";
@@ -760,7 +780,7 @@ if ($_POST) {
Create database structure (v1.17.7) + | Create database structure (v1.17.34)
(applies only to new installations, do not execute when updating) |