feat(sql): junction tables & better sql.

IDK I did a lot... meh

migrations/U5__users.sql → migrations/U10__users.sql

@@ -1,4 +1,3 @@
 CREATE TABLE IF NOT EXISTS users (username TEXT PRIMARY KEY
-,   permissions TEXT NOT NULL DEFAULT ''
 ,   hash TEXT NOT NULL
 )

migrations/U11__user_permissions.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS user_permissions (id TEXT NOT NULL
+,   username TEXT NOT NULL
+,   PRIMARY KEY (id, username)
+,   FOREIGN KEY (id) REFERENCES permissions(id) ON DELETE CASCADE ON UPDATE CASCADE
+,   FOREIGN KEY (username) REFERENCES users(username) ON DELETE CASCADE ON UPDATE CASCADE
+);
+

migrations/U15__tokens.sql

@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS tokens (id TEXT PRIMARY KEY
+,   username TEXT NOT NULL
+,   FOREIGN KEY (username) REFERENCES users(username) ON DELETE CASCADE ON UPDATE CASCADE
+)

migrations/U1__pragma.sql

@@ -0,0 +1 @@
+PRAGMA foreign_keys = ON

migrations/U21__invite_permissions.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS invite_permissions (id TEXT NOT NULL
+,   code TEXT NOT NULL
+,   PRIMARY KEY (id, code)
+,   FOREIGN KEY (id) REFERENCES permissions(id) ON DELETE CASCADE ON UPDATE CASCADE
+,   FOREIGN KEY (code) REFERENCES invites(code) ON DELETE CASCADE ON UPDATE CASCADE
+);
+

migrations/U31__artist_genres.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS artist_genres (artist_id TEXT NOT NULL
+,   genre_id TEXT NOT NULL
+,   PRIMARY KEY (artist_id, genre_id)
+,   FOREIGN KEY (artist_id) REFERENCES artists(id) ON DELETE CASCADE ON UPDATE CASCADE
+,   FOREIGN KEY (genre_id) REFERENCES genres(id) ON DELETE CASCADE ON UPDATE CASCADE
+);

migrations/U36__artist_albums.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS artist_albums (album_id TEXT NOT NULL
+,   artist_id TEXT NOT NULL
+,   PRIMARY KEY (album_id, artist_id)
+,   FOREIGN KEY (album_id) REFERENCES albums(id) ON DELETE CASCADE ON UPDATE CASCADE
+,   FOREIGN KEY (artist_id) REFERENCES artists(id) ON DELETE CASCADE ON UPDATE CASCADE
+);

migrations/U37__album_genres.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS album_genres (album_id TEXT NOT NULL
+,   genre_id TEXT NOT NULL
+,   PRIMARY KEY (album_id, genre_id)
+,   FOREIGN KEY (album_id) REFERENCES albums(id) ON DELETE CASCADE ON UPDATE CASCADE
+,   FOREIGN KEY (genre_id) REFERENCES genres(id) ON DELETE CASCADE ON UPDATE CASCADE
+);

migrations/U41__album_tracks.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS album_tracks (track_id TEXT NOT NULL
+,   album_id TEXT NOT NULL
+,   PRIMARY KEY (track_id, album_id)
+,   FOREIGN KEY (track_id) REFERENCES tracks(id) ON DELETE CASCADE ON UPDATE CASCADE
+,   FOREIGN KEY (album_id) REFERENCES albums(id) ON DELETE CASCADE ON UPDATE CASCADE
+);

migrations/U42__track_genres.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS track_genres (track_id TEXT NOT NULL
+,   genre_id TEXT NOT NULL
+,   PRIMARY KEY (track_id, genre_id)
+,   FOREIGN KEY (track_id) REFERENCES tracks(id) ON DELETE CASCADE ON UPDATE CASCADE
+,   FOREIGN KEY (genre_id) REFERENCES genres(id) ON DELETE CASCADE ON UPDATE CASCADE
+);

migrations/U1__add_permissions.rs → migrations/U6__add_permissions.rs

@@ -3,10 +3,10 @@ use strum::IntoEnumIterator;
 
 pub fn migration() -> String {
     format!(
-        "INSERT OR IGNORE INTO permissions (id) VALUES {};",
+        "INSERT OR IGNORE INTO permissions (id) VALUES ('{}');",
         Permission::iter()
-            .map(|p| format!("\n ('{}')", p.to_string()))
+            .map(|p| p.to_string())
             .collect::<Vec<String>>()
-            .join(",")
+            .join("'), ('")
     )
 }

