modules/core/dbutils/src/main/scripts/dbsetup/search-data.xml | 4 ++-- modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 6278e7056403b2dcd0ffde84a7109e60790022eb Author: Joseph Marques joseph@redhat.com Date: Fri Feb 26 16:55:32 2010 -0500
simplify dbupgrade by merge saved search-related entries into a single schemaSpec
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 6fe555e..b2b3b11 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -3231,9 +3231,7 @@ <schema-alterColumn table="RHQ_SAVED_SEARCH" column="SUBJECT_ID" nullable="FALSE" /> <schema-addColumn table="RHQ_SAVED_SEARCH" column="GLOBAL" columnType="BOOLEAN" /> <schema-alterColumn table="RHQ_SAVED_SEARCH" column="GLOBAL" nullable="FALSE" /> - </schemaSpec> - - <schemaSpec version="2.82.1"> + <schema-directSQL> <statement targetDBVendor="postgresql" desc="Inserting global default saved search 'Downed Platforms'"> INSERT INTO rhq_saved_search (id, context, name, description, pattern, last_compute_time, subject_id, global)
commit a6efa283222790b6e22f82861b1c145e34af9391 Author: Joseph Marques joseph@redhat.com Date: Fri Feb 26 16:54:58 2010 -0500
insert some default global searches into the system during dbsetup
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/search-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/search-data.xml index 1a11114..da98622 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/search-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/search-data.xml @@ -10,7 +10,7 @@ DESCRIPTION="All downed machines across the entire enterprise" PATTERN="down platform" LAST_COMPUTE_TIME="0" - SUBJECT="1" + SUBJECT_ID="1" GLOBAL="TRUE" /> <data ID="2" CONTEXT="Resource" @@ -18,7 +18,7 @@ DESCRIPTION="All downed servers across the entire enterprise" PATTERN="down server" LAST_COMPUTE_TIME="0" - SUBJECT="1" + SUBJECT_ID="1" GLOBAL="TRUE" /> </table>
rhq-commits@lists.fedorahosted.org