From 0537ef7db211ec3c7b693d65e1cd549cb3f5e5ee Mon Sep 17 00:00:00 2001
From: mitteneer <swebbguy@gmail.com>
Date: Mon, 7 Apr 2025 10:44:28 -0400
Subject: [PATCH] she QUERY on my DATA so she's BASEd

---
 config/database.zig                           |  2 +-
 .../2025-02-17_22-38-45_create_ratings.zig    | 21 -------------------
 ...025-02-19_18-03-51_create_albumartists.zig | 20 ------------------
 ...025-02-19_18-04-22_create_songsartists.zig | 20 ------------------
 .../2025-02-19_18-46-48_create_albumsongs.zig | 20 ------------------
 ...-02-21_14-24-31_create_scrobbleartists.zig | 20 ------------------
 ...g => 2025-04-07_14-31-14_create_songs.zig} |  0
 ... => 2025-04-07_14-31-45_create_albums.zig} |  0
 ...2025-04-07_14-34-39_create_albumsongs.zig} |  8 +++----
 ... 2025-04-07_14-35-53_create_scrobbles.zig} |  5 ++---
 ...=> 2025-04-07_14-38-02_create_artists.zig} |  2 +-
 ...-07_14-39-09_create_albumsongsartists.zig} |  7 ++++---
 ...25-04-07_14-40-17_create_artistalbums.zig} |  7 ++++---
 13 files changed, 16 insertions(+), 116 deletions(-)
 delete mode 100644 src/app/database/migrations/2025-02-17_22-38-45_create_ratings.zig
 delete mode 100644 src/app/database/migrations/2025-02-19_18-03-51_create_albumartists.zig
 delete mode 100644 src/app/database/migrations/2025-02-19_18-04-22_create_songsartists.zig
 delete mode 100644 src/app/database/migrations/2025-02-19_18-46-48_create_albumsongs.zig
 delete mode 100644 src/app/database/migrations/2025-02-21_14-24-31_create_scrobbleartists.zig
 rename src/app/database/migrations/{2025-02-17_22-38-47_create_songs.zig => 2025-04-07_14-31-14_create_songs.zig} (100%)
 rename src/app/database/migrations/{2025-02-17_22-38-40_create_albums.zig => 2025-04-07_14-31-45_create_albums.zig} (100%)
 rename src/app/database/migrations/{2025-02-17_22-38-41_create_aliases.zig => 2025-04-07_14-34-39_create_albumsongs.zig} (57%)
 rename src/app/database/migrations/{2025-02-17_22-38-46_create_scrobbles.zig => 2025-04-07_14-35-53_create_scrobbles.zig} (72%)
 rename src/app/database/migrations/{2025-02-17_22-38-42_create_artists.zig => 2025-04-07_14-38-02_create_artists.zig} (85%)
 rename src/app/database/migrations/{2025-02-17_22-38-44_create_mastersongs.zig => 2025-04-07_14-39-09_create_albumsongsartists.zig} (54%)
 rename src/app/database/migrations/{2025-02-17_22-38-43_create_masteralbums.zig => 2025-04-07_14-40-17_create_artistalbums.zig} (56%)

diff --git a/config/database.zig b/config/database.zig
index 361129d..4042ff0 100644
--- a/config/database.zig
+++ b/config/database.zig
@@ -15,7 +15,7 @@ pub const database = .{
         .port = 5432,
         .username = "postgres",
         .password = "postgres",
-        .database = "zuletzt_dev",
+        .database = "zuletzt_rsql",
         .pool_size = 16,
     },
 
