Changeset 7615

Timestamp:

Mar 1, 2019, 2:19:42 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2149: Batch item importers should be able to use an annotation for item identification

Added AnnotationTypeData.isIdentifier() so that we can flag annotation types that are intended to be used as indentifiers.

Location:

trunk/src/core/net/sf/basedb/core

Files:

• AnnotationType.java (modified) (1 diff)
• Install.java (modified) (1 diff)
• Update.java (modified) (3 diffs)
• data/AnnotationTypeData.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/AnnotationType.java

@@ -1033 +1033 @@
     getData().setProjectAnnotations(projectAnnotations);
   }
+  
+  /**
+    @see #isIdentifier()
+    @since 3.15
+  */
+  public void setIdentifier(boolean isIdentifier)
+    throws PermissionDeniedException
+  {
+    checkPermission(Permission.WRITE);
+    getData().setIdentifier(isIdentifier);
+  }
+  
+  /**
+    If this flag is set, annotation values are considered to be alternate
+    identifiers for the items they belong to. But note that BASE will not
+    check or prevent the same value from being used for more than one item.
+    @since 3.15
+  */
+  public boolean isIdentifier()
+  {
+    return getData().isIdentifier();
+  }
 
   /**

trunk/src/core/net/sf/basedb/core/Install.java

@@ -119 +119 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(144).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(145).intValue();
   
   public static synchronized int createTables(SchemaGenerator.Mode mode, ProgressReporter progress,

trunk/src/core/net/sf/basedb/core/Update.java

@@ -416 +416 @@
     </td>
   </tr>
-  
+  <tr>
+    <td>145</td>
+    <td>
+      Added {@link AnnotationTypeData#isIdentifier()}.
+      The update will set the value to FALSE for all existing annotation types.
+    </td>
+  </tr>
+
   </table>
 
@@ -679 +686 @@
         schemaVersion = updateToSchemaVersion144(session, schemaVersion);
         progress_current += 2 * progress_step;
+      }
+      
+      if (schemaVersion < 145)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 145...");
+        schemaVersion = setSchemaVersionInTransaction(session, 145);
+        progress_current += progress_step;
       }
       
@@ -1033 +1047 @@
         query.executeUpdate();
       }
+      
+      if (schemaVersion < 145)
+      {
+        // Set identifier=false on all annotation types
+        org.hibernate.query.Query<?> query = HibernateUtil.createQuery(session, 
+          "UPDATE AnnotationTypeData at " +
+          "SET at.identifier = false " +
+          "WHERE at.identifier IS NULL");
+        query.executeUpdate();
+      }
+
       
       //  Commit the changes

trunk/src/core/net/sf/basedb/core/data/AnnotationTypeData.java

@@ -294 +294 @@
   }
 
+  private boolean isIdentifier;
+  /**
+    If this flag is set, annotation values can be used as identifiers to items.
+    @since 3.15
+    @hibernate.property column="`is_identifier`" type="boolean" not-null="true"
+  */
+  public boolean isIdentifier()
+  {
+    return isIdentifier;
+  }
+  public void setIdentifier(boolean isIdentifier)
+  {
+    this.isIdentifier = isIdentifier;
+  }
+
+  
   private Set<Integer> itemTypes;
   /**