[rhq] Branch 'release/jon3.1.x' - modules/core
Jay Shaughnessy
jshaughn at fedoraproject.org
Thu Aug 30 15:24:39 UTC 2012
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 30 +++++-----
1 file changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 4f97c15f5ecb8d7339ea98a849b8405d4fb32552
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: Thu Aug 30 11:23:42 2012 -0400
[Bug 852554 - AlertCondition.name is null in database after JON 2.4 to 3.1 upgrade]
fix merge issue
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index f189c3d..65a7686 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4010,20 +4010,22 @@
<!-- RHQ 4.4, JON 3.1.0 RELEASE uses DB Schema 2.121 -->
<schemaSpec version="2.122">
- <statement desc="Updating DOWN Alert Conditions to new format">
- UPDATE RHQ_ALERT_CONDITION
- SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL
- WHERE TYPE = 'AVAILABILITY'
- AND NAME IS NULL
- AND OPTION_STATUS = 'DOWN'
- </statement>
- <statement desc="Updating UP Alert Conditions to new format">
- UPDATE RHQ_ALERT_CONDITION
- SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL
- WHERE TYPE = 'AVAILABILITY'
- AND NAME IS NULL
- AND OPTION_STATUS = 'UP'
- </statement>
+ <schema-directSQL>
+ <statement desc="Updating DOWN Alert Conditions to new format">
+ UPDATE RHQ_ALERT_CONDITION
+ SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL
+ WHERE TYPE = 'AVAILABILITY'
+ AND NAME IS NULL
+ AND OPTION_STATUS = 'DOWN'
+ </statement>
+ <statement desc="Updating UP Alert Conditions to new format">
+ UPDATE RHQ_ALERT_CONDITION
+ SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL
+ WHERE TYPE = 'AVAILABILITY'
+ AND NAME IS NULL
+ AND OPTION_STATUS = 'UP'
+ </statement>
+ </schema-directSQL>
</schemaSpec>
</dbupgrade>
More information about the rhq-commits
mailing list