Fixed ordering of primary key changes.

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

src/database/upgrade/17/openfire_db2.sql

--- change mucRoom's 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);
-
 -- create table mucService
 CREATE TABLE mucService (
   serviceID           INTEGER       NOT NULL,
@@ -23,6 +19,10 @@ CREATE TABLE mucServiceProp (
 ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER NOT NULL;
 CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID);
 
+-- change mucRoom's 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);

src/database/upgrade/17/openfire_hsqldb.sql

-// change mucRoom's 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);
-
 // create table mucService
 CREATE TABLE mucService (
   serviceID           BIGINT        NOT NULL,
@@ -23,6 +19,10 @@ CREATE TABLE mucServiceProp (
 ALTER TABLE mucRoom ADD COLUMN serviceID BIGINT NOT NULL BEFORE roomID;
 CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID);
 
+// change mucRoom's 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);

src/database/upgrade/17/openfire_mysql.sql

-# change mucRoom's primary key to be referenced around serviceID
-ALTER TABLE mucRoom DROP PRIMARY KEY;
-ALTER TABLE mucRoom ADD PRIMARY KEY (serviceID,name);
-
 # create table mucService
 CREATE TABLE mucService (
   serviceID           BIGINT        NOT NULL,
@@ -23,6 +19,10 @@ CREATE TABLE mucServiceProp (
 ALTER TABLE mucRoom ADD COLUMN serviceID BIGINT NOT NULL FIRST;
 ALTER TABLE mucRoom ADD INDEX mucRoom_serviceid_idx (serviceID);
 
+# change mucRoom's primary key to be referenced around serviceID
+ALTER TABLE mucRoom DROP PRIMARY KEY;
+ALTER TABLE mucRoom ADD 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);

src/database/upgrade/17/openfire_oracle.sql

--- change mucRoom's 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);
-
 -- create table mucService
 CREATE TABLE mucService (
   serviceID           INT           NOT NULL,
@@ -23,6 +19,10 @@ CREATE TABLE mucServiceProp (
 ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL;
 CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID);
 
+-- change mucRoom's 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);
@@ -118,4 +118,4 @@ DELETE FROM jiveProperty WHERE name = "xmpp.muc.history.type";
 
 UPDATE jiveVersion set version=17 where name = 'openfire';
 
-commit;
+commit;
\ No newline at end of file

src/database/upgrade/17/openfire_postgresql.sql

--- change mucRoom's 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);
-
 -- create table mucService
 CREATE TABLE mucService (
   serviceID           INTEGER       NOT NULL,
@@ -23,6 +19,10 @@ CREATE TABLE mucServiceProp (
 ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER NOT NULL;
 CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID);
 
+-- change mucRoom's 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);

src/database/upgrade/17/openfire_sqlserver.sql

-/* change mucRoom's 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);
-
 /* create table mucService */
 CREATE TABLE mucService (
   serviceID           INT           NOT NULL,
@@ -23,6 +19,10 @@ CREATE TABLE mucServiceProp (
 ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL;
 CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID);
 
+/* change mucRoom's 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);

src/database/upgrade/17/openfire_sybase.sql

-/* change mucRoom's 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);
-
 /* create table mucService */
 CREATE TABLE mucService (
   serviceID           INT           NOT NULL,
@@ -23,6 +19,10 @@ CREATE TABLE mucServiceProp (
 ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL;
 CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID);
 
+/* change mucRoom's 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);