From 34db0fc9fdca452d7cf14ba8fb3fe1aff291489c Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 26 Mar 2013 17:09:15 -0700 Subject: [PATCH] Added database columns for keeping track of history offsets --- api/src/com/todoroo/astrid/data/TagData.java | 5 +++++ api/src/com/todoroo/astrid/data/Task.java | 5 +++++ astrid/src/com/todoroo/astrid/dao/Database.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java index 8002f79cc..240d41db0 100644 --- a/api/src/com/todoroo/astrid/data/TagData.java +++ b/api/src/com/todoroo/astrid/data/TagData.java @@ -142,6 +142,10 @@ public final class TagData extends RemoteModel { public static final LongProperty HISTORY_FETCH_DATE = new LongProperty( TABLE, "historyFetch"); + /** History has more*/ + public static final IntegerProperty HISTORY_HAS_MORE = new IntegerProperty( + TABLE, "historyHasMore"); + /** List of all properties for this model */ public static final Property[] PROPERTIES = generateProperties(TagData.class); @@ -175,6 +179,7 @@ public final class TagData extends RemoteModel { defaultValues.put(COMPLETION_DATE.name, 0); defaultValues.put(DELETION_DATE.name, 0); defaultValues.put(HISTORY_FETCH_DATE.name, 0); + defaultValues.put(HISTORY_HAS_MORE.name, 0); defaultValues.put(THUMB.name, ""); defaultValues.put(LAST_ACTIVITY_DATE.name, 0); diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/com/todoroo/astrid/data/Task.java index 0c767c9d8..f1fb5cd38 100644 --- a/api/src/com/todoroo/astrid/data/Task.java +++ b/api/src/com/todoroo/astrid/data/Task.java @@ -191,6 +191,10 @@ public final class Task extends RemoteModel { public static final LongProperty HISTORY_FETCH_DATE = new LongProperty( TABLE, "historyFetch"); + /** History has more*/ + public static final IntegerProperty HISTORY_HAS_MORE = new IntegerProperty( + TABLE, "historyHasMore"); + /** List of all properties for this model */ public static final Property[] PROPERTIES = generateProperties(Task.class); @@ -312,6 +316,7 @@ public final class Task extends RemoteModel { defaultValues.put(IS_READONLY.name, 0); defaultValues.put(CLASSIFICATION.name, ""); defaultValues.put(HISTORY_FETCH_DATE.name, 0); + defaultValues.put(HISTORY_HAS_MORE.name, 0); defaultValues.put(LAST_SYNC.name, 0); defaultValues.put(UUID.name, NO_UUID); diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java index 2cfd55c85..51de328f3 100644 --- a/astrid/src/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/com/todoroo/astrid/dao/Database.java @@ -350,6 +350,7 @@ public class Database extends AbstractDatabase { } case 28: case 29: + case 30: tryExecSQL("DROP TABLE " + History.TABLE.name); tryExecSQL(createTableSql(visitor, TaskOutstanding.TABLE.name, TaskOutstanding.PROPERTIES)); tryExecSQL(createTableSql(visitor, TagOutstanding.TABLE.name, TagOutstanding.PROPERTIES)); @@ -367,10 +368,12 @@ public class Database extends AbstractDatabase { tryExecSQL(addColumnSql(Task.TABLE, Task.IS_READONLY, visitor, "0")); tryExecSQL(addColumnSql(Task.TABLE, Task.CLASSIFICATION, visitor, null)); tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_FETCH_DATE, visitor, null)); + tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_HAS_MORE, visitor, null)); tryExecSQL(addColumnSql(Task.TABLE, Task.ATTACHMENTS_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(Task.TABLE, Task.USER_ACTIVITIES_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_FETCH_DATE, visitor, null)); + tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_HAS_MORE, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.TASKS_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.METADATA_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.USER_ACTIVITIES_PUSHED_AT, visitor, null));