MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-12-04 23:02:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

stop using cargo pkg version

Browse Source 
One fewer thing to manage at release time.
This commit is contained in:
Scott Lamb
2023-10-17 09:36:32 -07:00
parent ef62ebfc6c
commit a76483a912
11 changed files with 90 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
server/db/upgrade/mod.rs
View File

@@ -6,7 +6,7 @@
//!
//! See `guide/schema.md` for more information.
use crate::db::{self, EXPECTED_VERSION};
use crate::db::{self, EXPECTED_SCHEMA_VERSION};
use base::{bail, Error};
use nix::NixPath;
use rusqlite::params;
@@ -23,8 +23,6 @@ mod v4_to_v5;
mod v5_to_v6;
mod v6_to_v7;
const UPGRADE_NOTES: &str = concat!("upgraded using moonfire-db ", env!("CARGO_PKG_VERSION"));
#[derive(Debug)]
pub struct Args<'a> {
pub sample_file_dir: Option<&'a std::path::Path>,
@@ -46,7 +44,12 @@ fn set_journal_mode(conn: &rusqlite::Connection, requested: &str) -> Result<(),
Ok(())
}
fn upgrade(args: &Args, target_ver: i32, conn: &mut rusqlite::Connection) -> Result<(), Error> {
fn upgrade(
args: &Args,
target_schema_ver: i32,
sw_version: &str,
conn: &mut rusqlite::Connection,
) -> Result<(), Error> {
let upgraders = [
v0_to_v1::run,
v1_to_v2::run,
@@ -58,25 +61,31 @@ fn upgrade(args: &Args, target_ver: i32, conn: &mut rusqlite::Connection) -> Res
];
{
assert_eq!(upgraders.len(), db::EXPECTED_VERSION as usize);
let old_ver = conn.query_row("select max(id) from version", params![], |row| row.get(0))?;
if old_ver > EXPECTED_VERSION {
assert_eq!(upgraders.len(), db::EXPECTED_SCHEMA_VERSION as usize);
let old_schema_ver =
conn.query_row("select max(id) from version", params![], |row| row.get(0))?;
if old_schema_ver > EXPECTED_SCHEMA_VERSION {
bail!(
FailedPrecondition,
msg("database is at version {old_ver}, later than expected {EXPECTED_VERSION}"),
msg("database is at version {old_schema_ver}, \
later than expected {EXPECTED_SCHEMA_VERSION}"),
);
} else if old_ver < 0 {
} else if old_schema_ver < 0 {
bail!(
FailedPrecondition,
msg("Database is at negative version {old_ver}!")
msg("Database is at negative version {old_schema_ver}!")
);
}
info!(
"Upgrading database from version {} to version {}...",
old_ver, target_ver
"Upgrading database from schema version {} to schema version {}...",
old_schema_ver, target_schema_ver
);
for ver in old_ver..target_ver {
info!("...from version {} to version {}", ver, ver + 1);
for ver in old_schema_ver..target_schema_ver {
info!(
"...from schema version {} to schema version {}",
ver,
ver + 1
);
let tx = conn.transaction()?;
upgraders[ver as usize](args, &tx)?;
tx.execute(
@@ -84,7 +93,7 @@ fn upgrade(args: &Args, target_ver: i32, conn: &mut rusqlite::Connection) -> Res
insert into version (id, unix_time, notes)
values (?, cast(strftime('%s', 'now') as int32), ?)
"#,
params![ver + 1, UPGRADE_NOTES],
params![ver + 1, format!("Upgraded using moonfire-nvr {sw_version}")],
)?;
tx.commit()?;
}
@@ -93,11 +102,11 @@ fn upgrade(args: &Args, target_ver: i32, conn: &mut rusqlite::Connection) -> Res
Ok(())
}
pub fn run(args: &Args, conn: &mut rusqlite::Connection) -> Result<(), Error> {
pub fn run(args: &Args, sw_version: &str, conn: &mut rusqlite::Connection) -> Result<(), Error> {
db::check_sqlite_version()?;
db::set_integrity_pragmas(conn)?;
set_journal_mode(conn, args.preset_journal)?;
upgrade(args, EXPECTED_VERSION, conn)?;
upgrade(args, EXPECTED_SCHEMA_VERSION, sw_version, conn)?;
// As in "moonfire-nvr init": try for page_size=16384 and wal for the reasons explained there.
//
@@ -291,9 +300,10 @@ mod tests {
no_vacuum: false,
},
*ver,
"test",
&mut upgraded,
)
.map_err(|e| err!(e, msg("upgrade to version {ver} failed")))?;
.map_err(|e| err!(e, msg("upgrade to schema version {ver} failed")))?;
if let Some(f) = fresh_sql {
compare(&upgraded, *ver, f)?;
}