[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'rhq-on-as7' - modules/core
From:       mazz () fedoraproject ! org (mazz)
Date:       2012-11-30 22:11:26
Message-ID: 20121130221126.EB6A5A0C45 () fedorahosted ! org
[Download RAW message or body]

 modules/core/dbutils/pom.xml                                   |    2 
 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml |   25 ++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit dadcd3fbff9d883c7d6a166ad42687c26c9b5a70
Author: John Mazzitelli <mazz at redhat.com>
Date:   Fri Nov 30 17:11:20 2012 -0500

    [BZ 882280] purge old perspective plugin from the DB during db upgrade

diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index d47e864..c110636 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
     <description>Database schema setup, upgrade and other utilities</description>
 
     <properties>
-        <db.schema.version>2.127</db.schema.version>
+        <db.schema.version>2.128</db.schema.version>
         <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
         <rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
         <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
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 \
                7188198..19ac9dd 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -30,8 +30,8 @@
                 <!-- Empty initial schema to avoid install failure on default latest \
schema version -->  </schemaSpec>
 
-            <!-- 2.1 through 2.69 removed, no longer needed as these versions are \
                not in use -->        	
-        	
+            <!-- 2.1 through 2.69 removed, no longer needed as these versions are \
not in use --> +
             <schemaSpec version="2.70">
                 <schema-addColumn table="RHQ_ALERT" column="ACK_TIME" \
                columnType="LONG" />
                 <schema-addColumn table="RHQ_ALERT" column="ACK_SUBJECT" \
precision="100" columnType="VARCHAR2" /> @@ -1267,10 +1267,10 @@
                         UPDATE RHQ_RESOURCE_TYPE
                         SET DELETED = false
                     </statement>
-                	<statement targetDBVendor="oracle" desc="Set deleted flag for \
existing resources types to false"> +                    <statement \
targetDBVendor="oracle" desc="Set deleted flag for existing resources types to \
false">  UPDATE RHQ_RESOURCE_TYPE
                         SET DELETED = 0
-                	</statement>
+                    </statement>
                 </schema-directSQL>
                 <schema-alterColumn table="RHQ_RESOURCE_TYPE" column="DELETED" \
nullable="FALSE" />  </schemaSpec>
@@ -1351,14 +1351,14 @@
             <schemaSpec version="2.105">
                 <schema-addColumn table="RHQ_REPO" column="OWNER_ID" \
                columnType="INTEGER" />
                 <schema-addColumn table="RHQ_REPO" column="IS_PRIVATE" \
                columnType="BOOLEAN" />
-            	<schema-directSQL>
+                <schema-directSQL>
                     <statement targetDBVendor="postgresql" desc="Set is_private flag \
for existing repos to false">  UPDATE RHQ_REPO SET IS_PRIVATE = false
                     </statement>
                     <statement targetDBVendor="oracle" desc="Set is_private flag for \
existing repos to false">  UPDATE RHQ_REPO SET IS_PRIVATE = 0
                     </statement>
-            	</schema-directSQL>
+                </schema-directSQL>
                 <schema-alterColumn table="RHQ_REPO" column="IS_PRIVATE" \
nullable="FALSE"/>  <schema-directSQL>
                     <statement desc="Creating OWNER_ID foreign key relation on \
RHQ_REPO"> @@ -1970,7 +1970,7 @@
                 </schema-directSQL>
             </schemaSpec>
 
-        	<!-- Remove unnecessary tables for RHQ on AS7 -->
+            <!-- Remove unnecessary tables for RHQ on AS7 -->
             <schemaSpec version="2.127">
                 <schema-dropTable table="JMS_MESSAGES" ignoreError="true" />
                 <schema-dropTable table="JMS_TRANSACTIONS" ignoreError="true" />
@@ -1978,7 +1978,16 @@
                 <schema-dropTable table="JMS_ROLES" ignoreError="true" />
                 <schema-dropTable table="JMS_SUBSCRIPTIONS" ignoreError="true" />
             </schemaSpec>
-        	
+
+            <!-- The perspective server plugin type has been removed - delete \
perspective plugin from DB --> +            <schemaSpec version="2.128">
+                <schema-directSQL>
+                    <statement>
+                        DELETE FROM RHQ_PLUGIN WHERE NAME = 'CorePerspective'
+                    </statement>
+                </schema-directSQL>
+            </schemaSpec>
+
         </dbupgrade>
     </target>
 </project>


[prev in list] [next in list] [prev in thread] [next in thread]