1. Renamed column "name" of table "jiveGroup" to "groupName". JM-67

2. Removed lastActiveDate field from mucRoom.
3. Changed index of table mucConversationLog


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

src/database/messenger_db2.sql

@@ -72,9 +72,9 @@ CREATE TABLE jiveVCard (
 
 
 CREATE TABLE jiveGroup (
-  name                  VARCHAR(50)     NOT NULL,
+  groupName             VARCHAR(50)     NOT NULL,
   description           VARCHAR(255),
-  CONSTRAINT jiveGroup_pk PRIMARY KEY (name)
+  CONSTRAINT jiveGroup_pk PRIMARY KEY (groupName)
 );
 
 
@@ -127,7 +127,6 @@ CREATE TABLE mucRoom (
   logEnabled          INTEGER       NOT NULL,
   subject             VARCHAR(100)  NULL,
   rolesToBroadcast    INTEGER       NOT NULL,
-  lastActiveDate      CHAR(15)      NULL,
   CONSTRAINT mucRoom_pk PRIMARY KEY (name)
 );
 
@@ -155,7 +154,7 @@ CREATE TABLE mucConversationLog (
   subject             VARCHAR(255)  NULL,
   body                LONG VARCHAR  NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time, roomID);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
 
 
 -- Finally, insert default table values

src/database/messenger_mysql.sql

@@ -21,9 +21,9 @@ CREATE TABLE jiveUserProp (
 );
 
 CREATE TABLE jiveGroup (
-  name                  VARCHAR(50)     NOT NULL,
+  groupName              VARCHAR(50)     NOT NULL,
   description           VARCHAR(255),
-  PRIMARY KEY (name)
+  PRIMARY KEY (groupName)
 );
 
 CREATE TABLE jiveGroupProp (
@@ -116,7 +116,6 @@ CREATE TABLE mucRoom (
   logEnabled          TINYINT       NOT NULL,
   subject             VARCHAR(100)  NULL,
   rolesToBroadcast    TINYINT       NOT NULL,
-  lastActiveDate      CHAR(15)      NULL,
   PRIMARY KEY (name),
   INDEX mucRoom_roomid_idx (roomID)
 );
@@ -142,7 +141,7 @@ CREATE TABLE mucConversationLog (
   time                CHAR(15)      NOT NULL,
   subject             VARCHAR(255)  NULL,
   body                TEXT          NULL,
-  INDEX mucLog_time_idx (time, roomID)
+  INDEX mucLog_time_idx (time)
 );
 
 # Finally, insert default table values.

src/database/messenger_oracle.sql

@@ -72,7 +72,7 @@ CREATE TABLE jiveVCard (
 );
 
 CREATE TABLE jiveGroup (
-  name                  VARCHAR2(50)    NOT NULL,
+  groupName             VARCHAR2(50)    NOT NULL,
   description           VARCHAR2(255),
   CONSTRAINT jiveGroup_pk PRIMARY KEY (groupName)
 );
@@ -123,7 +123,6 @@ CREATE TABLE mucRoom(
   logEnabled          INTEGER       NOT NULL,
   subject             VARCHAR2(100) NULL,
   rolesToBroadcast    INTEGER       NOT NULL,
-  lastActiveDate      CHAR(15)      NULL,
   CONSTRAINT mucRoom_pk PRIMARY KEY (name)
 );
 CREATE INDEX mucRoom_roomid_idx ON mucRoom (roomID);
@@ -150,7 +149,7 @@ CREATE TABLE mucConversationLog (
   subject             VARCHAR2(255)  NULL,
   body                VARCHAR2(4000) NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time, roomID);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
 
 REM // Finally, insert default table values.
 

src/database/messenger_postgresql.sql

@@ -75,9 +75,9 @@ CREATE TABLE jiveVCard (
 
 
 CREATE TABLE jiveGroup (
-  name                  VARCHAR(50)     NOT NULL,
+  groupName             VARCHAR(50)     NOT NULL,
   description           VARCHAR(255),
-  CONSTRAINT jiveGroup_pk PRIMARY KEY (name)
+  CONSTRAINT jiveGroup_pk PRIMARY KEY (groupName)
 );
 
 
@@ -129,7 +129,6 @@ CREATE TABLE mucRoom (
   logEnabled          INTEGER       NOT NULL,
   subject             VARCHAR(100)  NULL,
   rolesToBroadcast    INTEGER       NOT NULL,
-  lastActiveDate      CHAR(15)      NULL,
   CONSTRAINT mucRoom__pk PRIMARY KEY (name)
 );
 
@@ -157,7 +156,7 @@ CREATE TABLE mucConversationLog (
   subject             VARCHAR(255)   NULL,
   body                TEXT           NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time, roomID);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
 
 -- Finally, insert default table values.