Changeset 3597

Timestamp:

Jul 25, 2007, 7:55:39 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

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

Location:

trunk/src/core

Files:

• common-queries.xml (modified) (1 diff)
• net/sf/basedb/core/HibernateUtil.java (modified) (2 diffs)
• net/sf/basedb/core/Install.java (modified) (1 diff)
• net/sf/basedb/core/Update.java (modified) (3 diffs)

trunk/src/core/common-queries.xml

@@ -2688 +2688 @@
   </query>
   
+  <query id="UPDATE_PROPERTY_FILTER" type="SQL">
+    <sql>
+      UPDATE [PropertyFilters]
+      SET [property] = :newProperty
+      WHERE [property] = :oldProperty
+    </sql>
+    <description>
+      An SQL query that changes the property for all PropertyFilters
+      with a given value.
+    </description>
+  </query>
   
 

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

@@ -1350 +1350 @@
     assert session != null : "session == null";
     assert sql != null : "sql == null";
+    sql = sql.replace('[', getDialect().openQuote()).replace(']', getDialect().closeQuote());
     try
     {
@@ -1368 +1369 @@
     assert session != null : "session == null";
     assert sql != null : "sql == null";
+    sql = sql.replace('[', getDialect().openQuote()).replace(']', getDialect().closeQuote());
     try
     {

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

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

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

@@ -463 +463 @@
       Remove AnyToAny links created by older versions of the 
       Base1PluginExecuter plug-in.
+    </td>
+  </tr>
+  
+  <tr>
+    <td>40</td>
+    <td>
+      Change invalid property filter on 'guiContexts.itemType' to 
+      '$ctx.itemType'.
     </td>
   </tr>
@@ -662 +670 @@
       }
       
+      if (schemaVersion < 40)
+      {
+        if (progress != null) progress.display((int)(39*progress_factor), "--Updating schema version: " + schemaVersion + " -> 40...");        
+        schemaVersion = updateToSchemaVersion40(session);
+      }
+      
       /*
-      if (schemaVersion < 39)
-      {
-        if (progress != null) progress.display((int)(39*progress_factor), "--Updating schema version: " + schemaVersion + " -> 40...");
-        schemaVersion = setSchemaVersionInTransaction(session, 40);
+      if (schemaVersion < 41)
+      {
+        if (progress != null) progress.display((int)(40*progress_factor), "--Updating schema version: " + schemaVersion + " -> 41...");
+        schemaVersion = setSchemaVersionInTransaction(session, 41);
         - or - 
-        schemaVersion = updateToSchemaVersion40(session);
+        schemaVersion = updateToSchemaVersion41(session);
       }
       ... etc... 
@@ -1532 +1546 @@
       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;
     }