Fixed HSQL upgrade errors.

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

src/database/upgrade/17/openfire_hsqldb.sql

@@ -16,12 +16,11 @@ CREATE TABLE mucServiceProp (
 );
 
 // add new indexed column to mucRoom
-ALTER TABLE mucRoom ADD COLUMN serviceID BIGINT NOT NULL BEFORE roomID;
+ALTER TABLE mucRoom ADD COLUMN serviceID BIGINT BEFORE roomID;
 CREATE INDEX mucRoom_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');
@@ -30,6 +29,9 @@ 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;
 
+// finish changing 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' );