ttOrgImportHelper class impoved to output conflicting login names.

[timetracker.git] / mysql.sql

diff --git a/mysql.sql b/mysql.sql
index b29d08d..00abb46 100644 (file)
--- a/mysql.sql
+++ b/mysql.sql
@@ -117,6 +117,7 @@ INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALU
 CREATE TABLE `tt_projects` (
   `id` int(11) NOT NULL auto_increment,         # project id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # project name
   `description` varchar(255) default NULL,      # project description
   `tasks` text default NULL,                    # comma-separated list of task ids associated with this project
@@ -134,6 +135,7 @@ create unique index project_idx on tt_projects(group_id, name, status);
 CREATE TABLE `tt_tasks` (
   `id` int(11) NOT NULL auto_increment,         # task id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # task name
   `description` varchar(255) default NULL,      # task description
   `status` tinyint(4) default 1,                # task status
@@ -151,6 +153,8 @@ CREATE TABLE `tt_user_project_binds` (
   `id` int(11) NOT NULL auto_increment, # bind id
   `user_id` int(11) NOT NULL,           # user id
   `project_id` int(11) NOT NULL,        # project id
+  `group_id` int(11) default NULL,      # group id
+  `org_id` int(11) default NULL,        # organization id
   `rate` float(6,2) default '0.00',     # rate for this user when working on this project
   `status` tinyint(4) default 1,        # bind status
   PRIMARY KEY (`id`)
@@ -164,8 +168,10 @@ create unique index bind_idx on tt_user_project_binds(user_id, project_id);
 # Structure for table tt_project_task_binds. This table maps projects to assigned tasks.
 #
 CREATE TABLE `tt_project_task_binds` (
-  `project_id` int(11) NOT NULL, # project id
-  `task_id` int(11) NOT NULL     # task id
+  `project_id` int(11) NOT NULL,        # project id
+  `task_id` int(11) NOT NULL            # task id
+  `group_id` int(11) default NULL,      # group id
+  `org_id` int(11) default NULL,        # organization id
 );
 
 # Indexes for tt_project_task_binds.
@@ -181,6 +187,7 @@ CREATE TABLE `tt_log` (
   `id` bigint NOT NULL auto_increment,             # time record id
   `user_id` int(11) NOT NULL,                      # user id
   `group_id` int(11) default NULL,                 # group id
+  `org_id` int(11) default NULL,                   # organization id
   `date` date NOT NULL,                            # date the record is for
   `start` time default NULL,                       # record start time (for example, 09:00)
   `duration` time default NULL,                    # record duration (for example, 1 hour)
@@ -217,6 +224,7 @@ create index task_idx on tt_log(task_id);
 CREATE TABLE `tt_invoices` (
   `id` int(11) NOT NULL auto_increment,         # invoice id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # invoice name
   `date` date NOT NULL,                         # invoice date
   `client_id` int(11) NOT NULL,                 # client id
@@ -461,4 +469,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.09', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.12', now()); # TODO: change when structure changes.