johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-27 04:07:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

database: Allow tracks without medium

Browse source
This commit is contained in:
Elias Projahn 2023-02-11 11:13:13 +01:00
parent 7eb85f094f
commit a3f585aadf
4 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/database/src/medium.rs
View file

@ -93,7 +93,7 @@ struct MediumRow {
#[table_name = "tracks"]
struct TrackRow {
pub id: String,
pub medium: String,
pub medium: Option<String>,
pub index: i32,
pub recording: String,
pub work_parts: String,
@ -150,7 +150,7 @@ impl Database {
let track_row = TrackRow {
id: generate_id(),
medium: medium_id.to_owned(),
medium: Some(medium_id.to_owned()),
index: index as i32,
recording: track.recording.id.clone(),
work_parts,
@ -208,7 +208,7 @@ impl Database {
let mut mediums: Vec<Medium> = Vec::new();
let rows = mediums::table
.inner_join(tracks::table.on(tracks::medium.eq(mediums::id)))
.inner_join(tracks::table.on(tracks::medium.eq(mediums::id.nullable())))
.inner_join(recordings::table.on(recordings::id.eq(tracks::recording)))
.inner_join(performances::table.on(performances::recording.eq(recordings::id)))
.inner_join(persons::table.on(persons::id.nullable().eq(performances::person)))
@ -230,7 +230,7 @@ impl Database {
let mut mediums: Vec<Medium> = Vec::new();
let rows = mediums::table
.inner_join(tracks::table.on(tracks::medium.eq(tracks::id)))
.inner_join(tracks::table.on(tracks::medium.eq(tracks::id.nullable())))
.inner_join(recordings::table.on(recordings::id.eq(tracks::recording)))
.inner_join(performances::table.on(performances::recording.eq(recordings::id)))
.inner_join(ensembles::table.on(ensembles::id.nullable().eq(performances::ensemble)))

2
crates/database/src/schema.rs
View file

@ -69,7 +69,7 @@ diesel::table! {
diesel::table! {
tracks (id) {
id -> Text,
medium -> Text,
medium -> Nullable<Text>,
index -> Integer,
recording -> Text,
work_parts -> Text,