[Hyperic-hq-discuss] hq r7771 - in trunk: installer/data sql/measurement

[<cl...@hy...>]

Author: clee
Date: 2008-02-19 11:46:52 -0800 (Tue, 19 Feb 2008)
New Revision: 7771
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7771

Modified:
   trunk/installer/data/db-upgrade.xml
   trunk/sql/measurement/Measurement.hbm.xml
Log:
Add resource_id column to EAM_MEASUREMENT


Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml	2008-02-19 19:15:27 UTC (rev 7770)
+++ trunk/installer/data/db-upgrade.xml	2008-02-19 19:46:52 UTC (rev 7771)
@@ -7957,6 +7957,31 @@
     </schema-directSQL>    
   </schemaSpec>
 
+  <schemaSpec version="3.95">
+    <schema-addColumn table="EAM_MEASUREMENT" column="RESOURCE_ID" 
+                      columnType="INTEGER"/>
+      <schema-directSQL>
+        <statement desc="Update new resource_id column">
+          UPDATE EAM_MEASUREMENT SET RESOURCE_ID =
+              (SELECT r.ID FROM EAM_RESOURCE r,
+               (SELECT ID, 1 AS APPDEF_TYPE FROM EAM_RESOURCE_TYPE WHERE CID = 301
+                UNION ALL
+                SELECT ID, 2 AS APPDEF_TYPE FROM EAM_RESOURCE_TYPE WHERE CID = 303
+                UNION ALL
+                SELECT ID, 3 AS APPDEF_TYPE FROM EAM_RESOURCE_TYPE WHERE CID = 305) m,
+               (SELECT APPDEF_TYPE FROM EAM_MONITORABLE_TYPE mt INNER JOIN
+                EAM_MEASUREMENT_TEMPL t ON MONITORABLE_TYPE_ID = mt.ID AND
+                t.ID = EAM_MEASUREMENT.TEMPLATE_ID) mt
+               WHERE EAM_MEASUREMENT.INSTANCE_ID = r.INSTANCE_ID AND
+                     r.RESOURCE_TYPE_ID = m.ID AND
+                     mt.APPDEF_TYPE = m.APPDEF_TYPE)
+        </statement>
+        <statement desc="Create new index for resource_id">
+          CREATE INDEX MEAS_RES_IDX ON EAM_MEASUREMENT ( RESOURCE_ID )
+        </statement>
+      </schema-directSQL>
+  </schemaSpec>
+
 </dbupgrade>
 </target>
 

Modified: trunk/sql/measurement/Measurement.hbm.xml
===================================================================
--- trunk/sql/measurement/Measurement.hbm.xml	2008-02-19 19:15:27 UTC (rev 7770)
+++ trunk/sql/measurement/Measurement.hbm.xml	2008-02-19 19:46:52 UTC (rev 7771)
@@ -52,6 +52,9 @@
         <key on-delete="cascade" column="MEASUREMENT_ID"/>
         <one-to-many class="Baseline"/>
       </bag>
+      <many-to-one name="resource" class="org.hyperic.hq.authz.server.session.Resource" index="MEAS_RES_IDX">
+        <column name="RESOURCE_ID"/>
+      </many-to-one>
     </subclass>
 
     <subclass name="RawMeasurement" extends="Measurement" discriminator-value="R">