Changeset 3217

Timestamp:

07/31/13 16:15:15 (11 years ago)

Author:

olhsha

Message:

changing handling permissions: adding a 1 column table with all possible permission values, so far only 3 of them

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src

Files:

• main/sql/DashishAnnotatorCreate.sql (modified) (3 diffs)
• test/resources/test-data/InsertTestData.sql (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/sql/DashishAnnotatorCreate.sql

@@ -162 +162 @@
 
 
-
------------------------------------------------------------------------
---------------------- JOINT TABLES ------------------------------------
-
-CREATE TABLE annotations_target_sources (
-   annotation_id integer REFERENCES annotation(annotation_id), -- defining a foreign key: there must be a uniquely defined row in "annotation", that is defined by "annotation_id"
-   source_id integer REFERENCES target_source(source_id),
-   unique(annotation_id, source_id),
-);
-
-
-
-CREATE TABLE notebooks_annotations (
-    notebook_id integer REFERENCES notebook(notebook_id),
-    annotation_id integer REFERENCES annotation(annotation_id),
-    unique(notebook_id, annotation_id),
-);
-
-CREATE TABLE sources_versions (
-    source_id integer REFERENCES target_source(source_id),
-    version_id integer REFERENCES version(version_id),
-    unique(source_id, version_id),
-);
-
-CREATE TABLE versions_cached_representations (
-    version_id integer REFERENCES version(version_id),
-    cached_representation_id integer REFERENCES cached_representation_info(cached_representation_id),
-    unique(version_id, cached_representation_id),
-);
-
--------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------------
 --  <xs:simpleType name="Permission">
@@ -203 +172 @@
 
 
+
+CREATE TABLE permission_ (
+  permission_mode text UNIQUE NOT NULL,
+)
+
+-----------------------------------------------------------------------
+--------------------- JOINT TABLES ------------------------------------
+
+CREATE TABLE annotations_target_sources (
+   annotation_id integer REFERENCES annotation(annotation_id), -- defining a foreign key: there must be a uniquely defined row in "annotation", that is defined by "annotation_id"
+   source_id integer REFERENCES target_source(source_id),
+   unique(annotation_id, source_id),
+);
+
+
+
+CREATE TABLE notebooks_annotations (
+    notebook_id integer REFERENCES notebook(notebook_id),
+    annotation_id integer REFERENCES annotation(annotation_id),
+    unique(notebook_id, annotation_id),
+);
+
+CREATE TABLE sources_versions (
+    source_id integer REFERENCES target_source(source_id),
+    version_id integer REFERENCES version(version_id),
+    unique(source_id, version_id),
+);
+
+CREATE TABLE versions_cached_representations (
+    version_id integer REFERENCES version(version_id),
+    cached_representation_id integer REFERENCES cached_representation_info(cached_representation_id),
+    unique(version_id, cached_representation_id),
+);
+
+-------------------------------------------------------------------------------
+
+
 --     <xs:complexType name="UserWithPermission">
 --         <xs:complexContent>
@@ -225 +231 @@
 annotation_id integer REFERENCES annotation(annotation_id),
 principal_id integer REFERENCES principal(principal_id),
-permission_  text,
+permission_  text REFERENCES permission_(permission_mode),
 unique(annotation_id, principal_id),
-CHECK(permission_ = 'reader' OR permission_='writer' OR permission_='owner'),
 -- 1 soundness: ??? owner in this table must be the same as the owner in the annotation table ---
 -- 2 soundness ??? check for any pair (annotation, principal) there must be exactly one row in this table: 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql

@@ -142 +142 @@
 ---- PERMISSIONS --------------------------------------------------------------------------------------------
 
+INSERT INTO permission_(permission_mode) VALUES ('owner');
+INSERT INTO permission_(permission_mode) VALUES ('writer');
+INSERT INTO permission_(permission_mode) VALUES ('reader');
+
 INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (2, 3, 'owner');
 INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (2, 4, 'writer');