Changeset 7283

Timestamp:

Jan 26, 2017, 11:19:20 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2049: Project-specific annotations

Updated the TestAnnotation code with tests for inheriting and removing annotations. Fixed problems with !MySQL queries.

Location:

branches/3.10-stable

Files:

• config/dist/mysql-queries.xml (modified) (2 diffs)
• src/core/common-queries.xml (modified) (1 diff)
• src/test/TestAnnotation.java (modified) (7 diffs)

branches/3.10-stable/config/dist/mysql-queries.xml

@@ -91 +91 @@
       UPDATE [Annotations] 
       SET [override_id] = COALESCE(
-        (SELECT [tmp].[id] FROM
-          (SELECT [id] FROM [Annotations] 
+        (SELECT [tmp].[id] FROM (
+          SELECT [id] FROM [Annotations] 
           WHERE [annotationset_id] = :annotationSetId
           AND [annotationtype_id] = :annotationTypeId
-          AND [source] = 0 AND [project_id] = 0) [tmp]
-        ) 
+          AND [source] = 0 AND [project_id] = 0
+        ) [tmp] ) 
         , 0)
       WHERE id = :annotationId
@@ -108 +108 @@
     </description>
   </query>
+  
+  <query id="PS_UPDATE_PROJECT_ANNOTATION_OVERRIDE_REF_INHERITED" type="HQL">
+    <sql>
+      UPDATE [Annotations] 
+      SET [override_id] = :annotationId
+      WHERE [annotationset_id] = :annotationSetId
+      AND [inherited_id] IN (
+        SELECT [tmp].[id] FROM (
+          SELECT [id] FROM [Annotations]
+          WHERE [annotationset_id] = :parentSetId
+          AND [override_id] = :parentId
+        ) [tmp]
+      )
+    </sql>
+    <description>
+      Updates the "override_id" column on project-specific annotations
+      to point to a newly created default annotation (INHERITED and 
+      CLONED annotations). The subquery will find project-specific annotation
+      on the parent annotation set that is overriding the inherited annotation.
+      
+      To make this query work in MySQL we need a double inner subselect 
+      to force a temporary table for the values we are after.
+    </description>
+  </query>
+  
+  <query id="PS_FIND_OVERRIDE_ID_FOR_PROJECT_ANNOTATION_INHERITED" type="SQL">
+    <sql>
+      UPDATE [Annotations] 
+      SET [override_id] = COALESCE(
+        (SELECT [tmp].[id] FROM (
+          SELECT [id] FROM [Annotations] 
+          WHERE [annotationset_id] = :annotationSetId
+          AND [inherited_id] = :parentOverrideId
+          AND [source] &lt;&gt; 0 
+          AND [project_id] = 0
+        ) [tmp])
+        , 0)
+      WHERE id = :annotationId
+    </sql>
+    <description>
+      Updates the "override_id" column on a newly created project-specific 
+      (CLONED or INHERITED) annotation to point to the existing default 
+      annotation id or 0 if no default annotation exists.
+      
+      To make this query work in MySQL we need a double inner subselect 
+      to force a temporary table for the values we are after.
+    </description>
+  </query>
 
+  <query id="PS_RESET_OVERRIDE_ON_PROJECT_ANNOTATIONS" type="HQL">
+    <sql>
+      UPDATE [Annotations]  
+      SET [override_id] = 0
+      WHERE [override_id] IN (:deletedAnnotations)
+      OR [inherited_id] IN (
+        SELECT [tmp].[id] FROM (
+          SELECT [id] FROM [Annotations] 
+          WHERE [override_id] IN (:deletedPrimaryAnnotations)
+        ) [tmp]
+      )
+    </sql>
+    <description>
+      Reset the "override_id" column on project-specific annotations
+      that points to a default annotation that has been removed.
+
+      To make this query work in MySQL we need a double inner subselect 
+      to force a temporary table for the values we are after.
+    </description>
+  </query>
+  
 </predefined-queries>

branches/3.10-stable/src/core/common-queries.xml

@@ -3823 +3823 @@
     <description>
       Updates the "override_id" column on a newly created project-specific 
-      (PRIMARY) annotation to point to the existing default annotation id
-      or 0 if no default annotation exists.
+      (CLONED or INHERITED) annotation to point to the existing default 
+      annotation id or 0 if no default annotation exists.
     </description>
   </query>

