Renamed column time to logTime in mucConversationLog. JM-1153

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

src/database/openfire_db2.sql

@@ -213,13 +213,13 @@ CREATE TABLE mucMember (
 
 CREATE TABLE mucConversationLog (
   roomID              INTEGER       NOT NULL,
-  sender              VARCHAR(2000)       NOT NULL,
+  sender              VARCHAR(2000) NOT NULL,
   nickname            VARCHAR(255),
-  time                CHAR(15)      NOT NULL,
+  logTime             CHAR(15)      NOT NULL,
   subject             VARCHAR(255),
   body                CLOB
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (logTime);
 
 
 -- PubSub Tables
@@ -342,7 +342,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 11);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
 
 -- Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_hsqldb.sql

@@ -208,11 +208,11 @@ CREATE TABLE mucConversationLog (
   roomID              BIGINT        NOT NULL,
   sender              VARCHAR(1024) NOT NULL,
   nickname            VARCHAR(255)  NULL,
-  time                CHAR(15)      NOT NULL,
+  logTime             CHAR(15)      NOT NULL,
   subject             VARCHAR(255)  NULL,
   body                LONGVARCHAR   NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (logTime);
 
 // PubSub Tables
 
@@ -329,7 +329,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 11);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
 
 // Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_mysql.sql

@@ -197,10 +197,10 @@ CREATE TABLE mucConversationLog (
   roomID              BIGINT        NOT NULL,
   sender              TEXT          NOT NULL,
   nickname            VARCHAR(255)  NULL,
-  time                CHAR(15)      NOT NULL,
+  logTime             CHAR(15)      NOT NULL,
   subject             VARCHAR(255)  NULL,
   body                TEXT          NULL,
-  INDEX mucLog_time_idx (time)
+  INDEX mucLog_time_idx (logTime)
 );
 
 # PubSub Tables
@@ -318,7 +318,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 11);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
 
 # Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_oracle.sql

@@ -204,11 +204,11 @@ CREATE TABLE mucConversationLog (
   roomID              INT            NOT NULL,
   sender              VARCHAR2(1024) NOT NULL,
   nickname            VARCHAR2(255)  NULL,
-  time                CHAR(15)       NOT NULL,
+  logTime             CHAR(15)       NOT NULL,
   subject             VARCHAR2(255)  NULL,
   body                VARCHAR2(4000) NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (logTime);
 
 -- PubSub Tables
 
@@ -325,7 +325,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 11);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
 
 -- Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_postgresql.sql

@@ -213,11 +213,11 @@ CREATE TABLE mucConversationLog (
   roomID              INTEGER        NOT NULL,
   sender              VARCHAR(1024)  NOT NULL,
   nickname            VARCHAR(255)   NULL,
-  time                CHAR(15)       NOT NULL,
+  logTime             CHAR(15)       NOT NULL,
   subject             VARCHAR(255)   NULL,
   body                TEXT           NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (logTime);
 
 -- PubSub Tables
 
@@ -334,7 +334,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 11);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
 
 -- Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_sqlserver.sql

@@ -211,11 +211,11 @@ CREATE TABLE mucConversationLog (
   roomID              INT            NOT NULL,
   sender              NVARCHAR(1024) NOT NULL,
   nickname            NVARCHAR(255)  NULL,
-  time                CHAR(15)       NOT NULL,
+  logTime             CHAR(15)       NOT NULL,
   subject             NVARCHAR(255)  NULL,
   body                NTEXT          NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (logTime);
 
 /* PubSub Tables */
 
@@ -332,7 +332,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 11);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
 
 /* Entry for admin user */
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_sybase.sql

@@ -211,11 +211,11 @@ CREATE TABLE mucConversationLog (
   roomID              INT            NOT NULL,
   sender              TEXT           NOT NULL,
   nickname            NVARCHAR(255)  NULL,
-  time                CHAR(15)       NOT NULL,
+  logTime             CHAR(15)       NOT NULL,
   subject             NVARCHAR(255)  NULL,
   body                TEXT           NULL
 );
-CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
+CREATE INDEX mucLog_time_idx ON mucConversationLog (logTime);
 
 /* PubSub Tables */
 
@@ -332,7 +332,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 11);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
 
 /* Entry for admin user */
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/upgrade/12/openfire_db2.sql

+-- $Revision:  $
+-- $Date:  $
+
+CREATE TABLE mucConversationLog2 (
+  roomID              INTEGER       NOT NULL,
+  sender              VARCHAR(2000) NOT NULL,
+  nickname            VARCHAR(255),
+  logTime             CHAR(15)      NOT NULL,
+  subject             VARCHAR(255),
+  body                CLOB
+);
+
+INSERT INTO mucConversationLog2 (roomID, sender, nickname, logTime, subject, body)
+SELECT roomID, sender, nickname, time, subject, body FROM mucConversationLog;
+
+DROP TABLE mucConversationLog;
+RENAME TABLE mucConversationLog2 TO mucConversationLog;
+CREATE INDEX mucLog_logtime_idx ON mucConversationLog (logTime);
+
+UPDATE jiveVersion set version=12 where name = 'openfire';
\ No newline at end of file

