Changeset 3557

Timestamp:

Jul 16, 2007, 9:01:56 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #648

Location:

trunk/src/core

Files:

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

trunk/src/core/common-queries.xml

@@ -2667 +2667 @@
     <sql>
       UPDATE FormulaData f
-      SET f.averageMethod = 1
+      SET f.averageMethod = 2
       WHERE f.averageMethod IS NULL
     </sql>
     <description>
-      A HQL query that sets the averageMethod to a for all 
+      A HQL query that sets the averageMethod to arithmetic mean for all 
       formulas with a null value.
     </description>
@@ -2679 +2679 @@
     <sql>
       UPDATE ExtraValueTypeData evt
-      SET evt.averageMethod = 1
+      SET evt.averageMethod = 2
       WHERE evt.averageMethod IS NULL
     </sql>
     <description>
-      A HQL query that sets the averageMethod to a for all 
+      A HQL query that sets the averageMethod to arithmetic mean for all 
       extra value types with a null value.
     </description>

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

@@ -1665 +1665 @@
         if (schemaVersion < 36)
         {
-          // Set averageMethod to 1 for all formulas with a null value
+          // Set averageMethod to arithmetic mean (=2) for all formulas with a null value
           org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, 
             "SET_AVERAGE_METHOD_ON_FORMULAS");
           /*
             UPDATE FormulaData f
-            SET f.averageMethod = 1
+            SET f.averageMethod = 2
             WHERE f.averageMethod IS NULL
           */
           HibernateUtil.executeUpdate(query);
           
-          // Set averageMethod to 1 for all extravaluetypes with a null value
+          // Set averageMethod to arithmetic mean (=2) for all extravaluetypes with a null value
           query = HibernateUtil.getPredefinedQuery(session, 
             "SET_AVERAGE_METHOD_ON_EXTRAVALUETYPES");
           /*
             UPDATE ExtraValueTypeData evt
-            SET evt.averageMethod = 1
+            SET evt.averageMethod = 2
             WHERE evt.averageMethod IS NULL
           */