Commit 063b8b3f authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

Removed ' from comments.


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10080 b35dd754-fafc-0310-a699-88a17e54d16e
parent 7c5815bd
...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp ( ...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp (
ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER NOT NULL; ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER NOT NULL;
CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID); CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID);
-- change mucRoom's primary key to be referenced around serviceID -- change mucRoom primary key to be referenced around serviceID
ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk; ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name); ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1); ...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1);
-- update all entries in mucRoom to be set to the default conference service -- update all entries in mucRoom to be set to the default conference service
UPDATE mucRoom set serviceID = 1; UPDATE mucRoom set serviceID = 1;
-- update conference name/desc if there's a custom one set -- 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" ) 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" ); WHERE EXISTS ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = "xmpp.muc.service" );
DELETE FROM jiveProperty WHERE name = "xmpp.muc.service"; DELETE FROM jiveProperty WHERE name = "xmpp.muc.service";
......
...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp ( ...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp (
ALTER TABLE mucRoom ADD COLUMN serviceID BIGINT NOT NULL BEFORE roomID; ALTER TABLE mucRoom ADD COLUMN serviceID BIGINT NOT NULL BEFORE roomID;
CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID); CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID);
// change mucRoom's primary key to be referenced around serviceID // change mucRoom primary key to be referenced around serviceID
ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk; ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name); ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1); ...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1);
// update all entries in mucRoom to be set to the default conference service // update all entries in mucRoom to be set to the default conference service
UPDATE mucRoom set serviceID = 1; UPDATE mucRoom set serviceID = 1;
// update conference name/desc if there's a custom one set // 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" ) 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" ); WHERE EXISTS ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = "xmpp.muc.service" );
DELETE FROM jiveProperty WHERE name = "xmpp.muc.service"; DELETE FROM jiveProperty WHERE name = "xmpp.muc.service";
......
...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp ( ...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp (
ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL; ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL;
CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID); CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID);
-- change mucRoom's primary key to be referenced around serviceID -- change mucRoom primary key to be referenced around serviceID
ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk; ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name); ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1); ...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1);
-- update all entries in mucRoom to be set to the default conference service -- update all entries in mucRoom to be set to the default conference service
UPDATE mucRoom set serviceID = 1; UPDATE mucRoom set serviceID = 1;
-- update conference name/desc if there's a custom one set -- 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" ) 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" ); WHERE EXISTS ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = "xmpp.muc.service" );
DELETE FROM jiveProperty WHERE name = "xmpp.muc.service"; DELETE FROM jiveProperty WHERE name = "xmpp.muc.service";
......
...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp ( ...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp (
ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER NOT NULL; ALTER TABLE mucRoom ADD COLUMN serviceID INTEGER NOT NULL;
CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID); CREATE INDEX mucRm_serviceid_idx ON mucRoom (serviceID);
-- change mucRoom's primary key to be referenced around serviceID -- change mucRoom primary key to be referenced around serviceID
ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk; ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name); ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1); ...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1);
-- update all entries in mucRoom to be set to the default conference service -- update all entries in mucRoom to be set to the default conference service
UPDATE mucRoom set serviceID = 1; UPDATE mucRoom set serviceID = 1;
-- update conference name/desc if there's a custom one set -- 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" ) 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" ); WHERE EXISTS ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = "xmpp.muc.service" );
DELETE FROM jiveProperty WHERE name = "xmpp.muc.service"; DELETE FROM jiveProperty WHERE name = "xmpp.muc.service";
......
...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp ( ...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp (
ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL; ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL;
CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID); CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID);
/* change mucRoom's primary key to be referenced around serviceID */ /* change mucRoom primary key to be referenced around serviceID */
ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk; ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name); ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1); ...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1);
/* update all entries in mucRoom to be set to the default conference service */ /* update all entries in mucRoom to be set to the default conference service */
UPDATE mucRoom set serviceID = 1; UPDATE mucRoom set serviceID = 1;
/* update conference name/desc if there's a custom one set */ /* 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" ) 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" ); WHERE EXISTS ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = "xmpp.muc.service" );
DELETE FROM jiveProperty WHERE name = "xmpp.muc.service"; DELETE FROM jiveProperty WHERE name = "xmpp.muc.service";
......
...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp ( ...@@ -19,7 +19,7 @@ CREATE TABLE mucServiceProp (
ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL; ALTER TABLE mucRoom ADD COLUMN serviceID INT NOT NULL;
CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID); CREATE INDEX mucRoom_serviceid_idx ON mucRoom(serviceID);
/* change mucRoom's primary key to be referenced around serviceID */ /* change mucRoom primary key to be referenced around serviceID */
ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk; ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name); ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (serviceID, name);
...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1); ...@@ -30,7 +30,7 @@ INSERT INTO jiveID (idType, id) VALUES (26, 1);
/* update all entries in mucRoom to be set to the default conference service */ /* update all entries in mucRoom to be set to the default conference service */
UPDATE mucRoom set serviceID = 1; UPDATE mucRoom set serviceID = 1;
/* update conference name/desc if there's a custom one set */ /* 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" ) 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" ); WHERE EXISTS ( SELECT jiveProperty.propValue FROM jiveProperty WHERE jiveProperty.name = "xmpp.muc.service" );
DELETE FROM jiveProperty WHERE name = "xmpp.muc.service"; DELETE FROM jiveProperty WHERE name = "xmpp.muc.service";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment