Revert "Add missing messageattempt index" (#2196)

Reverts #2187

Author: svix-james

server/Cargo.lock

@@ -37,7 +37,6 @@ enum_dispatch = "0.3.8"
 figment = { version = "0.10", features = ["toml", "env", "test"] }
 form_urlencoded = "1.1.0"
 futures = "0.3"
-futures-util = "0.3.30"
 hex = "0.4.3"
 hickory-resolver = "0.25.2"
 hmac-sha256 = "1"

server/svix-server/Cargo.toml

@@ -3,13 +3,12 @@
 
 use sea_orm::{
     ColumnTrait, DatabaseConnection, DbBackend, DeleteResult, EntityTrait, QueryFilter,
-    SqlxPostgresConnector, sqlx::migrate::Migrate,
+    SqlxPostgresConnector,
 };
 use sqlx::postgres::PgPoolOptions;
 
-use crate::{cfg::Configuration, core::types::OrganizationId, db::migrator::TxnOptionalMigrator};
+use crate::{cfg::Configuration, core::types::OrganizationId};
 
-pub mod migrator;
 pub mod models;
 use models::{application, endpoint, eventtype, message, messageattempt};
 
@@ -33,30 +32,7 @@ pub async fn init_db(cfg: &Configuration) -> DatabaseConnection {
 
 pub async fn run_migrations(cfg: &Configuration) {
     let db = connect(&cfg.db_dsn, cfg.db_pool_max_size).await;
-    let (version, description) = MIGRATIONS
-        .migrations
-        .last()
-        .map(|m| (m.version, &m.description))
-        .expect("Where the migrations at?");
-
-    tracing::info!("Migrations: starting (most recent in source: {version} '{description}')");
-
-    // sqlx::Pool only runs migrations in a transaction, which prevents us from doing things
-    // like CREATE INDEX CONCURRENTLY . . .
-    // So we wrap our pools in a special migrator type that avoids transactions.
-    let mut migrator = TxnOptionalMigrator::new("db", &db).await;
-
-    tracing::info!("Migrating database");
-    migrator
-        .ensure_migrations_table()
-        .await
-        .expect("Failed to ensure db");
-    MIGRATIONS
-        .run_direct(&mut migrator)
-        .await
-        .expect("Unable to migrate db");
-
-    tracing::info!("Migrations: Done!");
+    MIGRATIONS.run(&db).await.unwrap();
 }
 
 /// Wipe an organization from existence in a way that ensures the operation can be tried again on