Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /eyebrowse/src/java/org/tigris/eyebrowse/, /eyebrowse/src/sql/

eyebrowse
Discussion topic

Back to topic list

CVS update: /eyebrowse/src/java/org/tigris/eyebrowse/, /eyebrowse/src/sql/

Reply

Author aguenther
Full name Andreas Guenther
Date 2002-10-11 18:16:20 PDT
Message User: aguenther
Date: 02/10/11 18:16:20

Modified
 /eyebrowse/src/java/​org/tigris/eyebrowse​/
  EyebrowseDb.java, MySQLEyebrowseDb.java, OracleEyebrowseDb.java
 /eyebrowse/src/sql/
  eyebrowse-create.sql, eyebrowse-oracle-create.sql

Log
 Fixed order of columns in eyebrowse schema to allow proper updates. eb_Message.threadMsgNo is added through 'alter table' to the end of the existing columns but was initially created (when no update was necessary) with 'create table' in between threadId and parentMsgId. Now threadMsgNo is always at appended.

File Changes:

Directory: /eyebrowse/src/java/​org/tigris/eyebrowse​/
====================​====================​============

File [changed]: EyebrowseDb.java
Url: http://eyebrowse.tig​ris.org/source/brows​e/eyebrowse/src/java​/org/tigris/eyebrows​e/EyebrowseDb.java.d​iff?r1=1.79&r2=1​.80
Delta lines: +14 -14
---------------------
--- EyebrowseDb.java 7 Oct 2002 10:41:43 -0000 1.79
+++ EyebrowseDb.java 12 Oct 2002 01:16:19 -0000 1.80
@@ -353,12 +353,12 @@
             fileId = rs.getInt("fileId");
             parentMsgId = rs.getInt("parentMsgId");
             threadId = rs.getInt("threadId");
- threadMsgNo = rs.getInt("threadMsgNo");
             date = rs.getDate("msgDate");
             msgFileOffset = rs.getInt("byteOffset");
             msgFileLen = rs.getInt("byteLength");
             isReply = (rs.getInt("isReply") != 0);
             isDeleted = (rs.getInt("isDeleted") != 0);
+ threadMsgNo = rs.getInt("threadMsgNo");
         }
 
         // Slow version which works regardless of field order
@@ -382,12 +382,12 @@
             fileId = rs.getInt(6);
             parentMsgId = rs.getInt(7);
             threadId = rs.getInt(8);
- threadMsgNo = rs.getInt(9);
- date = rs.getDate(10);
- msgFileOffset = rs.getInt(11);
- msgFileLen = rs.getInt(12);
- isReply = (rs.getInt(13) != 0);
- isDeleted = (rs.getInt(14) != 0);
+ date = rs.getDate(9);
+ msgFileOffset = rs.getInt(10);
+ msgFileLen = rs.getInt(11);
+ isReply = (rs.getInt(12) != 0);
+ isDeleted = (rs.getInt(13) != 0);
+ threadMsgNo = rs.getInt(14);
         }
 
         // Fast version which requires that fields be in the order defined
@@ -401,12 +401,12 @@
             fileId = rs.getInt(6);
             parentMsgId = rs.getInt(7);
             threadId = rs.getInt(8);
- threadMsgNo = rs.getInt(9);
- date = rs.getDate(10);
- msgFileOffset = rs.getInt(11);
- msgFileLen = rs.getInt(12);
- isReply = (rs.getInt(13) != 0);
- isDeleted = (rs.getInt(14) != 0);
+ date = rs.getDate(9);
+ msgFileOffset = rs.getInt(10);
+ msgFileLen = rs.getInt(11);
+ isReply = (rs.getInt(12) != 0);
+ isDeleted = (rs.getInt(13) != 0);
+ threadMsgNo = rs.getInt(14);
 
             senderName = rs.getString(message_fieldCount + 1);
             subject = rs.getString(message_fieldCount + 2);

File [changed]: MySQLEyebrowseDb.java
Url: http://eyebrowse.tig​ris.org/source/brows​e/eyebrowse/src/java​/org/tigris/eyebrows​e/MySQLEyebrowseDb.j​ava.diff?r1=1.1&​r2=1.2
Delta lines: +3 -3
-------------------
--- MySQLEyebrowseDb.java 7 Oct 2002 10:41:43 -0000 1.1
+++ MySQLEyebrowseDb.java 12 Oct 2002 01:16:19 -0000 1.2
@@ -65,9 +65,9 @@
         "eb_Message.listId, eb_Message.msgId, eb_Message.msgNo, "
         + "eb_Message.authorId, "
         + " eb_Message.subjectId, eb_Message.fileId, eb_Message.parentMsgId, "
