[BZ 1579733] Ignore rows from alert_definition table that still have …

…existing links in alert_condition
rhq-project · Sep 21, 2018 · 5785ffc · 5785ffc
1 parent dcff72a
commit 5785ffc
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...rprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/AlertDefinitionPurge.java b/...rprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/AlertDefinitionPurge.java
@@ -41,13 +41,19 @@ public class AlertDefinitionPurge extends PurgeTemplate<Integer> {
     private static final String QUERY_SELECT_KEYS_FOR_PURGE_POSTGRES =
             "SELECT ad.id " +
                     "FROM rhq_alert_definition ad " +
-                    "WHERE ad.deleted = 'true' AND ad.id NOT IN (SELECT a.alert_definition_id FROM rhq_alert a)";
+                    "WHERE ad.deleted = 'true' AND " +
+                    "(ad.id NOT IN (SELECT a.alert_definition_id FROM rhq_alert a) " +
+                    "OR " +
+                    "ad.id NOT IN (SELECT ac.alert_definition_id FROM rhq_alert_condition ac))";
 
     // Oracle does not have boolean datatype, so JPA uses a mapping to NUMBER(0,1)
     private static final String QUERY_SELECT_KEYS_FOR_PURGE_ORACLE =
             "SELECT ad.id " +
                     "FROM rhq_alert_definition ad " +
-                    "WHERE ad.deleted = 1 AND ad.id NOT IN (SELECT a.alert_definition_id FROM rhq_alert a)";
+                    "WHERE ad.deleted = 1 AND " +
+                    "(ad.id NOT IN (SELECT a.alert_definition_id FROM rhq_alert a) " +
+                    "OR " +
+                    "ad.id NOT IN (SELECT ac.alert_definition_id FROM rhq_alert_condition ac))";
 
     private static final String QUERY_PURGE_BY_KEY = "DELETE FROM rhq_alert_definition WHERE id = ?";