Skip to content

check database user_version at startup #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rigidity merged 3 commits into from
Jul 5, 2025
Merged

check database user_version at startup #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2ebcb4
check database user_version at startup
dkackman Jul 5, 2025
5c27090
move db version check to before migrations call
dkackman Jul 5, 2025
3c61111
rename to database_version
dkackman Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion crates/sage/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ pub enum Error {
#[error("Missing asset id")]
MissingAssetId,

#[error("Database version too old")]
DatabaseVersionTooOld,

#[error("Timeout")]
Timeout(#[from] Elapsed),
}
Expand All @@ -217,7 +220,7 @@ impl Error {
| KeychainError::Bip39(..)
| KeychainError::Argon2(..) => ErrorKind::Internal,
},
Self::SqlxMigration(..) => ErrorKind::DatabaseMigration,
Self::SqlxMigration(..) | Self::DatabaseVersionTooOld => ErrorKind::DatabaseMigration,
Self::Send(..)
| Self::Io(..)
| Self::Client(..)
Expand Down
13 changes: 13 additions & 0 deletions crates/sage/src/sage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ impl Sage {

let pool = self.connect_to_database(fingerprint).await?;
let db = Database::new(pool);

db.run_rust_migrations(self.network().ticker.clone())
.await?;

Expand Down Expand Up @@ -408,11 +409,23 @@ impl Sage {
)
.await?;

let version = Self::database_version(&pool).await?;

if version < 2 {
return Err(Error::DatabaseVersionTooOld);
}
sqlx::migrate!("../../migrations").run(&pool).await?;

Ok(pool)
}

async fn database_version(pool: &SqlitePool) -> Result<i32> {
let row: (i32,) = sqlx::query_as("PRAGMA user_version")
.fetch_one(pool)
.await?;
Ok(row.0)
}

pub fn wallet_db_path(&self, fingerprint: u32) -> Result<PathBuf> {
let path = self.path.join("wallets").join(fingerprint.to_string());
fs::create_dir_all(&path)?;
Expand Down