- + " eb_Message.threadId, threadMsgNo, eb_Message.msgDate, "
- + " eb_Message.byteOffset, "
- + " eb_Message.byteLength, eb_Message.isReply, eb_Message.isDeleted ";
+ + " eb_Message.threadId, eb_Message.msgDate, "
+ + " eb_Message.byteOffset, eb_Message.byteLength, "
+ + " eb_Message.isReply, eb_Message.isDeleted, threadMsgNo ";
 
     protected final static String messageExt_fields =
         message_fields

File [changed]: OracleEyebrowseDb.java
Url: http://eyebrowse.tig​ris.org/source/brows​e/eyebrowse/src/java​/org/tigris/eyebrows​e/OracleEyebrowseDb.​java.diff?r1=1.1​&r2=1.2
Delta lines: +2 -2
-------------------
--- OracleEyebrowseDb.java 7 Oct 2002 10:41:43 -0000 1.1
+++ OracleEyebrowseDb.java 12 Oct 2002 01:16:19 -0000 1.2
@@ -96,9 +96,9 @@
         "msg.listId, msg.msgId, msg.msgNo, "
         + "msg.authorId, "
         + " msg.subjectId, msg.fileId, msg.parentMsgId, "
- + " msg.threadId, msg.threadMsgNo, msg.msgDate, "
+ + " msg.threadId, msg.msgDate, "
         + " msg.byteOffset, "
- + " msg.byteLength, msg.isReply, msg.isDeleted ";
+ + " msg.byteLength, msg.isReply, msg.isDeleted, msg.threadMsgNo ";
     
     protected final static String messageExt_fields =
         message_fields

Directory: /eyebrowse/src/sql/
==============================

File [changed]: eyebrowse-create.sql
Url: http://eyebrowse.tig​ris.org/source/brows​e/eyebrowse/src/sql/​eyebrowse-create.sql​.diff?r1=1.16&r2​=1.17
Delta lines: +1 -2
-------------------
--- eyebrowse-create.sql 1 Aug 2002 02:05:41 -0000 1.16
+++ eyebrowse-create.sql 12 Oct 2002 01:16:20 -0000 1.17
@@ -3,7 +3,6 @@
        listId INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
        listName VARCHAR(80) NOT NULL,
        listDescr VARCHAR(80),
-
        indexed BIT NOT NULL DEFAULT 0,
        indexFile CHAR(255),
        lastMsgIndexed INTEGER NOT NULL DEFAULT 0,
@@ -56,10 +55,10 @@
        byteLength INTEGER NOT NULL,
        msgDate DATE NOT NULL,
        threadId INTEGER NOT NULL DEFAULT 0,
- threadMsgNo INTEGER NOT NULL DEFAULT 0,
        parentMsgId INTEGER NOT NULL DEFAULT 0,
        isReply BIT DEFAULT 0,
        isDeleted BIT NOT NULL DEFAULT 0,
+ threadMsgNo INTEGER NOT NULL DEFAULT 0,
        INDEX msgDate (listId, msgDate, msgNo),
        INDEX msgNo (listId, msgNo),
        INDEX (threadId, msgNo),

File [changed]: eyebrowse-oracle-create.sql
Url: http://eyebrowse.tig​ris.org/source/brows​e/eyebrowse/src/sql/​eyebrowse-oracle-cre​ate.sql.diff?r1=1.2​&r2=1.3
Delta lines: +1 -1
-------------------
--- eyebrowse-oracle-create.sql 8 Oct 2002 18:52:01 -0000 1.2
+++ eyebrowse-oracle-create.sql 12 Oct 2002 01:16:20 -0000 1.3
@@ -212,10 +212,10 @@
     byteLength NUMBER NOT NULL,
     msgDate DATE NOT NULL,
     threadId NUMBER DEFAULT 0 NOT NULL,
- threadMsgNo NUMBER DEFAULT 0 NOT NULL,
     parentMsgId NUMBER DEFAULT 0 NOT NULL,
     isReply NUMBER(1) DEFAULT 0,
     isDeleted NUMBER(1) DEFAULT 0 NOT NULL,
+ threadMsgNo NUMBER DEFAULT 0 NOT NULL,
     constraint PK_EB_MESSAGE primary key (msgId)
 )
 /




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@eyeb​rowse.tigris.org
For additional commands, e-mail: cvs-help at eyebrowse dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /eyebrowse/src/java/org/tigris/eyebrowse/, /eyebrowse/src/sql/ aguenther Andreas Guenther 2002-10-11 18:16:20 PDT
Messages per page: