arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-11 08:10:58 +00:00
Code Issues Releases Wiki Activity

Entry and journal: fix uniqueness to be composited, and not just by uid.

Browse Source 
Before this change, uid was unique on its own, this was wrong, because
due to shared journals, we can have the same journal in two accounts,
and we can thus have both journal and entry UIDs more than once.

This fixes the constraint to be unique for journal, uid, and service,
uid combinations.

This is currently disabled for journals because of a bug in requery.
This commit is contained in:
Tom Hacohen 2017-04-13 00:04:35 +01:00
parent a4a32045e8
commit 88ceeaa2a5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/etesync/syncadapter/model/JournalModel.java
View File

@ -15,16 +15,19 @@ import io.requery.ManyToOne;
import io.requery.Persistable;
import io.requery.PostLoad;
import io.requery.ReferentialAction;
import io.requery.Table;
import io.requery.sql.EntityDataStore;
public class JournalModel {
// FIXME: Add unique constraint on the uid + service combination. Can't do it at the moment because requery is broken.
@Entity
@Table(name = "Journal")
public static abstract class Journal {
@Key
@Generated
int id;
@Column(length = 64, unique = true, nullable = false)
@Column(length = 64, nullable = false)
String uid;
@Convert(CollectionInfoConverter.class)
@ -34,6 +37,7 @@ public class JournalModel {
byte[] encryptedKey;
@Index(value = "uid_unique")
long service;
boolean deleted;
@ -102,18 +106,20 @@ public class JournalModel {
}
@Entity
@Table(name = "Entry", uniqueIndexes = "entry_unique_together")
public static abstract class Entry {
@Key
@Generated
int id;
@Column(length = 64, unique = true, nullable = false)
@Index("entry_unique_together")
@Column(length = 64, nullable = false)
String uid;
@Convert(SyncEntryConverter.class)
SyncEntry content;
@Index("journal_index")
@Index("entry_unique_together")
@ForeignKey(update = ReferentialAction.CASCADE)
@ManyToOne
Journal journal;