src/database/upgrade/12/openfire_hsqldb.sql

+ALTER TABLE mucConversationLog ALTER COLUMN time RENAME TO logTime;
+
+UPDATE jiveVersion set version=12 where name = 'openfire';
\ No newline at end of file

src/database/upgrade/12/openfire_mysql.sql

+# $Revision:  $
+# $Date:  $
+
+ALTER TABLE mucConversationLog CHANGE time logTime CHAR(15) NOT NULL;
+
+UPDATE jiveVersion set version=12 where name = 'openfire';
\ No newline at end of file

src/database/upgrade/12/openfire_oracle.sql

+-- $Revision:  $
+-- $Date:  $
+
+ALTER TABLE mucConversationLog RENAME COLUMN time TO logTime;
+
+UPDATE jiveVersion set version=12 where name = 'openfire';

src/database/upgrade/12/openfire_postgresql.sql

+-- $Revision:  $
+-- $Date:  $
+
+ALTER TABLE mucConversationLog RENAME COLUMN time TO logTime;
+
+UPDATE jiveVersion set version=12 where name = 'openfire';

src/database/upgrade/12/openfire_sqlserver.sql

+/* $Revision:  $  */
+/* $Date:  $      */
+
+sp_rename 'mucConversationLog.time', 'logTime';
+
+UPDATE jiveVersion set version=12 where name = 'openfire';

src/database/upgrade/12/openfire_sybase.sql

+/* $Revision:  $ */
+/* $Date:  $ */
+
+sp_rename 'mucConversationLog.time', 'logTime';
+
+UPDATE jiveVersion set version=12 where name = 'openfire';

src/java/org/jivesoftware/database/SchemaManager.java

@@ -44,7 +44,7 @@ public class SchemaManager {
     /**
      * Current Openfire database schema version.
      */
-    private static final int DATABASE_VERSION = 11;
+    private static final int DATABASE_VERSION = 12;
 
     /**
      * Creates a new Schema manager.

src/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java

@@ -50,8 +50,8 @@ public class MUCPersistenceManager {
     private static final String LOAD_MEMBERS =
         "SELECT jid, nickname FROM mucMember WHERE roomID=?";
     private static final String LOAD_HISTORY =
-        "SELECT sender, nickname, time, subject, body FROM mucConversationLog " +
-        "WHERE time>? AND roomID=? AND (nickname IS NOT NULL OR subject IS NOT NULL) ORDER BY time";
+        "SELECT sender, nickname, logTime, subject, body FROM mucConversationLog " +
+        "WHERE logTime>? AND roomID=? AND (nickname IS NOT NULL OR subject IS NOT NULL) ORDER BY logTime";
     private static final String LOAD_ALL_ROOMS =
         "SELECT roomID, creationDate, modificationDate, name, naturalName, description, " +
         "lockedDate, emptyDate, canChangeSubject, maxUsers, publicRoom, moderated, membersOnly, " +
@@ -63,8 +63,8 @@ public class MUCPersistenceManager {
     private static final String LOAD_ALL_MEMBERS =
         "SELECT roomID,jid, nickname FROM mucMember";
     private static final String LOAD_ALL_HISTORY =
-        "SELECT roomID, sender, nickname, time, subject, body FROM mucConversationLog " +
-        "WHERE time>? AND (nickname IS NOT NULL OR subject IS NOT NULL) ORDER BY time";
+        "SELECT roomID, sender, nickname, logTime, subject, body FROM mucConversationLog " +
+        "WHERE logTime>? AND (nickname IS NOT NULL OR subject IS NOT NULL) ORDER BY logTime";
     private static final String UPDATE_ROOM =
         "UPDATE mucRoom SET modificationDate=?, naturalName=?, description=?, " +
         "canChangeSubject=?, maxUsers=?, publicRoom=?, moderated=?, membersOnly=?, " +
@@ -102,7 +102,7 @@ public class MUCPersistenceManager {
         "DELETE FROM mucAffiliation WHERE roomID=? AND jid=?";
 
     private static final String ADD_CONVERSATION_LOG =
-        "INSERT INTO mucConversationLog (roomID,sender,nickname,time,subject,body) " +
+        "INSERT INTO mucConversationLog (roomID,sender,nickname,logTime,subject,body) " +
         "VALUES (?,?,?,?,?,?)";
 
     /**