[Hyperic-hq-discuss] hq r13906 - in trunk: installer/data src/org/hyperic/hq/events/server/session

[<pn...@hy...>]

Author: pnguyen
Date: 2009-10-27 15:31:28 -0700 (Tue, 27 Oct 2009)
New Revision: 13906
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13906

Modified:
   trunk/installer/data/db-upgrade.xml
   trunk/src/org/hyperic/hq/events/server/session/TriggerDAO.java
Log:
[HHQ-3503] do not get triggers of deleted alert definitions; cleanup deleted alert definitions in db-upgrade script

Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml	2009-10-25 07:28:52 UTC (rev 13905)
+++ trunk/installer/data/db-upgrade.xml	2009-10-27 22:31:28 UTC (rev 13906)
@@ -10868,6 +10868,17 @@
 	    </schema-directSQL>  
    </schemaSpec>
 
+  <schemaSpec version="3.193">
+    <schema-directSQL>  
+      <statement desc="Cleanup deleted alert definitions">
+		UPDATE EAM_ALERT_DEFINITION
+		SET ACTIVE = '0', ENABLED = '0'
+		WHERE DELETED = '1'
+		AND (ACTIVE = '1' OR ENABLED = '1')
+      </statement>
+    </schema-directSQL>  
+  </schemaSpec>
+   
 </dbupgrade>
 </target>
 </project>

Modified: trunk/src/org/hyperic/hq/events/server/session/TriggerDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/events/server/session/TriggerDAO.java	2009-10-25 07:28:52 UTC (rev 13905)
+++ trunk/src/org/hyperic/hq/events/server/session/TriggerDAO.java	2009-10-27 22:31:28 UTC (rev 13906)
@@ -162,7 +162,8 @@
             .append("join fetch ad.alertDefinitionState ")
             .append("join fetch ad.conditionsBag c ")
             .append("join fetch c.trigger ")
-            .append("where ad.enabled = '1'")
+            .append("where ad.enabled = '1' ")
+            .append("and ad.deleted = '0' ")
             .toString();
         
         if (debug) watch.markTimeBegin("createQuery.list");