Changeset 5267

Timestamp:

Mar 12, 2010, 8:59:58 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1463: HTTP Status 500 when logging in

Added update scripts that removes the bad 'null' values in the sort_property column.

Made the menu script more robust in case an error occurs.

NOTE! This update conflicts with the schema version change in the trunk for #1442 [5260]. This needs to be fixed in the trunk when we have merged 2.15 back to it.

Location:

branches/2.15-stable

Files:

• src/core/common-queries.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Update.java (modified) (3 diffs)
• www/include/menu.jsp (modified) (2 diffs)

branches/2.15-stable/src/core/common-queries.xml

@@ -3643 +3643 @@
     </description>
   </query>
+  <query id="FIX_NULL_IN_CONTEXTS_SORT_PROPERTY" type="SQL">
+    <sql>
+      update [Contexts] 
+      set [sort_property] = null 
+      where [sort_property] like '%null%'
+    </sql>
+    <description>
+      An SQL query that replaces all 'null' strings in Context.sort_property with
+      null values.
+    </description>
+  </query>
 
 </predefined-queries>

branches/2.15-stable/src/core/net/sf/basedb/core/Install.java

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

branches/2.15-stable/src/core/net/sf/basedb/core/Update.java

@@ -865 +865 @@
     </td>
   </tr>
+  <tr>
+    <td>79</td>
+    <td>
+      Set database column Contexts.sort_property to null if it contains a literal
+      'null' string. Fix for #1463.
+    </td>
+  </tr>
   </table>
 
@@ -1173 +1180 @@
         if (progress != null) progress.display((int)(77*progress_factor), "--Updating schema version: " + schemaVersion + " -> 78...");
         schemaVersion = setSchemaVersionInTransaction(session, 78);
+      }
+      
+      if (schemaVersion < 79)
+      {
+        if (progress != null) progress.display((int)(78*progress_factor), 
+            "--Updating schema version: " + schemaVersion + " -> 79...");
+        schemaVersion = updateToSchemaVersion79(session);
       }
 
@@ -2720 +2734 @@
       if (tx != null) HibernateUtil.rollback(tx); 
       log.error("updateToSchemaVersion77: FAILED", ex);
+      throw ex;
+    }
+    return schemaVersion;
+  }
+
+  
+  /**
+    Set sort_property in Contexts table to null if it contains a literal string 'null'.
+  */
+  private static int updateToSchemaVersion79(org.hibernate.Session session)
+    throws BaseException
+  {
+    final int schemaVersion = 79;
+    org.hibernate.Transaction tx = null;
+    try
+    {
+      tx = HibernateUtil.newTransaction(session);
+      
+      // Change property values
+      // Load all annotation sets with a null id
+      org.hibernate.Query query = HibernateUtil.getPredefinedSQLQuery(session, 
+          "FIX_NULL_IN_CONTEXTS_SORT_PROPERTY");
+      /*
+        update [Contexts] 
+        set [sort_property] = null 
+        where [sort_property] like '%null%'
+      */
+      query.executeUpdate();
+      
+      // Update the schema version number
+      setSchemaVersion(session, schemaVersion);
+
+      // Commit the changes
+      HibernateUtil.commit(tx);
+      log.info("updateToSchemaVersion79: OK");
+    }
+    catch (BaseException ex)
+    {
+      if (tx != null) HibernateUtil.rollback(tx); 
+      log.error("updateToSchemaVersion79: FAILED", ex);
       throw ex;
     }

branches/2.15-stable/www/include/menu.jsp

@@ -85 +85 @@
 {
   // Projects menu
-  final ItemContext projectCC = sc.getCurrentContext(Item.PROJECT);
   int activeProjectId = sc.getActiveProjectId();
-  final ItemQuery<Project> projectQuery = Project.getQuery();
-  projectQuery.include(Include.MINE, Include.SHARED);
-  Order projectSortOrder = projectCC.getSortOrder();
-  if (projectSortOrder != null) projectQuery.order(projectSortOrder);
-  projectQuery.order(Orders.asc(Hql.property("name")));
-  projectQuery.setCacheResult(true);
-  final DbControl dc = sc.newDbControl();
-  try
-  {
-    %>
-    <m:menu  
-      id="projects"
-      style="display: none"
-      >
-      <m:menuitem
-        title="<i>- no active project -</i>"
-        onclick="<%="Main.openPopup('"+root+"my_base/projects/set_active.jsp?ID="+ID+"', 'ActivateProject', 300, 140)"%>"
-        icon="<%=activeProjectId == 0 ? "checkedmenu.gif" : null%>"
-        enabled="<%=activeProjectId != 0%>"
-        tooltip="<%=activeProjectId == 0 ? "No project is active" : "Disable the currently active project"%>"
-      />
-      <%
+  %>
+  <m:menu  
+    id="projects"
+    style="display: none"
+    >
+    <m:menuitem
+      title="<i>- no active project -</i>"
+      onclick="<%="Main.openPopup('"+root+"my_base/projects/set_active.jsp?ID="+ID+"', 'ActivateProject', 300, 140)"%>"
+      icon="<%=activeProjectId == 0 ? "checkedmenu.gif" : null%>"
+      enabled="<%=activeProjectId != 0%>"
+      tooltip="<%=activeProjectId == 0 ? "No project is active" : "Disable the currently active project"%>"
+    />
+    <%
+    final DbControl dc = sc.newDbControl();
+    try
+    {
+      final ItemContext projectCC = sc.getCurrentContext(Item.PROJECT);
+      final ItemQuery<Project> projectQuery = Project.getQuery();
+      projectQuery.include(Include.MINE, Include.SHARED);
+      Order projectSortOrder = projectCC.getSortOrder();
+      if (projectSortOrder != null) projectQuery.order(projectSortOrder);
+      projectQuery.order(Orders.asc(Hql.property("name")));
+      projectQuery.setCacheResult(true);
       ItemResultList<Project> projects = projectQuery.list(dc);
       boolean breakAt20 = projects.size() > 25;
@@ -141 +141 @@
         <%
       }
+    }
+    catch (Throwable t)
+    {
+      t.printStackTrace();
       %>
-    </m:menu>
-    <%
-  }
-  finally
-  {
-    if (dc != null) dc.close();
-  }
+      <m:menuitem 
+        title="Error loading projects" 
+        tooltip="<%=t.getMessage() + ": Check log file for more details"%>"
+        enabled="false"
+        icon="error.gif"
+      />
+      <%
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+    %>
+  </m:menu>
+  <%
 }
 else if ("recentItems".equals(name) && sc != null && sc.isLoggedIn())