Fixed up DB2 upgrade scripts.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10812 b35dd754-fafc-0310-a699-88a17e54d16e

src/database/openfire_db2.sql

@@ -137,7 +137,7 @@ CREATE TABLE ofExtComponentConf (
   wildcard              INTEGER         NOT NULL,
   secret                VARCHAR(255),
   permission            VARCHAR(10)     NOT NULL,
-  CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain)
+  CONSTRAINT ofExtCmpConf_pk PRIMARY KEY (subdomain)
 );
 
 
@@ -145,7 +145,7 @@ CREATE TABLE ofRemoteServerConf (
   xmppDomain            VARCHAR(255)    NOT NULL,
   remotePort            INTEGER,
   permission            VARCHAR(10)     NOT NULL,
-  CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain)
+  CONSTRAINT ofRmSrvConf_pk PRIMARY KEY (xmppDomain)
 );
 
 
@@ -162,7 +162,7 @@ CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
 CREATE TABLE ofSASLAuthorized (
   username            VARCHAR(64)   NOT NULL,
   principal           VARCHAR(190)  NOT NULL,
-  CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal)
+  CONSTRAINT ofSASLAuthrizd_pk PRIMARY KEY (username, principal)
 );
 
 CREATE TABLE ofSecurityAuditLog (
@@ -172,10 +172,10 @@ CREATE TABLE ofSecurityAuditLog (
   summary               VARCHAR(255)    NOT NULL,
   node                  VARCHAR(255)    NOT NULL,
   details               CLOB,
-  CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID)
+  CONSTRAINT ofSecAuditLog_pk PRIMARY KEY (msgID)
 );
-CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
-CREATE INDEX ofSecurityAuditLog_uname_idx ON ofSecurityAuditLog (username);
+CREATE INDEX ofSecAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecAuditLog_uname_idx ON ofSecurityAuditLog (username);
 
 -- MUC tables
 
@@ -192,7 +192,7 @@ CREATE TABLE ofMucServiceProp (
   serviceID           INTEGER       NOT NULL,
   name                VARCHAR(100)  NOT NULL,
   propValue           VARCHAR(2000) NOT NULL,
-  CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name)
+  CONSTRAINT ofMucSrvProp_pk PRIMARY KEY (serviceID, name)
 );
 
 CREATE TABLE ofMucRoom (
@@ -222,7 +222,7 @@ CREATE TABLE ofMucRoom (
   CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name)
 );
 CREATE INDEX ofMucRoom_roomid_idx ON ofMucRoom (roomID);
-CREATE INDEX ofMucRoom_serviceid_idx ON ofMucRoom (serviceID);
+CREATE INDEX ofMucRoom_srvid_idx ON ofMucRoom (serviceID);
 
 
 CREATE TABLE ofMucRoomProp (
@@ -237,7 +237,7 @@ CREATE TABLE ofMucAffiliation (
   roomID              INTEGER       NOT NULL,
   jid                 VARCHAR(1000) NOT NULL,
   affiliation         INTEGER       NOT NULL,
-  CONSTRAINT ofMucAffiliation_pk PRIMARY KEY (roomID, jid)
+  CONSTRAINT ofMucAffil_pk PRIMARY KEY (roomID, jid)
 );
 
 
@@ -262,7 +262,7 @@ CREATE TABLE ofMucConversationLog (
   subject             VARCHAR(255),
   body                CLOB
 );
-CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+CREATE INDEX ofMucConvLog_time_idx ON ofMucConversationLog (logTime);
 
 
 -- PubSub Tables
@@ -306,7 +306,7 @@ CREATE TABLE ofPubsubNodeJIDs (
   nodeID              VARCHAR(80)  NOT NULL,
   jid                 VARCHAR(90)  NOT NULL,
   associationType     VARCHAR(20)  NOT NULL,
-  CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid)
+  CONSTRAINT ofPubsubNdJIDs_pk PRIMARY KEY (serviceID, nodeID, jid)
 );
 
 
@@ -315,7 +315,7 @@ CREATE TABLE ofPubsubNodeGroups (
   nodeID              VARCHAR(100)  NOT NULL,
   rosterGroup         VARCHAR(100)  NOT NULL
 );
-CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+CREATE INDEX ofPubsubNGrps_idx ON ofPubsubNodeGroups (serviceID, nodeID);
 
 
 CREATE TABLE ofPubsubAffiliation (
@@ -323,7 +323,7 @@ CREATE TABLE ofPubsubAffiliation (
   nodeID              VARCHAR(80)  NOT NULL,
   jid                 VARCHAR(90)  NOT NULL,
   affiliation         VARCHAR(10)  NOT NULL,
-  CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid)
+  CONSTRAINT ofPubsubAffil_pk PRIMARY KEY (serviceID, nodeID, jid)
 );
 
 
@@ -354,7 +354,7 @@ CREATE TABLE ofPubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   INTEGER       NOT NULL,
   keyword             VARCHAR(200),
-  CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id)
+  CONSTRAINT ofPubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 
@@ -377,7 +377,7 @@ CREATE TABLE ofPubsubDefaultConf (
   replyPolicy         VARCHAR(15),
   associationPolicy   VARCHAR(15)   NOT NULL,
   maxLeafNodes        INTEGER       NOT NULL,
-  CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf)
+  CONSTRAINT ofPubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
 );
 
 -- Finally, insert default table values

src/database/upgrade/17/openfire_db2.sql

@@ -16,22 +16,17 @@ CREATE TABLE mucServiceProp (
 );
 
 -- add new indexed column to mucRoom
-ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER;
+ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER NOT NULL DEFAULT 1;
 CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID);
 
 -- change mucRoom primary key to be referenced around serviceID
 ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
+ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
 
 -- add default entry for conference service and associated jiveID value
 INSERT INTO mucService (serviceID, subdomain) VALUES (1, 'conference');
 INSERT INTO jiveID (idType, id) VALUES (26, 1);
 
--- update all entries in mucRoom to be set to the default conference service
-UPDATE mucRoom set serviceID = 1;
-
--- complete change mucRoom primary key to be referenced around serviceID
-ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
-
 -- update conference name/desc if there is a custom one set
 UPDATE mucService SET mucService.subdomain = ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = 'xmpp.muc.service' )
   WHERE EXISTS ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = 'xmpp.muc.service' );

src/database/upgrade/19/openfire_db2.sql

@@ -88,12 +88,12 @@ ALTER TABLE ofVersion ADD CONSTRAINT ofVersion_pk PRIMARY KEY (name);
 -- Rename jiveExtComponentConf to ofExtComponentConf
 ALTER TABLE jiveExtComponentConf DROP CONSTRAINT jiveExtCmpConf_pk;
 RENAME jiveExtComponentConf TO ofExtComponentConf;
-ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain);
+ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtCmpConf_pk PRIMARY KEY (subdomain);
 
 -- Rename jiveRemoteServerConf to ofRemoteServerConf
 ALTER TABLE jiveRemoteServerConf DROP CONSTRAINT jiveRmSrvConf_pk;
 RENAME jiveRemoteServerConf TO ofRemoteServerConf;
-ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain);
+ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRmSrvConf_pk PRIMARY KEY (xmppDomain);
 
 -- Rename jivePrivacyList to ofPrivacyList
 DROP INDEX jList_default_idx;
@@ -105,16 +105,16 @@ CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
 -- Rename jiveSASLAuthorized to ofSASLAuthorized
 ALTER TABLE jiveSASLAuthorized DROP CONSTRAINT jSASLAuthrizd_pk;
 RENAME jiveSASLAuthorized TO ofSASLAuthorized;
-ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal);
+ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthrizd_pk PRIMARY KEY (username, principal);
 
 -- Rename jiveSecurityAuditLog to ofSecurityAuditLog
 DROP INDEX jiveSecAuditLog_tstamp_idx;
 DROP INDEX jiveSecAuditLog_uname_idx;
 ALTER TABLE jiveSecurityAuditLog DROP CONSTRAINT jiveSecAuditLog_pk;
 RENAME jiveSecurityAuditLog TO ofSecurityAuditLog;
-ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID);
-CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
-CREATE INDEX ofSecurityAuditLog_uname_idx ON ofSecurityAuditLog (username);
+ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecAuditLog_pk PRIMARY KEY (msgID);
+CREATE INDEX ofSecAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecAuditLog_uname_idx ON ofSecurityAuditLog (username);
 
 -- Rename mucService to ofMucService
 DROP INDEX mucService_serviceid_idx;
@@ -126,7 +126,7 @@ CREATE INDEX ofMucService_serviceid_idx ON ofMucService(serviceID);
 -- Rename mucServiceProp to ofMucServiceProp
 ALTER TABLE mucServiceProp DROP CONSTRAINT mucServiceProp_pk;
 RENAME mucServiceProp TO ofMucServiceProp;
-ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name);
+ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucSrvProp_pk PRIMARY KEY (serviceID, name);
 
 -- Rename mucRoom to ofMucRoom
 DROP INDEX mucRm_roomid_idx;
@@ -135,7 +135,7 @@ ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
 RENAME mucRoom TO ofMucRoom;
 ALTER TABLE ofMucRoom ADD CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name);
 CREATE INDEX ofMucRoom_roomid_idx ON ofMucRoom (roomID);
-CREATE INDEX ofMucRoom_serviceid_idx ON ofMucRoom (serviceID);
+CREATE INDEX ofMucRoom_srvid_idx ON ofMucRoom (serviceID);
 
 -- Rename mucRoomProp to ofMucRoomProp
 ALTER TABLE mucRoomProp DROP CONSTRAINT mucRoomProp_pk;
@@ -145,7 +145,7 @@ ALTER TABLE ofMucRoomProp ADD CONSTRAINT ofMucRoomProp_pk PRIMARY KEY (roomID, n
 -- Rename mucAffiliation to ofMucAffiliation
 ALTER TABLE mucAffiliation DROP CONSTRAINT mucAffiliation_pk;
 RENAME mucAffiliation TO ofMucAffiliation;
-ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffiliation_pk PRIMARY KEY (roomID, jid);
+ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffil_pk PRIMARY KEY (roomID, jid);
 
 -- Rename mucMember to ofMucMember
 ALTER TABLE mucMember DROP CONSTRAINT mucMember_pk;
@@ -153,9 +153,10 @@ RENAME mucMember TO ofMucMember;
 ALTER TABLE ofMucMember ADD CONSTRAINT ofMucMember_pk PRIMARY KEY (roomID, jid);
 
 -- Rename mucConversationLog to ofMucConversationLog
-DROP INDEX mucLog_time_idx;
+--Past scripts make it impossible to know if this is logtime or time, sigh:
+--DROP INDEX mucLog_time_idx;
 RENAME mucConversationLog TO ofMucConversationLog;
-CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+CREATE INDEX ofMucConvLog_time_idx ON ofMucConversationLog (logTime);
 
 -- Rename pubsubNode to ofPubsubNode
 ALTER TABLE pubsubNode DROP CONSTRAINT pubsubNode_pk;
@@ -165,17 +166,17 @@ ALTER TABLE ofPubsubNode ADD CONSTRAINT ofPubsubNode_pk PRIMARY KEY (serviceID,
 -- Rename pubsubNodeJIDs to ofPubsubNodeJIDs
 ALTER TABLE pubsubNodeJIDs DROP CONSTRAINT pubsubJID_pk;
 RENAME pubsubNodeJIDs TO ofPubsubNodeJIDs;
-ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
+ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNdJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
 
 -- Rename pubsubNodeGroups to ofPubsubNodeGroups
 DROP INDEX pubsubNGrps_idx;
 RENAME pubsubNodeGroups TO ofPubsubNodeGroups;
-CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+CREATE INDEX ofPubsubNGrps_idx ON ofPubsubNodeGroups (serviceID, nodeID);
 
 -- Rename pubsubAffiliation to ofPubsubAffiliation
 ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
 RENAME pubsubAffiliation TO ofPubsubAffiliation;
-ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid);
+ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffil_pk PRIMARY KEY (serviceID, nodeID, jid);
 
 -- Rename pubsubItem to ofPubsubItem
 ALTER TABLE pubsubItem DROP CONSTRAINT pubsubItem_pk;
@@ -185,12 +186,12 @@ ALTER TABLE ofPubsubItem ADD CONSTRAINT ofPubsubItem_pk PRIMARY KEY (serviceID,
 -- Rename pubsubSubscription to ofPubsubSubscription
 ALTER TABLE pubsubSubscription DROP CONSTRAINT pubsubSubs_pk;
 RENAME pubsubSubscription TO ofPubsubSubscription;
-ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id);
+ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id);
 
 -- Rename pubsubDefaultConf to ofPubsubDefaultConf
 ALTER TABLE pubsubDefaultConf DROP CONSTRAINT pubsubDefConf_pk;
 RENAME pubsubDefaultConf TO ofPubsubDefaultConf;
-ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
+ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefConf_pk PRIMARY KEY (serviceID, leaf);
 
 -- Update version
-UPDATE ofVersion SET version = 19 WHERE name = 'openfire';
\ No newline at end of file
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';