Changeset 7856

Timestamp:

Oct 20, 2020, 8:09:37 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2224: Files should be annotatable

Core- and data-layer classes have been updated so that file support annotations. Database schema version updated to 149.

Location:

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

Files:

• File.java (modified) (3 diffs)
• Install.java (modified) (1 diff)
• Update.java (modified) (2 diffs)
• data/FileData.java (modified) (1 diff)

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

@@ -85 +85 @@
 */
 public class File
-  extends CommonItem
+  extends AnnotatedItem
   implements Transactional, DiskConsumable, Subtypable
 {
@@ -507 +507 @@
   // -------------------------------------------
   /*
+    From the Annotatable interface
+    -------------------------------------------
+  */
+  @Override
+  public Set<Annotatable> getAnnotatableParents() 
+  {
+    return null;
+  }
+  // -------------------------------------------
+  
+  /*
     From BasicItem
     -------------------------------------------
@@ -546 +557 @@
     return used || super.isUsed();
   }
+
   /**
     Get all:

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

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

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

@@ -441 +441 @@
     </td>
   </tr>
+  <tr>
+    <td>149</td>
+    <td>
+      Made {@link File} annotatable. No special database update is needed.
+      Only increase the schema version.
+    </td>
+  </tr>
   </table>
 
@@ -719 +726 @@
       }
       
-      if (schemaVersion < 148)
-      {
-        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 148...");
-        schemaVersion = setSchemaVersionInTransaction(session, 148);
-        progress_current += progress_step;
+      if (schemaVersion < 149)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 149...");
+        schemaVersion = setSchemaVersionInTransaction(session, 149);
+        progress_current += 2 * progress_step;
       }
     

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

@@ -37 +37 @@
 */
 public class FileData
-  extends CommonData
+  extends AnnotatedData
   implements DiskConsumableData, LoggableData, SubtypableData
 {