Add cd_parent and cd_remote_parent to CaldavTask

pull/848/head^2
Chris Heywood 6 years ago committed by Alex Baker
parent 3f47cf929c
commit 2081264a0a

File diff suppressed because it is too large Load Diff

@ -58,7 +58,7 @@ import org.tasks.notifications.NotificationDao;
CaldavAccount.class, CaldavAccount.class,
GoogleTaskAccount.class GoogleTaskAccount.class
}, },
version = 64) version = 65)
public abstract class Database extends RoomDatabase { public abstract class Database extends RoomDatabase {
public static final String NAME = "database"; public static final String NAME = "database";

@ -43,6 +43,12 @@ public class CaldavTask {
@ColumnInfo(name = "cd_vtodo") @ColumnInfo(name = "cd_vtodo")
private String vtodo; private String vtodo;
@ColumnInfo(name = "cd_parent")
private long parent;
@ColumnInfo(name = "cd_remote_parent")
private String remoteParent;
public CaldavTask() {} public CaldavTask() {}
@Ignore @Ignore
@ -133,6 +139,22 @@ public class CaldavTask {
this.vtodo = vtodo; this.vtodo = vtodo;
} }
public long getParent() {
return parent;
}
public void setParent(long parent) {
this.parent = parent;
}
public String getRemoteParent() {
return remoteParent;
}
public void setRemoteParent(String remoteParent) {
this.remoteParent = remoteParent;
}
@Override @Override
public String toString() { public String toString() {
return "CaldavTask{" return "CaldavTask{"
@ -159,6 +181,12 @@ public class CaldavTask {
+ ", vtodo='" + ", vtodo='"
+ vtodo + vtodo
+ '\'' + '\''
+ ", parent='"
+ parent
+ '\''
+ ", remoteParent='"
+ remoteParent
+ '\''
+ '}'; + '}';
} }
} }

@ -305,6 +305,16 @@ public class Migrations {
} }
}; };
private static final Migration MIGRATION_64_65 =
new Migration(64, 65) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
database.execSQL(
"ALTER TABLE `caldav_tasks` ADD COLUMN `cd_parent` INTEGER NOT NULL DEFAULT 0");
database.execSQL("ALTER TABLE `caldav_tasks` ADD COLUMN `cd_remote_parent` TEXT");
}
};
public static final Migration[] MIGRATIONS = public static final Migration[] MIGRATIONS =
new Migration[] { new Migration[] {
MIGRATION_35_36, MIGRATION_35_36,
@ -326,7 +336,8 @@ public class Migrations {
MIGRATION_60_61, MIGRATION_60_61,
MIGRATION_61_62, MIGRATION_61_62,
MIGRATION_62_63, MIGRATION_62_63,
MIGRATION_63_64 MIGRATION_63_64,
MIGRATION_64_65
}; };
private static Migration NOOP(int from, int to) { private static Migration NOOP(int from, int to) {

Loading…
Cancel
Save