Changeset 5728

Timestamp:

Sep 8, 2011, 3:31:28 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1597: Subtypes of items

Added unique constraint on the subtype+datafiletype combination. Seems like the updatedb script is creating duplicate links... needs to be fixed...

Location:

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

Files:

• Install.java (modified) (1 diff)
• data/ItemSubtypeFileTypeData.java (modified) (2 diffs)

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

@@ -2636 +2636 @@
       {
         log.info("createDataFileType: EXISTS [externalId="+externalId+"]");
-        if (itemSubtypes != null)
+        /*
+        TODO #1591: Make sure that updating create proper file type links
+        if (itemSubtypes != null && schemaVersion.getSchemaVersion() < 100)
         {
-          if (itemSubtypes != null)
+          for (ItemSubtypeFT sft : itemSubtypes)
           {
-            for (ItemSubtypeFT sft : itemSubtypes)
-            {
-              ItemSubtypeFileTypeData subtypeFile = new ItemSubtypeFileTypeData();
-              subtypeFile.setItemSubtype(sft.subtype);
-              subtypeFile.setDataFileType(fileType);
-              subtypeFile.setRequired(sft.required);
-              subtypeFile.setAllowMultiple(sft.multiple);
-              HibernateUtil.saveData(session, subtypeFile);
-            }
+            ItemSubtypeFileTypeData subtypeFile = new ItemSubtypeFileTypeData();
+            subtypeFile.setItemSubtype(sft.subtype);
+            subtypeFile.setDataFileType(fileType);
+            subtypeFile.setRequired(sft.required);
+            subtypeFile.setAllowMultiple(sft.multiple);
+            HibernateUtil.saveData(session, subtypeFile);
           }
         }
+        */
         HibernateUtil.commit(tx);
       }

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

@@ -41 +41 @@
     Get the file type.
     @hibernate.many-to-one outer-join="false" update="false"
-    @hibernate.column name="`datafiletype_id`" not-null="true"
+    @hibernate.column name="`datafiletype_id`" not-null="true" unique-key="uniquefile"
   */
   public DataFileTypeData getDataFileType()
@@ -56 +56 @@
     Get the item subtype.
     @hibernate.many-to-one outer-join="false" update="false"
-    @hibernate.column name="`subtype_id`" not-null="true"
+    @hibernate.column name="`subtype_id`" not-null="true" unique-key="uniquefile"
   */
   public ItemSubtypeData getItemSubtype()