Changeset 7312 for trunk/src/core

Timestamp:

Mar 21, 2017, 9:44:03 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2065: Exception when trying to delete a data file type that is referenced from item subtype

The item subtype should now be displayed in the trashcan under the "Items using" section.

Location:

trunk/src/core

Files:

• common-queries.xml (modified) (1 diff)
• net/sf/basedb/core/DataFileType.java (modified) (4 diffs)

trunk/src/core/common-queries.xml

@@ -2401 +2401 @@
   </query>
   
+  <query id="GET_ITEMSUBTYPES_FOR_DATAFILETYPE" type="HQL">
+    <sql>
+      SELECT {1}
+      FROM ItemSubtypeFileTypeData sft
+      WHERE sft.dataFileType = :dataFileType
+    </sql>
+    <description>
+      A Hibernate query that gets item subtype file types for a specific 
+      data file type.
+    </description>
+  </query>
+  
+  
   <query id="GET_FILESETMEMBER_FOR_DATAFILETYPE" type="HQL">
     <sql>

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

@@ -456 +456 @@
       count = HibernateUtil.loadData(Long.class, query);
     }
+    if (count == 0)
+    {
+      query = HibernateUtil.getPredefinedQuery(session, 
+        "GET_ITEMSUBTYPES_FOR_DATAFILETYPE", "count(*)");
+      /*
+        SELECT {1}
+        FROM ItemSubtypeFileTypeData sft
+        WHERE sft.dataFileType = :dataFileType
+      */
+      query.setEntity("dataFileType", this.getData());
+      count = HibernateUtil.loadData(Long.class, query);
+    }
     return count > 0 || super.isUsed();
   }
@@ -462 +474 @@
     <ul>
     <li>{@link FileSetMember}:s using this file type
-    <li>{@link PlatformFileType}:s using this file type
+    <li>{@link Platform}:s using this file type
+    <li>{@link ItemSubtype}:s using this file type
     </ul>
   */
@@ -480 +493 @@
     addUsingItems(using, Item.FILESETMEMBER, query);
     query = HibernateUtil.getPredefinedQuery(session, 
-      "GET_PLATFORMFILETYPE_FOR_DATAFILETYPE", "pft.id");
+      "GET_PLATFORMFILETYPE_FOR_DATAFILETYPE", "pft.platform.id");
       /*
         SELECT {1}
@@ -487 +500 @@
       */
     query.setEntity("dataFileType", this.getData());
-    addUsingItems(using, Item.PLATFORMFILETYPE, query);
+    addUsingItems(using, Item.PLATFORM, query);
+    query = HibernateUtil.getPredefinedQuery(session, 
+      "GET_ITEMSUBTYPES_FOR_DATAFILETYPE", "sft.itemSubtype.id");
+      /*
+        SELECT {1}
+        FROM ItemSubtypeFileTypeData sft
+        WHERE sft.dataFileType = :dataFileType
+      */
+    query.setEntity("dataFileType", this.getData());
+    addUsingItems(using, Item.ITEMSUBTYPE, query);
     return using;
   }