Commit aefae4c19fdc07ab0f48401691acc8f2b031ba3a

Authored by Michael Joseph
1 parent d9ffe0e7

changed subscription tables

updated folders_users_roles_link


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@694 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing 2 changed files with 32 additions and 16 deletions
sql/drop.sql
... ... @@ -8,7 +8,9 @@ DROP TABLE document_type_fields_link;
8 8 DROP TABLE document_types_lookup;
9 9 DROP TABLE document_words_link;
10 10 DROP TABLE documents;
  11 +DROP TABLE document_subscriptions;
11 12 DROP TABLE folders;
  13 +DROP TABLE folder_subscriptions;
12 14 DROP TABLE folders_users_roles_link;
13 15 DROP TABLE groups_folders_approval_link;
14 16 DROP TABLE groups_folders_link;
... ... @@ -22,7 +24,6 @@ DROP TABLE roles;
22 24 DROP TABLE site_sections_lookup;
23 25 DROP TABLE site_access_lookup;
24 26 DROP TABLE sitemap;
25   -DROP TABLE subscriptions;
26 27 DROP TABLE system_settings;
27 28 DROP TABLE units_lookup;
28 29 DROP TABLE units_organisations_link;
... ...
sql/tables.sql
... ... @@ -80,6 +80,12 @@ minor_version INTEGER NOT NULL,
80 80 is_checked_out BIT NOT NULL
81 81 );
82 82  
  83 +CREATE TABLE document_subscriptions (
  84 +id INTEGER NOT NULL UNIQUE AUTO_INCREMENT,
  85 +user_id INTEGER NOT NULL,
  86 +document_id INTEGER NOT NULL
  87 +);
  88 +
83 89 CREATE TABLE folders (
84 90 id INTEGER NOT NULL UNIQUE AUTO_INCREMENT,
85 91 name CHAR(255),
... ... @@ -91,15 +97,20 @@ unit_id INTEGER,
91 97 is_public BIT NOT NULL
92 98 );
93 99  
  100 +CREATE TABLE folder_subscriptions (
  101 +id INTEGER NOT NULL UNIQUE AUTO_INCREMENT,
  102 +user_id INTEGER NOT NULL,
  103 +folder_id INTEGER NOT NULL
  104 +);
  105 +
94 106 CREATE TABLE folders_users_roles_link (
95 107 id INTEGER NOT NULL UNIQUE AUTO_INCREMENT,
  108 +groups_folders_approval_id INTEGER NOT NULL,
96 109 user_id INTEGER NOT NULL,
97   -folder_id INTEGER NOT NULL,
98   -role_type_id INTEGER NOT NULL,
  110 +document_id INTEGER NOT NULL,
99 111 datetime DATETIME,
100 112 done BIT
101   -)
102   -;
  113 +);
103 114  
104 115 CREATE TABLE groups_folders_approval_link (
105 116 id INTEGER NOT NULL UNIQUE AUTO_INCREMENT,
... ... @@ -183,12 +194,6 @@ is_default BIT,
183 194 is_enabled BIT DEFAULT 1
184 195 );
185 196  
186   -CREATE TABLE subscriptions (
187   -id INTEGER NOT NULL UNIQUE AUTO_INCREMENT,
188   -user_id INTEGER NOT NULL,
189   -document_id INTEGER NOT NULL
190   -);
191   -
192 197 CREATE TABLE system_settings (
193 198 id INTEGER NOT NULL UNIQUE AUTO_INCREMENT,
194 199 name CHAR(255) NOT NULL,
... ... @@ -307,6 +312,21 @@ ADD CONSTRAINT PK_documents
307 312 PRIMARY KEY (id)
308 313 ;
309 314  
  315 +ALTER TABLE document_subscriptions
  316 +ADD CONSTRAINT PK_document_subscriptions
  317 +PRIMARY KEY (id)
  318 +;
  319 +
  320 +ALTER TABLE folders
  321 +ADD CONSTRAINT PK_folders
  322 +PRIMARY KEY (id)
  323 +;
  324 +
  325 +ALTER TABLE folder_subscriptions
  326 +ADD CONSTRAINT PK_folder_subscriptions
  327 +PRIMARY KEY (id)
  328 +;
  329 +
310 330 ALTER TABLE folders_users_roles_link
311 331 ADD CONSTRAINT PK_folders_users_roles_link
312 332 PRIMARY KEY (id)
... ... @@ -372,11 +392,6 @@ ADD CONSTRAINT PK_sitemap
372 392 PRIMARY KEY (id)
373 393 ;
374 394  
375   -ALTER TABLE subscriptions
376   -ADD CONSTRAINT PK_subscriptions
377   -PRIMARY KEY (id)
378   -;
379   -
380 395 ALTER TABLE system_settings
381 396 ADD CONSTRAINT PK_system_settings
382 397 PRIMARY KEY (id)
... ...