branches/3.10-stable/src/test/TestAnnotation.java

@@ -100 +100 @@
     // Test: inherit and clone annotations
     int rawBioAssayId = TestRawBioAssay.test_create(Platform.GENERIC, "genepix", null, 0, 0, 0, 0, arrayDesignId, false);
+    int rawBioAssayId2 = TestRawBioAssay.test_create(Platform.GENERIC, "genepix", null, 0, 0, 0, 0, arrayDesignId2, false);
     test_inherit_annotation(Item.RAWBIOASSAY, rawBioAssayId, intAnnotationId, false);
     int clonedId = test_inherit_annotation(Item.RAWBIOASSAY, rawBioAssayId, stringAnnotationId, true);
@@ -110 +111 @@
     // Test project specific annotations -- set a default value and a project-specific for "Project #1"
     int defaultProjectAnnotationId = test_annotatate(Item.ARRAYDESIGN, arrayDesignId2, projectSpecificId, 0, "default value");
+    test_inherit_annotation(Item.RAWBIOASSAY, rawBioAssayId2, defaultProjectAnnotationId, false);
+    
     TestProject.test_activate_project(project1, null);
     int project1AnnotationId = test_annotatate(Item.ARRAYDESIGN, arrayDesignId2, projectSpecificId, 0, "project 1 value");
+    test_inherit_annotation(Item.RAWBIOASSAY, rawBioAssayId2, project1AnnotationId, false);
     TestProject.test_noactive_project();
+    
+    if (defaultProjectAnnotationId == project1AnnotationId)
+    {
+      write("--Create project-specific annotation value FAILED (test returns the default value");
+      ok = false;
+    }
 
     // Check that the annotation values are as expected
@@ -120 +130 @@
     TestProject.test_activate_project(project2, null);
     test_project_annotation(Item.ARRAYDESIGN, arrayDesignId2, projectSpecificId, "default value", "project 1 value");
+
+    
+    if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
+    
+    // Remove project-specific annotation
+    test_remove_annotation(Item.ARRAYDESIGN, arrayDesignId2, projectSpecificId);
     TestProject.test_noactive_project();
-    
-    if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
+    test_remove_annotation(Item.ARRAYDESIGN, arrayDesignId2, projectSpecificId);
+    
     // Remove an annotation that is inherited
     test_remove_annotation(Item.ARRAYDESIGN, arrayDesignId, intId);
@@ -128 +144 @@
     
     TestRawBioAssay.test_delete(rawBioAssayId);
+    TestRawBioAssay.test_delete(rawBioAssayId2);
 
     // Remove the annotations
@@ -184 +201 @@
         l.addAll(Arrays.asList(value));
         Unit unit = unitId != 0 ? Unit.getById(dc, unitId) : null;
-        a.setValuesIfDifferent(l, unit);
+        boolean changed = a.setValuesIfDifferent(l, unit);
+        if (changed && at.getProjectAnnotations() && dc.getSessionControl().getActiveProjectId() != a.getProjectId())
+        {
+          // We have created  a different (project-specific) annotation
+          a = as.getAnnotation(at);
+        }
       }
       dc.commit();
@@ -368 +390 @@
     if (!TestUtil.getSilent())
     {
-      write("   \tID \tAnnotation type\tAnnotation set\tSource\tParent\tValues\tUnit\tRaw values");
-      write("-- \t-- \t---------------\t--------------\t------\t------\t------\t----\t----------");
+      write("   \tID \tAnnotation type\tAnnotation set\tSource\tProject\tParent\tValues\tUnit\tRaw values");
+      write("-- \t-- \t---------------\t--------------\t------\t-------\t------\t------\t----\t----------");
     }
   }
@@ -387 +409 @@
     }
     write(i+":\t"+a.getId()+"\t"+a.getAnnotationType()+"\t"+a.getAnnotationSet()+"\t"+
-        a.getSource()+"\t"+a.getInheritedFrom()+"\t" +
+        a.getSource()+"\t"+a.getProjectId()+"\t"+a.getInheritedFrom()+"\t" +
         values + "\t" + a.getUnit() + "\t" + a.getValues());
   }