From 042ac946d726983bf5505bac17b50b4d2c5858d6 Mon Sep 17 00:00:00 2001
From: Nick Griffey <nick.griffey@proton.me>
Date: Sun, 28 Jan 2024 19:16:57 -0600
Subject: [PATCH] move awardsplayers

---
 Makefile                        |  3 ++-
 sql/{2nf => }/awardsplayers.sql |  0
 sql/keys/awardsplayers.sql      | 16 ----------------
 sql/load.sql                    | 13 +++++++++++++
 4 files changed, 15 insertions(+), 17 deletions(-)
 rename sql/{2nf => }/awardsplayers.sql (100%)
 delete mode 100644 sql/keys/awardsplayers.sql

diff --git a/Makefile b/Makefile
index b696a03..5520d7a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ baseball.db: baseball-transformed.db sql/load.sql
 	cat sql/load.sql | sqlite3 baseball.db
 	sqlite3 baseball.db "VACUUM"
 
-baseball-transformed.db: baseball-raw.db sql/awards.sql sql/franchises.sql sql/teamseasons.sql sql/seasons.sql sql/parks.sql sql/collegeplaying.sql sql/schools.sql sql/people.sql sql/salaries.sql sql/batting.sql sql/pitching.sql sql/fielding.sql sql/appearances.sql sql/homegames.sql sql/seriespost.sql sql/fieldingofsplit.sql sql/teams.sql sql/leagues.sql sql/managers.sql sql/awardsmanagers.sql sql/battingpost.sql sql/fieldingpost.sql sql/pitchingpost.sql sql/appearancespost.sql sql/awardsshareplayers.sql sql/yearlyawards.sql sql/halloffame.sql sql/halloffamereqs.sql
+baseball-transformed.db: baseball-raw.db sql/awards.sql sql/franchises.sql sql/teamseasons.sql sql/seasons.sql sql/parks.sql sql/collegeplaying.sql sql/schools.sql sql/people.sql sql/salaries.sql sql/batting.sql sql/pitching.sql sql/fielding.sql sql/appearances.sql sql/homegames.sql sql/seriespost.sql sql/fieldingofsplit.sql sql/teams.sql sql/leagues.sql sql/managers.sql sql/awardsmanagers.sql sql/battingpost.sql sql/fieldingpost.sql sql/pitchingpost.sql sql/appearancespost.sql sql/awardsshareplayers.sql sql/yearlyawards.sql sql/halloffame.sql sql/halloffamereqs.sql sql/awardsplayers.sql
 	rm -f baseball-transformed.db
 	cp baseball-raw.db baseball-transformed.db
 	cat sql/franchises.sql | sqlite3 baseball-transformed.db
@@ -40,6 +40,7 @@ baseball-transformed.db: baseball-raw.db sql/awards.sql sql/franchises.sql sql/t
 	cat sql/yearlyawards.sql | sqlite3 baseball-transformed.db
 	cat sql/halloffame.sql | sqlite3 baseball-transformed.db
 	cat sql/halloffamereqs.sql | sqlite3 baseball-transformed.db
+	cat sql/awardsplayers.sql | sqlite3 baseball-transformed.db
 
 baseball-raw.db:
 	rm -f baseball-raw.db
diff --git a/sql/2nf/awardsplayers.sql b/sql/awardsplayers.sql
similarity index 100%
rename from sql/2nf/awardsplayers.sql
rename to sql/awardsplayers.sql
diff --git a/sql/keys/awardsplayers.sql b/sql/keys/awardsplayers.sql
deleted file mode 100644
index 1275546..0000000
--- a/sql/keys/awardsplayers.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-BEGIN;
-CREATE TABLE IF NOT EXISTS "pk_awardsplayers" (
-	"playerID"	TEXT,
-	"awardID"	TEXT,
-	"yearID"	NUMERIC,
-	"lgID"	TEXT,
-	"tie"	TEXT,
-	"notes"	TEXT,
-	PRIMARY KEY("awardID","yearID","lgID","notes","playerID"),
-	foreign key("playerID") references "people"("playerID")
-);
-
-INSERT INTO "pk_awardsplayers" SELECT DISTINCT * FROM "awardsplayers";
-DROP TABLE "awardsplayers";
-ALTER TABLE "pk_awardsplayers" RENAME TO "awardsplayers";
-COMMIT;
diff --git a/sql/load.sql b/sql/load.sql
index 9213a46..21e0e1e 100644
--- a/sql/load.sql
+++ b/sql/load.sql
@@ -565,4 +565,17 @@ create table if not exists "halloffamereqs" (
 );
 
 insert into halloffamereqs select distinct * from "transformed".halloffamereqs;
+
+CREATE TABLE IF NOT EXISTS "awardsplayers" (
+	"player"	TEXT,
+	"award"	TEXT,
+	"year"	NUMERIC,
+	"league"	TEXT,
+	"notes"	TEXT,
+	PRIMARY KEY("award","year","league","notes","player"),
+	foreign key("player") references "people"("ID"),
+	foreign key("award","year","league") references "yearlyawards"("award","year","league")
+);
+
+insert into awardsplayers select distinct * from "transformed".awardsplayers;
 COMMIT;