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

fix upgrade foreign key error on garbage table

Browse Source 
It was still referencing old_sample_file_dir.
This commit is contained in:
Scott Lamb 2021-10-26 13:28:49 -07:00
parent 24a0b2a9f1
commit 363fc8a267
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/db/upgrade/v6_to_v7.rs
View File

@ -5,6 +5,7 @@
/// Upgrades a version 6 schema to a version 7 schema. /// Upgrades a version 6 schema to a version 7 schema.
use failure::{format_err, Error}; use failure::{format_err, Error};
use fnv::FnvHashMap; use fnv::FnvHashMap;
use log::debug;
use rusqlite::{named_params, params}; use rusqlite::{named_params, params};
use std::{convert::TryFrom, path::PathBuf}; use std::{convert::TryFrom, path::PathBuf};
use url::Url; use url::Url;
@ -338,6 +339,7 @@ fn copy_streams(tx: &rusqlite::Transaction) -> Result<(), Error> {
} }
pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error> { pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error> {
debug!("pre batch");
tx.execute_batch( tx.execute_batch(
r#" r#"
alter table open add boot_uuid check (length(boot_uuid) = 16); alter table open add boot_uuid check (length(boot_uuid) = 16);
@ -428,20 +430,36 @@ pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
drop index user_session_uid; drop index user_session_uid;
create index user_session_uid on user_session (user_id); create index user_session_uid on user_session (user_id);
"#, "#,
)?; )?;
debug!("copying meta");
copy_meta(tx)?; copy_meta(tx)?;
debug!("copying sample_file_dir");
copy_sample_file_dir(tx)?; copy_sample_file_dir(tx)?;
debug!("copying camera");
copy_cameras(tx)?; copy_cameras(tx)?;
debug!("copying signal_type");
copy_signal_types(tx)?; copy_signal_types(tx)?;
debug!("copying signal");
copy_signals(tx)?; copy_signals(tx)?;
debug!("copying stream");
copy_streams(tx)?; copy_streams(tx)?;
debug!("copying user");
copy_users(tx)?; copy_users(tx)?;
debug!("post batch");
tx.execute_batch( tx.execute_batch(
r#" r#"
insert into user_session select * from old_user_session; insert into user_session select * from old_user_session;
alter table garbage rename to old_garbage;
create table garbage (
sample_file_dir_id integer not null references sample_file_dir (id),
composite_id integer not null,
primary key (sample_file_dir_id, composite_id)
) without rowid;
drop index recording_cover; drop index recording_cover;
insert into garbage select * from old_garbage;
drop table old_garbage;
alter table recording rename to old_recording; alter table recording rename to old_recording;
create table recording ( create table recording (
@ -492,15 +510,8 @@ pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
video_index blob not null check (length(video_index) > 0) video_index blob not null check (length(video_index) > 0)
); );
insert into recording_playback select * from old_recording_playback; insert into recording_playback select * from old_recording_playback;
drop table old_signal;
alter table signal_camera rename to old_signal_camera; drop table signal_camera;
create table signal_camera (
signal_id integer references signal (id),
camera_id integer references camera (id),
type integer not null,
primary key (signal_id, camera_id)
) without rowid;
drop table old_signal_camera;
drop table old_recording_playback; drop table old_recording_playback;
drop table old_recording_integrity; drop table old_recording_integrity;
drop table old_recording; drop table old_recording;
@ -508,11 +519,9 @@ pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
drop table old_camera; drop table old_camera;
drop table old_sample_file_dir; drop table old_sample_file_dir;
drop table old_meta; drop table old_meta;
drop table old_signal;
drop table old_user_session; drop table old_user_session;
drop table old_user; drop table old_user;
drop table signal_type_enum; drop table signal_type_enum;
drop table signal_camera;
"#, "#,
)?; )?;
Ok(()) Ok(())