Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

Use the combination of batch ID and contact ID as the primary key for

Browse Source 
received and sent batches, since batches sent to or received from
different contacts may contain identical lists of messages and
therefore have identical IDs.
This commit is contained in:
akwizgran
2011-08-01 17:37:48 +01:00
parent 02c4d9197c
commit 8e8c83b83c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/net/sf/briar/db/JdbcDatabase.java
View File

@@ -93,7 +93,7 @@ abstract class JdbcDatabase implements Database<Connection> {
"CREATE TABLE batchesToAck" "CREATE TABLE batchesToAck"
+ " (batchId HASH NOT NULL," + " (batchId HASH NOT NULL,"
+ " contactId INT NOT NULL," + " contactId INT NOT NULL,"
+ " PRIMARY KEY (batchId)," + " PRIMARY KEY (batchId, contactId),"
+ " FOREIGN KEY (contactId) REFERENCES contacts (contactId)" + " FOREIGN KEY (contactId) REFERENCES contacts (contactId)"
+ " ON DELETE CASCADE)"; + " ON DELETE CASCADE)";
@@ -113,7 +113,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " contactId INT NOT NULL," + " contactId INT NOT NULL,"
+ " timestamp TIMESTAMP NOT NULL," + " timestamp TIMESTAMP NOT NULL,"
+ " passover INT NOT NULL," + " passover INT NOT NULL,"
+ " PRIMARY KEY (batchId)," + " PRIMARY KEY (batchId, contactId),"
+ " FOREIGN KEY (contactId) REFERENCES contacts (contactId)" + " FOREIGN KEY (contactId) REFERENCES contacts (contactId)"
+ " ON DELETE CASCADE)"; + " ON DELETE CASCADE)";
@@ -123,9 +123,8 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " contactId INT NOT NULL," + " contactId INT NOT NULL,"
+ " messageId HASH NOT NULL," + " messageId HASH NOT NULL,"
+ " PRIMARY KEY (batchId, messageId)," + " PRIMARY KEY (batchId, messageId),"
+ " FOREIGN KEY (batchId) REFERENCES outstandingBatches (batchId)" + " FOREIGN KEY (batchId, contactId)"
+ " ON DELETE CASCADE," + " REFERENCES outstandingBatches (batchId, contactId)"
+ " FOREIGN KEY (contactId) REFERENCES contacts (contactId)"
+ " ON DELETE CASCADE," + " ON DELETE CASCADE,"
+ " FOREIGN KEY (messageId) REFERENCES messages (messageId)" + " FOREIGN KEY (messageId) REFERENCES messages (messageId)"
+ " ON DELETE CASCADE)"; + " ON DELETE CASCADE)";