Updated according to latest db schema.

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

src/database/upgrade/1.1_to_2.0/messenger_db2.sql

-# $RCSfile$
-# $Revision$
-# $Date$
+-- $RCSfile$
+-- $Revision$
+-- $Date$
 
-# upgrades from Messenger 1.1.x to 2.0.x
+-- upgrades from Messenger 1.1.x to 2.0.x
+
+-- jiveUser: Adds new column "username". Removes "nameVisible" & "emailVisible". Changes primary key
+ALTER TABLE jiveUser ADD COLUMN username VARCHAR(32) NOT NULL;
+ALTER TABLE jiveUser DROP COLUMN nameVisible;
+ALTER TABLE jiveUser DROP COLUMN emailVisible;
+UPDATE jiveUser,jiveUserID SET jiveUser.username = jiveUserID.username where jiveUserID.objectID = jiveUser.userID;
+ALTER TABLE jiveUser DROP PRIMARY KEY;
+ALTER TABLE jiveUser ADD CONSTRAINT jiveUser_pk PRIMARY KEY (username);
+
+-- jiveUserProp: Adds new column "username". Changes primary key
+ALTER TABLE jiveUserProp ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveUserProp,jiveUser SET jiveUserProp.username = jiveUser.username where jiveUserProp.userID = jiveUser.userID;
+ALTER TABLE jiveUserProp DROP PRIMARY KEY;
+ALTER TABLE jiveUserProp ADD CONSTRAINT jiveUsrProp_pk PRIMARY KEY (username, name);
+
+-- jiveGroupUser: Adds new column "username". Changes primary key
+ALTER TABLE jiveGroupUser ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveGroupUser,jiveUser SET jiveGroupUser.username = jiveUser.username where jiveGroupUser.userID = jiveUser.userID;
+ALTER TABLE jiveGroupUser DROP PRIMARY KEY;
+ALTER TABLE jiveGroupUser ADD CONSTRAINT jiveGrpUser PRIMARY KEY (groupID, username, administrator);
+
+-- jivePrivate: Adds new column "username". Changes primary key
+ALTER TABLE jivePrivate ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jivePrivate,jiveUser SET jivePrivate.username = jiveUser.username where jivePrivate.userID = jiveUser.userID;
+ALTER TABLE jivePrivate DROP PRIMARY KEY;
+ALTER TABLE jivePrivate ADD CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace);
+
+-- jiveOffline: Adds new column "username". Changes primary key
+ALTER TABLE jiveOffline ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveOffline ,jiveUser SET jiveOffline.username = jiveUser.username where jiveOffline.userID = jiveUser.userID;
+ALTER TABLE jiveOffline  DROP PRIMARY KEY;
+ALTER TABLE jiveOffline  ADD CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID);
+
+-- jiveRoster: Adds new column "username". Replaces old index with new one
+ALTER TABLE jiveRoster ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveRoster,jiveUser SET jiveRoster.username = jiveUser.username where jiveRoster.userID = jiveUser.userID;
+DROP INDEX jiveR_userid_idx;
+CREATE INDEX jiveR_usrnme_idx ON jiveRoster (username ASC);
+
+-- jiveVCard: Adds new column "username". Changes primary key
+ALTER TABLE jiveVCard ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveVCard ,jiveUser SET jiveVCard.username = jiveUser.username where jiveVCard.userID = jiveUser.userID;
+ALTER TABLE jiveVCard  DROP PRIMARY KEY;
+ALTER TABLE jiveVCard  ADD CONSTRAINT jiveVCard_pk PRIMARY KEY (username, name);
+
+-- Drops no longer needed tables
+DROP TABLE jiveUserID;
+DROP TABLE jiveChatbot;
+DROP TABLE jiveDomain;
+DROP TABLE jiveUserPerm;
+
+-- Deletes no longer needed entries
+DELETE FROM jiveID where idType = 0;
+DELETE FROM jiveID where idType = 1;
+DELETE FROM jiveID where idType = 2;
+DELETE FROM jiveID where idType = 13;
+DELETE FROM jiveID where idType = 14;
+
+-- Finally remove "userID" column
+ALTER TABLE jiveUserProp DROP COLUMN userID;
+ALTER TABLE jiveUser DROP COLUMN userID;
+ALTER TABLE jiveGroupUser DROP COLUMN userID;
+ALTER TABLE jivePrivate DROP COLUMN userID;
+ALTER TABLE jiveOffline DROP COLUMN userID;
+ALTER TABLE jiveRoster DROP COLUMN userID;
+ALTER TABLE jiveVCard DROP COLUMN userID;
+
+-- Create new tables
 
 CREATE TABLE jiveProperty (
   name        VARCHAR(100) NOT NULL,
@@ -60,5 +128,5 @@ CREATE TABLE mucConversationLog (
   body                LONG VARCHAR  NULL
 );
 
-# Unique ID entry for mucRoom
+-- Unique ID entry for mucRoom
 insert INTO jiveID (idType, id) VALUES (23, 1);
\ No newline at end of file

src/database/upgrade/1.1_to_2.0/messenger_hsqldb.sql

-# $RCSfile$
-# $Revision$
-# $Date$
+// $RCSfile$
+// $Revision$
+// $Date$
 
-# upgrades from Messenger 1.1.x to 2.0.x
+// upgrades from Messenger 1.1.x to 2.0.x
+
+// jiveUser: Adds new column "username". Removes "nameVisible" & "emailVisible". Changes primary key
+ALTER TABLE jiveUser ADD COLUMN username VARCHAR(32) NOT NULL;
+ALTER TABLE jiveUser DROP COLUMN nameVisible;
+ALTER TABLE jiveUser DROP COLUMN emailVisible;
+UPDATE jiveUser,jiveUserID SET jiveUser.username = jiveUserID.username where jiveUserID.objectID = jiveUser.userID;
+ALTER TABLE jiveUser DROP PRIMARY KEY;
+ALTER TABLE jiveUser ADD CONSTRAINT jiveUser_pk PRIMARY KEY (username);
+
+// jiveUserProp: Adds new column "username". Changes primary key
+ALTER TABLE jiveUserProp ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveUserProp,jiveUser SET jiveUserProp.username = jiveUser.username where jiveUserProp.userID = jiveUser.userID;
+ALTER TABLE jiveUserProp DROP PRIMARY KEY;
+ALTER TABLE jiveUserProp ADD CONSTRAINT jiveUserProp_pk PRIMARY KEY (username, name);
+
+// jiveGroupUser: Adds new column "username". Changes primary key
+ALTER TABLE jiveGroupUser ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveGroupUser,jiveUser SET jiveGroupUser.username = jiveUser.username where jiveGroupUser.userID = jiveUser.userID;
+ALTER TABLE jiveGroupUser DROP PRIMARY KEY;
+ALTER TABLE jiveGroupUser ADD CONSTRAINT jiveGroupUser_pk PRIMARY KEY (groupID, username, administrator);
+
+// jivePrivate: Adds new column "username". Changes primary key
+ALTER TABLE jivePrivate ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jivePrivate,jiveUser SET jivePrivate.username = jiveUser.username where jivePrivate.userID = jiveUser.userID;
+ALTER TABLE jivePrivate DROP PRIMARY KEY;
+ALTER TABLE jivePrivate ADD CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace);
+
+// jiveOffline: Adds new column "username". Changes primary key
+ALTER TABLE jiveOffline ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveOffline ,jiveUser SET jiveOffline.username = jiveUser.username where jiveOffline.userID = jiveUser.userID;
+ALTER TABLE jiveOffline DROP PRIMARY KEY;
+ALTER TABLE jiveOffline ADD CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID);
+
+// jiveRoster: Adds new column "username". Replaces old index with new one
+ALTER TABLE jiveRoster ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveRoster,jiveUser SET jiveRoster.username = jiveUser.username where jiveRoster.userID = jiveUser.userID;
+DROP INDEX jiveRoster_userid_idx;
+CREATE INDEX jiveRoster_username_idx ON jiveRoster (username);
+
+// jiveVCard: Adds new column "username". Changes primary key
+ALTER TABLE jiveVCard ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveVCard ,jiveUser SET jiveVCard.username = jiveUser.username where jiveVCard.userID = jiveUser.userID;
+ALTER TABLE jiveVCard DROP PRIMARY KEY;
+ALTER TABLE jiveVCard ADD CONSTRAINT jiveVCard_pk PRIMARY KEY (username, name);
+
+// Drops no longer needed tables
+DROP TABLE jiveUserID;
+DROP TABLE jiveChatbot;
+DROP TABLE jiveDomain;
+DROP TABLE jiveUserPerm;
+
+// Deletes no longer needed entries
+DELETE FROM jiveID where idType = 0;
+DELETE FROM jiveID where idType = 1;
+DELETE FROM jiveID where idType = 2;
+DELETE FROM jiveID where idType = 13;
+DELETE FROM jiveID where idType = 14;
+
+// Finally remove "userID" column
+ALTER TABLE jiveUserProp DROP COLUMN userID;
+ALTER TABLE jiveUser DROP COLUMN userID;
+ALTER TABLE jiveGroupUser DROP COLUMN userID;
+ALTER TABLE jivePrivate DROP COLUMN userID;
+ALTER TABLE jiveOffline DROP COLUMN userID;
+ALTER TABLE jiveRoster DROP COLUMN userID;
+ALTER TABLE jiveVCard DROP COLUMN userID;
+
+// Create new tables
 
 CREATE TABLE jiveProperty (
   name        VARCHAR(100)  NOT NULL,
@@ -32,7 +100,7 @@ CREATE TABLE mucRoom (
   rolesToBroadcast    INTEGER       NOT NULL,
   lastActiveDate      CHAR(15)      NULL,
   inMemory            INTEGER       NOT NULL,
-  PRIMARY KEY (name)
+  CONSTRAINT mucRoom_pk PRIMARY KEY (name)
 );
 
 CREATE INDEX mucRoom_roomid_idx ON mucRoom(roomID);
@@ -41,14 +109,14 @@ CREATE TABLE mucAffiliation (
   roomID              BIGINT        NOT NULL,
   jid                 VARCHAR(3071) NOT NULL,
   affiliation         INTEGER       NOT NULL,
-  PRIMARY KEY (roomID, jid)
+  CONSTRAINT mucAffiliation_pk PRIMARY KEY (roomID, jid)
 );
 
 CREATE TABLE mucMember (
   roomID              BIGINT        NOT NULL,
   jid                 VARCHAR(3071) NOT NULL,
   nickname            VARCHAR(255)  NULL,
-  PRIMARY KEY (roomID, jid)
+  CONSTRAINT mucMember_pk PRIMARY KEY (roomID, jid)
 );
 
 CREATE TABLE mucConversationLog (
@@ -60,5 +128,5 @@ CREATE TABLE mucConversationLog (
   body                LONGVARCHAR   NULL
 );
 
-# Unique ID entry for mucRoom
+// Unique ID entry for mucRoom
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
\ No newline at end of file

src/database/upgrade/1.1_to_2.0/messenger_mysql.sql

@@ -4,6 +4,74 @@
 
 # upgrades from Messenger 1.1.x to 2.0.x
 
+# jiveUser: Adds new column "username". Removes "nameVisible" & "emailVisible". Changes primary key
+ALTER TABLE jiveUser ADD COLUMN username VARCHAR(32) NOT NULL;
+ALTER TABLE jiveUser DROP COLUMN nameVisible;
+ALTER TABLE jiveUser DROP COLUMN emailVisible;
+UPDATE jiveUser,jiveUserID SET jiveUser.username = jiveUserID.username where jiveUserID.objectID = jiveUser.userID;
+ALTER TABLE jiveUser DROP PRIMARY KEY;
+ALTER TABLE jiveUser ADD PRIMARY KEY (username);
+
+# jiveUserProp: Adds new column "username". Changes primary key
+ALTER TABLE jiveUserProp ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveUserProp,jiveUser SET jiveUserProp.username = jiveUser.username where jiveUserProp.userID = jiveUser.userID;
+ALTER TABLE jiveUserProp DROP PRIMARY KEY;
+ALTER TABLE jiveUserProp ADD PRIMARY KEY (username, name);
+
+# jiveGroupUser: Adds new column "username". Changes primary key
+ALTER TABLE jiveGroupUser ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveGroupUser,jiveUser SET jiveGroupUser.username = jiveUser.username where jiveGroupUser.userID = jiveUser.userID;
+ALTER TABLE jiveGroupUser DROP PRIMARY KEY;
+ALTER TABLE jiveGroupUser ADD PRIMARY KEY (groupID, username, administrator);
+
+# jivePrivate: Adds new column "username". Changes primary key
+ALTER TABLE jivePrivate ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jivePrivate,jiveUser SET jivePrivate.username = jiveUser.username where jivePrivate.userID = jiveUser.userID;
+ALTER TABLE jivePrivate DROP PRIMARY KEY;
+ALTER TABLE jivePrivate ADD PRIMARY KEY (username, name, namespace);
+
+# jiveOffline: Adds new column "username". Changes primary key
+ALTER TABLE jiveOffline ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveOffline ,jiveUser SET jiveOffline.username = jiveUser.username where jiveOffline.userID = jiveUser.userID;
+ALTER TABLE jiveOffline  DROP PRIMARY KEY;
+ALTER TABLE jiveOffline  ADD PRIMARY KEY (username, messageID);
+
+# jiveRoster: Adds new column "username". Replaces old index with new one
+ALTER TABLE jiveRoster ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveRoster,jiveUser SET jiveRoster.username = jiveUser.username where jiveRoster.userID = jiveUser.userID;
+ALTER TABLE jiveRoster DROP INDEX jiveRoster_userid_idx;
+ALTER TABLE jiveRoster ADD INDEX jiveRoster_unameid_idx (username);
+
+# jiveVCard: Adds new column "username". Changes primary key
+ALTER TABLE jiveVCard ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveVCard ,jiveUser SET jiveVCard.username = jiveUser.username where jiveVCard.userID = jiveUser.userID;
+ALTER TABLE jiveVCard  DROP PRIMARY KEY;
+ALTER TABLE jiveVCard  ADD PRIMARY KEY (username, name);
+
+# Drops no longer needed tables
+DROP TABLE jiveUserID;
+DROP TABLE jiveChatbot;
+DROP TABLE jiveDomain;
+DROP TABLE jiveUserPerm;
+
+# Deletes no longer needed entries
+DELETE FROM jiveID where idType = 0;
+DELETE FROM jiveID where idType = 1;
+DELETE FROM jiveID where idType = 2;
+DELETE FROM jiveID where idType = 13;
+DELETE FROM jiveID where idType = 14;
+
+# Finally remove "userID" column
+ALTER TABLE jiveUserProp DROP COLUMN userID;
+ALTER TABLE jiveUser DROP COLUMN userID;
+ALTER TABLE jiveGroupUser DROP COLUMN userID;
+ALTER TABLE jivePrivate DROP COLUMN userID;
+ALTER TABLE jiveOffline DROP COLUMN userID;
+ALTER TABLE jiveRoster DROP COLUMN userID;
+ALTER TABLE jiveVCard DROP COLUMN userID;
+
+# Create new tables
+
 CREATE TABLE jiveProperty (
   name        VARCHAR(100) NOT NULL,
   propValue   TEXT NOT NULL,

src/database/upgrade/1.1_to_2.0/messenger_oracle.sql

-# $RCSfile$
-# $Revision$
-# $Date$
+REM // $RCSfile$
+REM // $Revision$
+REM // $Date$
 
-# upgrades from Messenger 1.1.x to 2.0.x
+REM // upgrades from Messenger 1.1.x to 2.0.x
+
+REM // jiveUser: Adds new column "username". Removes "nameVisible" & "emailVisible". Changes primary key
+ALTER TABLE jiveUser ADD COLUMN username VARCHAR2(32) NOT NULL;
+ALTER TABLE jiveUser DROP COLUMN nameVisible;
+ALTER TABLE jiveUser DROP COLUMN emailVisible;
+UPDATE jiveUser,jiveUserID SET jiveUser.username = jiveUserID.username where jiveUserID.objectID = jiveUser.userID;
+ALTER TABLE jiveUser DROP PRIMARY KEY;
+ALTER TABLE jiveUser ADD CONSTRAINT jiveUser_pk PRIMARY KEY (username);
+
+REM // jiveUserProp: Adds new column "username". Changes primary key
+ALTER TABLE jiveUserProp ADD COLUMN username VARCHAR2(32) NOT NULL;
+UPDATE jiveUserProp,jiveUser SET jiveUserProp.username = jiveUser.username where jiveUserProp.userID = jiveUser.userID;
+ALTER TABLE jiveUserProp DROP PRIMARY KEY;
+ALTER TABLE jiveUserProp ADD CONSTRAINT jiveUserProp_pk PRIMARY KEY (username, name);
+
+REM // jiveGroupUser: Adds new column "username". Changes primary key
+ALTER TABLE jiveGroupUser ADD COLUMN username VARCHAR2(32) NOT NULL;
+UPDATE jiveGroupUser,jiveUser SET jiveGroupUser.username = jiveUser.username where jiveGroupUser.userID = jiveUser.userID;
+ALTER TABLE jiveGroupUser DROP PRIMARY KEY;
+ALTER TABLE jiveGroupUser ADD CONSTRAINT jiveGroupUser PRIMARY KEY (groupID, username, administrator);
+
+REM // jivePrivate: Adds new column "username". Changes primary key
+ALTER TABLE jivePrivate ADD COLUMN username VARCHAR2(32) NOT NULL;
+UPDATE jivePrivate,jiveUser SET jivePrivate.username = jiveUser.username where jivePrivate.userID = jiveUser.userID;
+ALTER TABLE jivePrivate DROP PRIMARY KEY;
+ALTER TABLE jivePrivate ADD CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace);
+
+REM // jiveOffline: Adds new column "username". Changes primary key
+ALTER TABLE jiveOffline ADD COLUMN username VARCHAR2(32) NOT NULL;
+UPDATE jiveOffline ,jiveUser SET jiveOffline.username = jiveUser.username where jiveOffline.userID = jiveUser.userID;
+ALTER TABLE jiveOffline DROP PRIMARY KEY;
+ALTER TABLE jiveOffline ADD CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID);
+
+REM // jiveRoster: Adds new column "username". Replaces old index with new one
+ALTER TABLE jiveRoster ADD COLUMN username VARCHAR2(32) NOT NULL;
+UPDATE jiveRoster,jiveUser SET jiveRoster.username = jiveUser.username where jiveRoster.userID = jiveUser.userID;
+DROP INDEX jiveRoster_userid_idx;
+CREATE INDEX jiveRoster_username_idx ON jiveRoster (username ASC);
+
+REM // jiveVCard: Adds new column "username". Changes primary key
+ALTER TABLE jiveVCard ADD COLUMN username VARCHAR2(32) NOT NULL;
+UPDATE jiveVCard ,jiveUser SET jiveVCard.username = jiveUser.username where jiveVCard.userID = jiveUser.userID;
+ALTER TABLE jiveVCard DROP PRIMARY KEY;
+ALTER TABLE jiveVCard ADD CONSTRAINT jiveVCard_pk PRIMARY KEY (username, name);
+
+REM // Drops no longer needed tables
+DROP TABLE jiveUserID;
+DROP TABLE jiveChatbot;
+DROP TABLE jiveDomain;
+DROP TABLE jiveUserPerm;
+
+REM // Deletes no longer needed entries
+DELETE FROM jiveID where idType = 0;
+DELETE FROM jiveID where idType = 1;
+DELETE FROM jiveID where idType = 2;
+DELETE FROM jiveID where idType = 13;
+DELETE FROM jiveID where idType = 14;
+
+REM // Finally remove "userID" column
+ALTER TABLE jiveUserProp DROP COLUMN userID;
+ALTER TABLE jiveUser DROP COLUMN userID;
+ALTER TABLE jiveGroupUser DROP COLUMN userID;
+ALTER TABLE jivePrivate DROP COLUMN userID;
+ALTER TABLE jiveOffline DROP COLUMN userID;
+ALTER TABLE jiveRoster DROP COLUMN userID;
+ALTER TABLE jiveVCard DROP COLUMN userID;
+
+REM // Create new tables
 
 CREATE TABLE jiveProperty (
   name        VARCHAR2(100) NOT NULL,
@@ -59,5 +127,5 @@ CREATE TABLE mucConversationLog (
   body                VARCHAR2(4000) NULL
 );
 
-# Unique ID entry for mucRoom
+REM // Unique ID entry for mucRoom
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
\ No newline at end of file

src/database/upgrade/1.1_to_2.0/messenger_postgresql.sql

-# $RCSfile$
-# $Revision$
-# $Date$
+-- $RCSfile$
+-- $Revision$
+-- $Date$
 
-# upgrades from Messenger 1.1.x to 2.0.x
+-- upgrades from Messenger 1.1.x to 2.0.x
+
+-- jiveUser: Adds new column "username". Removes "nameVisible" & "emailVisible". Changes primary key
+ALTER TABLE jiveUser ADD COLUMN username VARCHAR(32) NOT NULL;
+ALTER TABLE jiveUser DROP COLUMN nameVisible;
+ALTER TABLE jiveUser DROP COLUMN emailVisible;
+UPDATE jiveUser,jiveUserID SET jiveUser.username = jiveUserID.username where jiveUserID.objectID = jiveUser.userID;
+ALTER TABLE jiveUser DROP PRIMARY KEY;
+ALTER TABLE jiveUser ADD CONSTRAINT jiveUser_pk PRIMARY KEY (username);
+
+-- jiveUserProp: Adds new column "username". Changes primary key
+ALTER TABLE jiveUserProp ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveUserProp,jiveUser SET jiveUserProp.username = jiveUser.username where jiveUserProp.userID = jiveUser.userID;
+ALTER TABLE jiveUserProp DROP PRIMARY KEY;
+ALTER TABLE jiveUserProp ADD CONSTRAINT jiveUserProp_pk PRIMARY KEY (username, name);
+
+-- jiveGroupUser: Adds new column "username". Changes primary key
+ALTER TABLE jiveGroupUser ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveGroupUser,jiveUser SET jiveGroupUser.username = jiveUser.username where jiveGroupUser.userID = jiveUser.userID;
+ALTER TABLE jiveGroupUser DROP PRIMARY KEY;
+ALTER TABLE jiveGroupUser ADD CONSTRAINT jiveGroupUser_pk PRIMARY KEY (groupID, username, administrator);
+
+-- jivePrivate: Adds new column "username". Changes primary key
+ALTER TABLE jivePrivate ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jivePrivate,jiveUser SET jivePrivate.username = jiveUser.username where jivePrivate.userID = jiveUser.userID;
+ALTER TABLE jivePrivate DROP PRIMARY KEY;
+ALTER TABLE jivePrivate ADD CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace);
+
+-- jiveOffline: Adds new column "username". Changes primary key
+ALTER TABLE jiveOffline ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveOffline ,jiveUser SET jiveOffline.username = jiveUser.username where jiveOffline.userID = jiveUser.userID;
+ALTER TABLE jiveOffline  DROP PRIMARY KEY;
+ALTER TABLE jiveOffline  ADD CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID);
+
+-- jiveRoster: Adds new column "username". Replaces old index with new one
+ALTER TABLE jiveRoster ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveRoster,jiveUser SET jiveRoster.username = jiveUser.username where jiveRoster.userID = jiveUser.userID;
+DROP INDEX jiveRoster_userID_idx;
+CREATE INDEX jiveRoster_username_idx ON jiveRoster (username);
+
+-- jiveVCard: Adds new column "username". Changes primary key
+ALTER TABLE jiveVCard ADD COLUMN username VARCHAR(32) NOT NULL;
+UPDATE jiveVCard ,jiveUser SET jiveVCard.username = jiveUser.username where jiveVCard.userID = jiveUser.userID;
+ALTER TABLE jiveVCard  DROP PRIMARY KEY;
+ALTER TABLE jiveVCard  ADD CONSTRAINT jiveVCard_pk PRIMARY KEY (username, name);
+
+-- Drops no longer needed tables
+DROP TABLE jiveUserID;
+DROP TABLE jiveChatbot;
+DROP TABLE jiveDomain;
+DROP TABLE jiveUserPerm;
+
+-- Deletes no longer needed entries
+DELETE FROM jiveID where idType = 0;
+DELETE FROM jiveID where idType = 1;
+DELETE FROM jiveID where idType = 2;
+DELETE FROM jiveID where idType = 13;
+DELETE FROM jiveID where idType = 14;
+
+-- Finally remove "userID" column
+ALTER TABLE jiveUserProp DROP COLUMN userID;
+ALTER TABLE jiveUser DROP COLUMN userID;
+ALTER TABLE jiveGroupUser DROP COLUMN userID;
+ALTER TABLE jivePrivate DROP COLUMN userID;
+ALTER TABLE jiveOffline DROP COLUMN userID;
+ALTER TABLE jiveRoster DROP COLUMN userID;
+ALTER TABLE jiveVCard DROP COLUMN userID;
+
+-- Create new tables
 
 CREATE TABLE jiveProperty (
   name        VARCHAR(100) NOT NULL,
@@ -60,5 +128,5 @@ CREATE TABLE mucConversationLog (
   body                TEXT           NULL
 );
 
-# Unique ID entry for mucRoom
+-- Unique ID entry for mucRoom
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
\ No newline at end of file

src/database/upgrade/1.1_to_2.0/messenger_sqlserver_2000.sql

-# $RCSfile$
-# $Revision$
-# $Date$
+/*
+ * $RCSfile$
+ * $Revision$
+ * $Date$
+ */
 
-# upgrades from Messenger 1.1.x to 2.0.x
+/* upgrades from Messenger 1.1.x to 2.0.x */
+
+/* jiveUser: Adds new column "username". Removes "nameVisible" & "emailVisible". Changes primary key */
+ALTER TABLE jiveUser ADD COLUMN username NVARCHAR(32) NOT NULL;
+ALTER TABLE jiveUser DROP COLUMN nameVisible;
+ALTER TABLE jiveUser DROP COLUMN emailVisible;
+UPDATE jiveUser,jiveUserID SET jiveUser.username = jiveUserID.username where jiveUserID.objectID = jiveUser.userID;
+ALTER TABLE jiveUser DROP PRIMARY KEY;
+ALTER TABLE jiveUser ADD CONSTRAINT jiveUser_pk PRIMARY KEY (username);
+
+/* jiveUserProp: Adds new column "username". Changes primary key */
+ALTER TABLE jiveUserProp ADD COLUMN username NVARCHAR(32) NOT NULL;
+UPDATE jiveUserProp,jiveUser SET jiveUserProp.username = jiveUser.username where jiveUserProp.userID = jiveUser.userID;
+ALTER TABLE jiveUserProp DROP PRIMARY KEY;
+ALTER TABLE jiveUserProp ADD CONSTRAINT jiveUserProp_pk PRIMARY KEY (username, name);
+
+/* jiveGroupUser: Adds new column "username". Changes primary key */
+ALTER TABLE jiveGroupUser ADD COLUMN username NVARCHAR(32) NOT NULL;
+UPDATE jiveGroupUser,jiveUser SET jiveGroupUser.username = jiveUser.username where jiveGroupUser.userID = jiveUser.userID;
+ALTER TABLE jiveGroupUser DROP PRIMARY KEY;
+ALTER TABLE jiveGroupUser ADD CONSTRAINT jiveGroupUser_pk PRIMARY KEY (groupID, username, administrator);
+
+/* jivePrivate: Adds new column "username". Changes primary key */
+ALTER TABLE jivePrivate ADD COLUMN username NVARCHAR(32) NOT NULL;
+UPDATE jivePrivate,jiveUser SET jivePrivate.username = jiveUser.username where jivePrivate.userID = jiveUser.userID;
+ALTER TABLE jivePrivate DROP PRIMARY KEY;
+ALTER TABLE jivePrivate ADD CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace);
+
+/* jiveOffline: Adds new column "username". Changes primary key */
+ALTER TABLE jiveOffline ADD COLUMN username NVARCHAR(32) NOT NULL;
+UPDATE jiveOffline ,jiveUser SET jiveOffline.username = jiveUser.username where jiveOffline.userID = jiveUser.userID;
+ALTER TABLE jiveOffline  DROP PRIMARY KEY;
+ALTER TABLE jiveOffline  ADD CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID);
+
+/* jiveRoster: Adds new column "username". Replaces old index with new one */
+ALTER TABLE jiveRoster ADD COLUMN username NVARCHAR(32) NOT NULL;
+UPDATE jiveRoster,jiveUser SET jiveRoster.username = jiveUser.username where jiveRoster.userID = jiveUser.userID;
+DROP INDEX jiveRoster_userID_idx;
+CREATE INDEX jiveRoster_username_idx ON jiveRoster (username ASC);
+
+/* jiveVCard: Adds new column "username". Changes primary key */
+ALTER TABLE jiveVCard ADD COLUMN username NVARCHAR(32) NOT NULL;
+UPDATE jiveVCard ,jiveUser SET jiveVCard.username = jiveUser.username where jiveVCard.userID = jiveUser.userID;
+ALTER TABLE jiveVCard  DROP PRIMARY KEY;
+ALTER TABLE jiveVCard  ADD CONSTRAINT jiveVCard_pk PRIMARY KEY (username, name);
+
+/* Drops no longer needed tables */
+DROP TABLE jiveUserID;
+DROP TABLE jiveChatbot;
+DROP TABLE jiveDomain;
+DROP TABLE jiveUserPerm;
+
+/* Deletes no longer needed entries */
+DELETE FROM jiveID where idType = 0;
+DELETE FROM jiveID where idType = 1;
+DELETE FROM jiveID where idType = 2;
+DELETE FROM jiveID where idType = 13;
+DELETE FROM jiveID where idType = 14;
+
+/* Finally remove "userID" column */
+ALTER TABLE jiveUserProp DROP COLUMN userID;
+ALTER TABLE jiveUser DROP COLUMN userID;
+ALTER TABLE jiveGroupUser DROP COLUMN userID;
+ALTER TABLE jivePrivate DROP COLUMN userID;
+ALTER TABLE jiveOffline DROP COLUMN userID;
+ALTER TABLE jiveRoster DROP COLUMN userID;
+ALTER TABLE jiveVCard DROP COLUMN userID;
+
+/* Create new tables */
 
 CREATE TABLE jiveProperty (
   name         NVARCHAR(100) NOT NULL,
@@ -60,5 +130,5 @@ CREATE TABLE mucConversationLog (
   body                NVARCHAR(3700) NULL
 );
 
-# Unique ID entry for mucRoom
+/* Unique ID entry for mucRoom */
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
\ No newline at end of file