diff --git a/src/app/database/migrations/2025-02-17_22-38-45_create_ratings.zig b/src/app/database/migrations/2025-02-17_22-38-45_create_ratings.zig
deleted file mode 100644
index d7ac939..0000000
--- a/src/app/database/migrations/2025-02-17_22-38-45_create_ratings.zig
+++ /dev/null
@@ -1,21 +0,0 @@
-const std = @import("std");
-const jetquery = @import("jetquery");
-const t = jetquery.schema.table;
-
-pub fn up(repo: anytype) !void {
-    try repo.createTable(
-        "ratings",
-        &.{
-            t.primaryKey("id", .{}),
-            t.column("reference_id", .integer, .{}),
-            t.column("score", .float, .{}),
-            t.column("date", .datetime, .{}),
-            t.timestamps(.{}),
-        },
-        .{},
-    );
-}
-
-pub fn down(repo: anytype) !void {
-    try repo.dropTable("ratings", .{});
-}
diff --git a/src/app/database/migrations/2025-02-19_18-03-51_create_albumartists.zig b/src/app/database/migrations/2025-02-19_18-03-51_create_albumartists.zig
deleted file mode 100644
index b0e4f54..0000000
--- a/src/app/database/migrations/2025-02-19_18-03-51_create_albumartists.zig
+++ /dev/null
@@ -1,20 +0,0 @@
-const std = @import("std");
-const jetquery = @import("jetquery");
-const t = jetquery.schema.table;
-
-pub fn up(repo: anytype) !void {
-    try repo.createTable(
-        "Albumartists",
-        &.{
-            t.primaryKey("id", .{}),
-            t.column("album_id", .integer, .{}),
-            t.column("artist_id", .integer, .{}),
-            t.timestamps(.{}),
-        },
-        .{},
-    );
-}
-
-pub fn down(repo: anytype) !void {
-    try repo.dropTable("Albumartists", .{});
-}
diff --git a/src/app/database/migrations/2025-02-19_18-04-22_create_songsartists.zig b/src/app/database/migrations/2025-02-19_18-04-22_create_songsartists.zig
deleted file mode 100644
index a509d7a..0000000
--- a/src/app/database/migrations/2025-02-19_18-04-22_create_songsartists.zig
+++ /dev/null
@@ -1,20 +0,0 @@
-const std = @import("std");
-const jetquery = @import("jetquery");
-const t = jetquery.schema.table;
-
-pub fn up(repo: anytype) !void {
-    try repo.createTable(
-        "Songartists",
-        &.{
-            t.primaryKey("id", .{}),
-            t.column("song_id", .integer, .{}),
-            t.column("artist_id", .integer, .{}),
-            t.timestamps(.{}),
-        },
-        .{},
-    );
-}
-
-pub fn down(repo: anytype) !void {
-    try repo.dropTable("Songartists", .{});
-}
diff --git a/src/app/database/migrations/2025-02-19_18-46-48_create_albumsongs.zig b/src/app/database/migrations/2025-02-19_18-46-48_create_albumsongs.zig
deleted file mode 100644
index 1865c2e..0000000
--- a/src/app/database/migrations/2025-02-19_18-46-48_create_albumsongs.zig
+++ /dev/null
@@ -1,20 +0,0 @@
-const std = @import("std");
-const jetquery = @import("jetquery");
-const t = jetquery.schema.table;
-
-pub fn up(repo: anytype) !void {
-    try repo.createTable(
-        "Albumsongs",
-        &.{
-            t.primaryKey("id", .{}),
-            t.column("album_id", .integer, .{}),
-            t.column("song_id", .integer, .{}),
-            t.timestamps(.{}),
-        },
-        .{},
-    );
-}
-
-pub fn down(repo: anytype) !void {
-    try repo.dropTable("Albumsongs", .{});
-}
diff --git a/src/app/database/migrations/2025-02-21_14-24-31_create_scrobbleartists.zig b/src/app/database/migrations/2025-02-21_14-24-31_create_scrobbleartists.zig
deleted file mode 100644
index 2125a87..0000000
--- a/src/app/database/migrations/2025-02-21_14-24-31_create_scrobbleartists.zig
+++ /dev/null
@@ -1,20 +0,0 @@
-const std = @import("std");
-const jetquery = @import("jetquery");
-const t = jetquery.schema.table;
-
-pub fn up(repo: anytype) !void {
-    try repo.createTable(
-        "Scrobbleartists",
-        &.{
-            t.primaryKey("id", .{}),
-            t.column("scrobble_id", .integer, .{}),
-            t.column("artist_id", .integer, .{}),
-            t.timestamps(.{}),
-        },
-        .{},
-    );
-}
-
-pub fn down(repo: anytype) !void {
-    try repo.dropTable("Scrobbleartists", .{});
-}
diff --git a/src/app/database/migrations/2025-02-17_22-38-47_create_songs.zig b/src/app/database/migrations/2025-04-07_14-31-14_create_songs.zig
similarity index 100%
rename from src/app/database/migrations/2025-02-17_22-38-47_create_songs.zig
rename to src/app/database/migrations/2025-04-07_14-31-14_create_songs.zig
diff --git a/src/app/database/migrations/2025-02-17_22-38-40_create_albums.zig b/src/app/database/migrations/2025-04-07_14-31-45_create_albums.zig
similarity index 100%
rename from src/app/database/migrations/2025-02-17_22-38-40_create_albums.zig
rename to src/app/database/migrations/2025-04-07_14-31-45_create_albums.zig
diff --git a/src/app/database/migrations/2025-02-17_22-38-41_create_aliases.zig b/src/app/database/migrations/2025-04-07_14-34-39_create_albumsongs.zig
similarity index 57%
rename from src/app/database/migrations/2025-02-17_22-38-41_create_aliases.zig
rename to src/app/database/migrations/2025-04-07_14-34-39_create_albumsongs.zig
index 11cbb70..4381a5b 100644
--- a/src/app/database/migrations/2025-02-17_22-38-41_create_aliases.zig
+++ b/src/app/database/migrations/2025-04-07_14-34-39_create_albumsongs.zig
@@ -4,11 +4,11 @@ const t = jetquery.schema.table;
 
 pub fn up(repo: anytype) !void {
     try repo.createTable(
-        "aliases",
+        "albumsongs",
         &.{
             t.primaryKey("id", .{}),
-            t.column("reference_id", .integer, .{}),
-            t.column("alias", .string, .{}),
+            t.column("song_id", .integer, .{ .reference = .{ "songs", "id" } }),
+            t.column("album_id", .integer, .{ .reference = .{ "albums", "id" } }),
             t.timestamps(.{}),
         },
         .{},
@@ -16,5 +16,5 @@ pub fn up(repo: anytype) !void {
 }
 
 pub fn down(repo: anytype) !void {
-    try repo.dropTable("aliases", .{});
+    try repo.dropTable("albumsongs", .{});
 }
diff --git a/src/app/database/migrations/2025-02-17_22-38-46_create_scrobbles.zig b/src/app/database/migrations/2025-04-07_14-35-53_create_scrobbles.zig
similarity index 72%
rename from src/app/database/migrations/2025-02-17_22-38-46_create_scrobbles.zig
rename to src/app/database/migrations/2025-04-07_14-35-53_create_scrobbles.zig
index 9764d99..088a43c 100644
--- a/src/app/database/migrations/2025-02-17_22-38-46_create_scrobbles.zig
+++ b/src/app/database/migrations/2025-04-07_14-35-53_create_scrobbles.zig
@@ -7,9 +7,8 @@ pub fn up(repo: anytype) !void {
         "scrobbles",
         &.{
             t.primaryKey("id", .{}),
-            t.column("song_id", .integer, .{}),
-            t.column("album_id", .integer, .{}),
-            t.column("date", .datetime, .{}),
+            t.column("albumsong", .integer, .{ .reference = .{ "albumsongs", "id" } }),
+            t.column("datetime", .datetime, .{}),
             t.timestamps(.{}),
         },
         .{},
diff --git a/src/app/database/migrations/2025-02-17_22-38-42_create_artists.zig b/src/app/database/migrations/2025-04-07_14-38-02_create_artists.zig
similarity index 85%
rename from src/app/database/migrations/2025-02-17_22-38-42_create_artists.zig
rename to src/app/database/migrations/2025-04-07_14-38-02_create_artists.zig
index 2c92de4..ed0d3d4 100644
--- a/src/app/database/migrations/2025-02-17_22-38-42_create_artists.zig
+++ b/src/app/database/migrations/2025-04-07_14-38-02_create_artists.zig
@@ -8,7 +8,7 @@ pub fn up(repo: anytype) !void {
         &.{
             t.primaryKey("id", .{}),
             t.column("name", .string, .{}),
-            t.column("descriptive_string", .string, .{}),
+            t.column("disambiguation", .string, .{ .optional = true }),
             t.timestamps(.{}),
         },
         .{},
diff --git a/src/app/database/migrations/2025-02-17_22-38-44_create_mastersongs.zig b/src/app/database/migrations/2025-04-07_14-39-09_create_albumsongsartists.zig
similarity index 54%
rename from src/app/database/migrations/2025-02-17_22-38-44_create_mastersongs.zig
rename to src/app/database/migrations/2025-04-07_14-39-09_create_albumsongsartists.zig
index 050a467..55c7d84 100644
--- a/src/app/database/migrations/2025-02-17_22-38-44_create_mastersongs.zig
+++ b/src/app/database/migrations/2025-04-07_14-39-09_create_albumsongsartists.zig
@@ -4,10 +4,11 @@ const t = jetquery.schema.table;
 
 pub fn up(repo: anytype) !void {
     try repo.createTable(
-        "mastersongs",
+        "albumsongsartists",
         &.{
             t.primaryKey("id", .{}),
-            t.column("name", .string, .{}),
+            t.column("albumsong_id", .integer, .{ .reference = .{ "albumsongs", "id" } }),
+            t.column("artist_id", .integer, .{ .reference = .{ "artists", "id" } }),
             t.timestamps(.{}),
         },
         .{},
@@ -15,5 +16,5 @@ pub fn up(repo: anytype) !void {
 }
 
 pub fn down(repo: anytype) !void {
-    try repo.dropTable("mastersongs", .{});
+    try repo.dropTable("albumsongsartists", .{});
 }
diff --git a/src/app/database/migrations/2025-02-17_22-38-43_create_masteralbums.zig b/src/app/database/migrations/2025-04-07_14-40-17_create_artistalbums.zig
similarity index 56%
rename from src/app/database/migrations/2025-02-17_22-38-43_create_masteralbums.zig
rename to src/app/database/migrations/2025-04-07_14-40-17_create_artistalbums.zig
index 69e82de..76bac1e 100644
--- a/src/app/database/migrations/2025-02-17_22-38-43_create_masteralbums.zig
+++ b/src/app/database/migrations/2025-04-07_14-40-17_create_artistalbums.zig
@@ -4,10 +4,11 @@ const t = jetquery.schema.table;
 
 pub fn up(repo: anytype) !void {
     try repo.createTable(
-        "masteralbums",
+        "artistalbums",
         &.{
             t.primaryKey("id", .{}),
-            t.column("name", .string, .{}),
+            t.column("album_id", .integer, .{ .reference = .{ "albums", "id" } }),
+            t.column("artist_id", .integer, .{ .reference = .{ "artists", "id" } }),
             t.timestamps(.{}),
         },
         .{},
@@ -15,5 +16,5 @@ pub fn up(repo: anytype) !void {
 }
 
 pub fn down(repo: anytype) !void {
-    try repo.dropTable("masteralbums", .{});
+    try repo.dropTable("artistalbums", .{});
 }