src/api/music/albums.rs

@@ -160,6 +160,8 @@ async fn album_delete(db: Database, user: User, id: String) -> Result<()> {
     }
 
     db.run(move |conn| -> Result<()> {
+        conn.execute_batch("PRAGMA foreign_keys = ON;")?;
+
         let tx = conn.transaction()?;
 
         if let Err(QueryReturnedNoRows) =
@@ -169,9 +171,6 @@ async fn album_delete(db: Database, user: User, id: String) -> Result<()> {
         }
 
         tx.execute("DELETE FROM albums WHERE id = ?", params![id])?;
-        tx.execute("DELETE FROM album_genres WHERE album_id = ?", params![id])?;
-        tx.execute("DELETE FROM artist_albums WHERE album_id = ?", params![id])?;
-        tx.execute("DELETE FROM album_tracks WHERE album_id = ?", params![id])?;
 
         tx.commit()?;
 

src/api/music/artists.rs

@@ -3,19 +3,13 @@ use rocket_sync_db_pools::rusqlite::{params, Error::QueryReturnedNoRows, ToSql};
 
 use crate::{
     api::errors::ApiError,
-    database::{
-        artists::Artist, database::Database, permissions::Permission, users::User,
-    },
+    database::{artists::Artist, database::Database, permissions::Permission, users::User},
 };
 
 type Result<T> = std::result::Result<T, ApiError>;
 
 #[post("/artist", data = "<artist>")]
-async fn artist_write(
-    db: Database,
-    user: User,
-    artist: Json<Artist>,
-) -> Result<Json<Artist>> {
+async fn artist_write(db: Database, user: User, artist: Json<Artist>) -> Result<Json<Artist>> {
     if !user.permissions.contains(&Permission::ArtistWrite) {
         Err(Status::Forbidden)?
     }
@@ -122,6 +116,8 @@ async fn artist_delete(db: Database, user: User, id: String) -> Result<()> {
     }
 
     db.run(move |conn| -> Result<()> {
+        conn.execute_batch("PRAGMA foreign_keys = ON;")?;
+
         let tx = conn.transaction()?;
 
         if let Err(QueryReturnedNoRows) = tx.query_row(
@@ -133,8 +129,6 @@ async fn artist_delete(db: Database, user: User, id: String) -> Result<()> {
         }
 
         tx.execute("DELETE FROM artists WHERE id = ?", params![id])?;
-        tx.execute("DELETE FROM artist_genres WHERE artist_id = ?", params![id])?;
-        tx.execute("DELETE FROM artist_albums WHERE artist_id = ?", params![id])?;
 
         tx.commit()?;
 

src/api/music/genres.rs

@@ -62,6 +62,8 @@ async fn genre_delete(db: Database, user: User, genre: String) -> Result<()> {
     }
 
     db.run(move |conn| -> Result<()> {
+        conn.execute_batch("PRAGMA foreign_keys = ON;")?;
+
         let tx = conn.transaction()?;
 
         if let Err(QueryReturnedNoRows) =
@@ -73,18 +75,6 @@ async fn genre_delete(db: Database, user: User, genre: String) -> Result<()> {
         }
 
         tx.execute("DELETE FROM genres WHERE id = ?", params![genre])?;
-        tx.execute(
-            "DELETE FROM artist_genres WHERE genre_id = ?",
-            params![genre],
-        )?;
-        tx.execute(
-            "DELETE FROM album_genres WHERE genre_id = ?",
-            params![genre],
-        )?;
-        tx.execute(
-            "DELETE FROM track_genres WHERE genre_id = ?",
-            params![genre],
-        )?;
 
         tx.commit()?;
 

src/api/music/tracks.rs

@@ -170,6 +170,8 @@ async fn track_delete(db: Database, user: User, id: String) -> Result<()> {
     }
 
     db.run(move |conn| -> Result<()> {
+        conn.execute_batch("PRAGMA foreign_keys = ON;")?;
+
         let tx = conn.transaction()?;
 
         if let Err(QueryReturnedNoRows) =
@@ -179,8 +181,6 @@ async fn track_delete(db: Database, user: User, id: String) -> Result<()> {
         }
 
         tx.execute("DELETE FROM tracks WHERE id = ?", params![id])?;
-        tx.execute("DELETE FROM track_genres WHERE track_id = ?", params![id])?;
-        tx.execute("DELETE FROM album_tracks WHERE track_id = ?", params![id])?;
 
         tx.commit()?;