Changeset 3784

Timestamp:

Sep 25, 2007, 3:08:39 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #655: Plugins -> defintions fails with 'illegal attempt to dereference collection'

Location:

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

Files:

• Install.java (modified) (1 diff)
• Update.java (modified) (6 diffs)

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

@@ -104 +104 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(42).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(43).intValue();
   
   public static synchronized void createTables(boolean update, final ProgressReporter progress)

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

@@ -474 +474 @@
     <td>40</td>
     <td>
-      Change invalid property filter on 'guiContexts.itemType' to 
-      '$ctx.itemType'.
+      Used to "Change invalid property filter on 'guiContexts.itemType' to 
+      '$ctx.itemType'", but since the source problem never was fixed this is now
+      done in 43.
     </td>
   </tr>
@@ -499 +500 @@
       The update will query the database or check the CDF file to get
       the information.
+    </td>
+  </tr>
+  
+  <tr>
+    <td>43</td>
+    <td>
+      Change invalid property filter on 'guiContexts.itemType' to 
+      '$ctx.itemType'". Was originally fixed by 40, but since the source
+      problem never was fixed it must be done again.
     </td>
   </tr>
@@ -697 +707 @@
         schemaVersion = updateToSchemaVersion39(session);
       }
-      
-      if (schemaVersion < 40)
-      {
-        if (progress != null) progress.display((int)(39*progress_factor), "--Updating schema version: " + schemaVersion + " -> 40...");        
-        schemaVersion = updateToSchemaVersion40(session);
-      }
-      
+          
       if (schemaVersion < 41)
       {
@@ -714 +718 @@
         if (progress != null) progress.display((int)(41*progress_factor), "--Updating schema version: " + schemaVersion + " -> 42...");
         schemaVersion = updateToSchemaVersion42(session);
+      }
+      
+      if (schemaVersion < 43)
+      {
+        if (progress != null) progress.display((int)(42*progress_factor), "--Updating schema version: " + schemaVersion + " -> 43...");        
+        schemaVersion = updateToSchemaVersion43(session);
       }
 
@@ -1589 +1599 @@
       if (tx != null) HibernateUtil.rollback(tx); 
       log.error("updateToSchemaVersion39: FAILED", ex);
-      throw ex;
-    }
-    return schemaVersion;   
-  }
-
-  /**
-    Update property filter on 'guiContexts.itemType' to '$ctx.itemType'
-    @return The new schema version (=40)
-  */
-  private static int updateToSchemaVersion40(org.hibernate.Session session)
-  {
-    final int schemaVersion = 40;
-    org.hibernate.Transaction tx = null;
-    try
-    {
-      tx = HibernateUtil.newTransaction(session);
-  
-      // Change property values
-      org.hibernate.Query query = HibernateUtil.getPredefinedSQLQuery(session, 
-          "UPDATE_PROPERTY_FILTER");
-      /*
-        UPDATE PropertyFilters pf
-        SET pf.property = :newProperty
-        WHERE pf.property = :oldProperty
-       */
-      query.setString("oldProperty", "guiContexts.itemType");
-      query.setString("newProperty", "$ctx.itemType");
-      HibernateUtil.executeUpdate(query);
-
-      // Update the schema version number
-      setSchemaVersion(session, schemaVersion);
-  
-      // Commit the changes
-      HibernateUtil.commit(tx);
-      log.info("updateToSchemaVersion40: OK");
-    }
-    catch (BaseException ex)
-    {
-      if (tx != null) HibernateUtil.rollback(tx); 
-      log.error("updateToSchemaVersion40: FAILED", ex);
       throw ex;
     }
@@ -1718 +1688 @@
   }
   
-  
+  /**
+    Update property filter on 'guiContexts.itemType' to '$ctx.itemType'
+    @return The new schema version (=43)
+  */
+  private static int updateToSchemaVersion43(org.hibernate.Session session)
+  {
+    final int schemaVersion = 43;
+    org.hibernate.Transaction tx = null;
+    try
+    {
+      tx = HibernateUtil.newTransaction(session);
+  
+      // Change property values
+      org.hibernate.Query query = HibernateUtil.getPredefinedSQLQuery(session, 
+          "UPDATE_PROPERTY_FILTER");
+      /*
+        UPDATE PropertyFilters pf
+        SET pf.property = :newProperty
+        WHERE pf.property = :oldProperty
+       */
+      query.setString("oldProperty", "guiContexts.itemType");
+      query.setString("newProperty", "$ctx.itemType");
+      HibernateUtil.executeUpdate(query);
+  
+      // Update the schema version number
+      setSchemaVersion(session, schemaVersion);
+  
+      // Commit the changes
+      HibernateUtil.commit(tx);
+      log.info("updateToSchemaVersion40: OK");
+    }
+    catch (BaseException ex)
+    {
+      if (tx != null) HibernateUtil.rollback(tx); 
+      log.error("updateToSchemaVersion40: FAILED", ex);
+      throw ex;
+    }
+    return schemaVersion;   
+  }
+
   /**
     Adjust the existing items in the database to be compatible with the latest mappings.