X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=6bb9234fa7ba21e9189f07d66b94051a96a1cef3;hb=a46ca9f2c279305fc8a6c7456e23f4ef46fd6fe4;hp=7f87d7b7c159ab840b68f7446caffa18fd661573;hpb=ab284f0e5be219f5560844cfc5e4c0a48ba1142a;p=timetracker.git
diff --git a/dbinstall.php b/dbinstall.php
index 7f87d7b7..6bb9234f 100755
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -32,6 +32,8 @@ require_once('initialize.php');
import('ttUserHelper');
import('ttTaskHelper');
+// setChange - executes an sql statement. TODO: rename this function to something better.
+// Better yet, redo the entire thing and make an installer.
function setChange($sql) {
print "
".$sql." ";
$mdb2 = getConnection();
@@ -42,6 +44,7 @@ function setChange($sql) {
print "successful update \n";
}
+
if ($request->isGet()) {
echo('Environment Checks ');
@@ -152,6 +155,16 @@ if ($request->isGet()) {
} else {
echo('There are no tables in database. Execute step 1 - Create database structure. ');
}
+
+ $sql = "select param_value from tt_site_config where param_name = 'version_db'";
+ $res = $conn->query($sql);
+ if (is_a($res, 'MDB2_Error')) {
+ die('Error: database schema version query failed. '.$res->getMessage().' ');
+ } else {
+ $val = $res->fetchRow();
+ echo('Current database version is: '.$val['param_value'].'.');
+ }
+
$conn->disconnect();
}
@@ -709,7 +722,7 @@ if ($_POST) {
setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
}
- if ($_POST["convert11400to11734"]) {
+ if ($_POST["convert11400to11735"]) {
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`");
@@ -735,6 +748,9 @@ if ($_POST) {
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 NULL, `updated` datetime default NULL, PRIMARY KEY (`param_name`))");
setChange("INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.34', now())");
+ setChange("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site')");
+ setChange("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'data_entry,view_own_data,manage_own_settings,view_users,on_behalf_data_entry,view_data,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups')");
+ setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.35' where param_name = 'version_db'");
}
if ($_POST["cleanup"]) {
@@ -780,7 +796,7 @@ if ($_POST) {
DB Install
@@ -816,8 +832,8 @@ if ($_POST) {
- Update database structure (v1.14 to v1.17.34)
-
+ Update database structure (v1.14 to v1.17.35)
+