Simplify migrations

app/src/main/java/org/tasks/db/Migrations.java

@@ -179,31 +179,16 @@ public class Migrations {
         }
       };
 
-  private static final Migration MIGRATION_54_55 =
+  private static final Migration MIGRATION_54_58 =
-      new Migration(54, 55) {
+      new Migration(54, 58) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
           database.execSQL(
-              "CREATE TABLE IF NOT EXISTS `caldav_account` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT, `name` TEXT, `color` INTEGER NOT NULL, `ctag` TEXT, `url` TEXT, `username` TEXT)");
+              "CREATE TABLE IF NOT EXISTS `caldav_account` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT, `name` TEXT, `url` TEXT, `username` TEXT, `password` TEXT)");
           database.execSQL(
-              "CREATE TABLE IF NOT EXISTS `caldav_tasks` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `account` TEXT, `remote_id` TEXT, `etag` TEXT, `last_sync` INTEGER NOT NULL, `deleted` INTEGER NOT NULL)");
+              "CREATE TABLE IF NOT EXISTS `caldav_calendar` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `account` TEXT, `uuid` TEXT, `name` TEXT, `color` INTEGER NOT NULL, `ctag` TEXT, `url` TEXT)");
-        }
+          database.execSQL(
-      };
+              "CREATE TABLE IF NOT EXISTS `caldav_tasks` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `calendar` TEXT, `object` TEXT, `remote_id` TEXT, `etag` TEXT, `last_sync` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `vtodo` TEXT)");
-
-  private static final Migration MIGRATION_55_56 =
-      new Migration(55, 56) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-          database.execSQL("ALTER TABLE `caldav_tasks` ADD COLUMN `object` TEXT");
-          database.execSQL("ALTER TABLE `caldav_tasks` ADD COLUMN `vtodo` TEXT");
-        }
-      };
-
-  private static final Migration MIGRATION_56_57 =
-      new Migration(56, 57) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-          database.execSQL("ALTER TABLE `caldav_account` ADD COLUMN `password` TEXT");
         }
       };
 
@@ -222,9 +207,7 @@ public class Migrations {
         MIGRATION_51_52,
         MIGRATION_52_53,
         MIGRATION_53_54,
-        MIGRATION_54_55,
+        MIGRATION_54_58
-        MIGRATION_55_56,
-        MIGRATION_56_57
       };
 
   private static Migration NOOP(int from, int to) {