fixup/postgres/sqlite: removed migration

Author: matthiasdebernardini

.github/workflows/rust.yml

@@ -183,7 +183,7 @@ jobs:
       - name: Install cargo-audit
         run: cargo install cargo-audit
       - name: Run cargo-audit
-        run: cargo audit
+        run: cargo audit --ignore RUSTSEC-2023-0071
 
   unused-dependencies:
     name: Check Unused Dependencies

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 bdk_wallet = { version = "1.2.0", features = ["test-utils"] }
 serde = { version = "1.0.208", features = ["derive"] }
 serde_json = "1.0.125"
-sqlx = { version = "0.8.5", default-features = false, features = ["runtime-tokio", "tls-rustls-ring", "derive", "postgres", "sqlite", "json", "chrono", "uuid", "migrate"] }
+sqlx = { version = "0.8.5", default-features = false, features = ["runtime-tokio", "tls-rustls-ring", "derive", "postgres", "sqlite", "json", "chrono", "uuid"] }
 thiserror = "2"
 tokio = { version = "1.44.0", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.40"

examples/bdk_sqlx_postgres.rs

@@ -59,7 +59,6 @@ async fn main() -> anyhow::Result<()> {
 
     let mut store = PgStoreBuilder::new(wallet_name.clone())
         .network(NETWORK)
-        .migrate(true)
         .build_with_url(&url)
         .await?;
 
@@ -90,7 +89,6 @@ async fn main() -> anyhow::Result<()> {
 
     let mut store = PgStoreBuilder::new(wallet_name.clone())
         .network(NETWORK)
-        .migrate(true)
         .build_with_url(&url)
         .await?;
 

src/lib.rs

@@ -33,9 +33,6 @@ pub enum BdkSqlxError {
     /// sqlx error
     #[error("sqlx error: {0}")]
     Sqlx(#[from] sqlx::Error),
-    /// migrate error
-    #[error("migrate error: {0}")]
-    Migrate(#[from] sqlx::migrate::MigrateError),
     /// Network confusion
     #[error("Invalid Network expected {expected}, got {got}")]
     InvalidNetwork {
@@ -88,7 +85,6 @@ pub struct Store<DB: Database> {
 pub struct PgStoreBuilder {
     wallet_name: String,
     pool: Option<PgPool>,
-    migrate: bool,
     network: Option<Network>,
 }
 

src/postgres.rs

@@ -120,7 +120,6 @@ impl PgStoreBuilder {
         Self {
             wallet_name,
             pool: None,
-            migrate: false,
             network: None,
         }
     }
@@ -134,15 +133,6 @@ impl PgStoreBuilder {
         self
     }
 
-    /// Sets whether database migrations should be run during [`Store`] initialization.
-    ///
-    /// When set to true, the necessary database schema and tables will be created
-    /// if they don't already exist.
-    pub fn migrate(mut self, migrate: bool) -> Self {
-        self.migrate = migrate;
-        self
-    }
-
     /// Sets the Bitcoin network for the [`Store`].
     ///
     /// The network is required to build a valid [`Store`]. If not provided,
@@ -174,9 +164,6 @@ impl PgStoreBuilder {
                     pool,
                     wallet_name: self.wallet_name,
                 };
-                if self.migrate {
-                    store.migrate().await?;
-                }
 
                 initialize_network(network)?;
 
@@ -203,106 +190,6 @@ impl PgStoreBuilder {
     }
 }
 
-impl Store<Postgres> {
-    /// Runs Migrations for a [`Store`] without an existing pg connection.
-    #[tracing::instrument(skip_all)]
-    pub async fn migrate(&self) -> Result<()> {
-        trace!("migrating bdk sqlx");
-
-        let mut tx = self.pool.begin().await?;
-
-        // Create the schema first
-        let create_schema_query = r#"CREATE SCHEMA IF NOT EXISTS "bdk_wallet""#;
-        sqlx::query(create_schema_query)
-            .execute(&mut *tx)
-            .await
-            .map_err(|e| BdkSqlxError::QueryError {
-                table: "create schema bdk_wallet".to_string(),
-                source: e,
-            })?;
-
-        // Create the tables one by one
-        let queries = [
-            r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."version" (
-            version INTEGER PRIMARY KEY
-        )"#,
-            r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."network" (
-            wallet_name TEXT PRIMARY KEY,
-            name TEXT NOT NULL
-        )"#,
-            r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."keychain" (
-            wallet_name TEXT NOT NULL,
-            keychainkind TEXT NOT NULL,
-            descriptor TEXT NOT NULL,
-            descriptor_id BYTEA NOT NULL,
-            last_revealed INTEGER DEFAULT 0,
-            PRIMARY KEY (wallet_name, keychainkind)
-        )"#,
-            r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."block" (
-            wallet_name TEXT NOT NULL,
-            hash TEXT NOT NULL,
-            height INTEGER NOT NULL,
-            PRIMARY KEY (wallet_name, hash)
-        )"#,
-            r#"CREATE INDEX IF NOT EXISTS idx_block_height ON "bdk_wallet"."block" (height)"#,
-            r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."tx" (
-            wallet_name TEXT NOT NULL,
-            txid TEXT NOT NULL,
-            whole_tx BYTEA,
-            last_seen BIGINT,
-            PRIMARY KEY (wallet_name, txid)
-        )"#,
-            r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."txout" (
-            wallet_name TEXT NOT NULL,
-            txid TEXT NOT NULL,
-            vout INTEGER NOT NULL,
-            value BIGINT NOT NULL,
-            script BYTEA NOT NULL,
-            PRIMARY KEY (wallet_name, txid, vout)
-        )"#,
-            r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."anchor_tx" (
-            wallet_name TEXT NOT NULL,
-            block_hash TEXT NOT NULL,
-            anchor JSONB NOT NULL,
-            txid TEXT NOT NULL,
-            PRIMARY KEY (wallet_name, block_hash, txid),
-            FOREIGN KEY (wallet_name, block_hash) REFERENCES "bdk_wallet"."block"(wallet_name, hash),
-            FOREIGN KEY (wallet_name, txid) REFERENCES "bdk_wallet"."tx"(wallet_name, txid)
-        )"#,
-            r#"CREATE INDEX IF NOT EXISTS idx_anchor_tx_txid ON "bdk_wallet"."anchor_tx" (txid)"#,
-        ];
-
-        // Execute each query separately
-        for query in &queries {
-            sqlx::query(query)
-                .execute(&mut *tx)
-                .await
-                .map_err(|e| BdkSqlxError::QueryError {
-                    table: query.to_string(),
-                    source: e,
-                })?;
-        }
-
-        // At the end of migration, insert the current version
-        // After all tables are created but before tx.commit()
-        sqlx::query(
-            r#"INSERT INTO "bdk_wallet"."version" (version) 
-               VALUES ($1) 
-               ON CONFLICT (version) DO NOTHING"#,
-        )
-        .bind(1) // Current schema version
-        .execute(&mut *tx)
-        .await
-        .map_err(|e| BdkSqlxError::QueryError {
-            table: "insert version".to_string(),
-            source: e,
-        })?;
-
-        tx.commit().await?;
-
-        Ok(())
-    }
-}
 
 impl Store<Postgres> {
     #[tracing::instrument(skip_all)]

src/sqlite.rs

@@ -22,7 +22,6 @@ use bdk_wallet::{AsyncWalletPersister, ChangeSet, KeychainKind};
 use serde_json::json;
 use sqlx::sqlite::SqliteRow;
 use sqlx::sqlite::{SqlitePool, SqlitePoolOptions};
-use sqlx::sqlx_macros::migrate;
 use sqlx::{sqlite::Sqlite, FromRow, Pool, Row, Transaction};
 use tracing::info;
 
@@ -57,13 +56,8 @@ impl Store<Sqlite> {
     pub async fn new(
         pool: Pool<Sqlite>,
         wallet_name: String,
-        migrate: bool,
     ) -> Result<Self, BdkSqlxError> {
         info!("new sqlite store");
-        if migrate {
-            info!("migrate");
-            migrate!("./migrations/sqlite").run(&pool).await?;
-        }
         Ok(Self { pool, wallet_name })
     }
 
@@ -77,7 +71,6 @@ impl Store<Sqlite> {
     pub async fn new_with_url(
         url: Option<String>,
         wallet_name: String,
-        migrate: bool,
     ) -> Result<Store<Sqlite>, BdkSqlxError> {
         info!("new store with url");
         let pool = if let Some(url) = url {
@@ -92,7 +85,7 @@ impl Store<Sqlite> {
                 .connect(":memory:")
                 .await?
         };
-        Self::new(pool, wallet_name, migrate).await
+        Self::new(pool, wallet_name).await
     }
 }
 

src/test.rs

@@ -177,14 +177,13 @@ async fn create_test_stores(wallet_name: String) -> anyhow::Result<Vec<TestStore
     pool.drop_all().await?;
     let postgres_store = PgStoreBuilder::new(wallet_name.clone())
         .network(NETWORK)
-        .migrate(true)
         .build_with_url(&url)
         .await?;
     stores.push(TestStore::Postgres(postgres_store));
 
     // Setup sqlite in-memory database
     let pool = SqlitePool::connect(":memory:").await?;
-    let sqlite_store = Store::<Sqlite>::new(pool.clone(), wallet_name.clone(), true).await?;
+    let sqlite_store = Store::<Sqlite>::new(pool.clone(), wallet_name.clone()).await?;
     stores.push(TestStore::Sqlite(sqlite_store));
 
     Ok(stores)