Merge migrations

Author: HalidOdat

crates/database/src/migrations/mod.rs

@@ -1,21 +1,16 @@
 use rusqlite::OptionalExtension;
-use v000_migration::InitialMigration;
-use v001_task::TaskMigration;
 
 use crate::{Database, Result};
 
-mod v000_migration;
-mod v001_task;
+mod v000_initial;
 
-const MIGRATIONS: &[&dyn Migration] = &[&InitialMigration, &TaskMigration];
+const MIGRATIONS: &[&dyn Migration] = &[&v000_initial::InitialMigration];
 
 trait Migration {
     fn sql(&self) -> &str;
 
     fn apply(&self, db: &mut Database) -> Result<()> {
-        let sql = self.sql();
-        let sql = format!("BEGIN;\n\n{sql}\n\nCOMMIT;\n");
-        db.connection.execute_batch(&sql)?;
+        db.connection.execute_batch(self.sql())?;
         Ok(())
     }
 

…tes/database/src/migrations/v001_task.rs …/database/src/migrations/v000_initial.rscrates/database/src/migrations/v001_task.rs renamed to crates/database/src/migrations/v000_initial.rs crates/database/src/migrations/v001_task.rs renamed to crates/database/src/migrations/v000_initial.rs

@@ -1,9 +1,14 @@
 use super::Migration;
 
-/// The ID column of most of tables has to be globally unique,
-/// because the application is intented to be used in a distributed way,
-/// where the clients don't know about each other.
 const SQL: &str = r"
+BEGIN TRANSACTION;
+
+CREATE TABLE migration_table (
+    `id` INTEGER PRIMARY KEY,
+    `sql` TEXT NOT NULL
+) STRICT;
+
+
 CREATE TABLE IF NOT EXISTS task_table (
     `id` BLOB PRIMARY KEY, -- UUID
     `title` TEXT,
@@ -86,11 +91,15 @@ CREATE TABLE IF NOT EXISTS backend_config_table (
 
 CREATE INDEX IF NOT EXISTS task_tag_table_task_id_idx ON task_tag_table (task_id);
 CREATE INDEX IF NOT EXISTS task_tag_table_tag_id_idx ON task_tag_table (tag_id);
+
+ANALYZE;
+
+COMMIT;
 ";
 
-pub(super) struct TaskMigration;
+pub(super) struct InitialMigration;
 
-impl Migration for TaskMigration {
+impl Migration for InitialMigration {
     fn sql(&self) -> &str {
         SQL
     }