From 8ba209aea4840370eee4ff0c25c1b957ce2e44c3 Mon Sep 17 00:00:00 2001
From: Nick Griffey <nick.griffey@proton.me>
Date: Sat, 27 Jan 2024 12:35:39 -0600
Subject: [PATCH] Fix allstar tables

---
 Makefile                 |  3 +--
 sql/2nf/allstarfull.sql  | 34 ++++++++++++++++++++++++++++++++++
 sql/2nf/allstargames.sql | 14 --------------
 sql/3nf/allstarfull.sql  |  3 ---
 4 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 sql/2nf/allstarfull.sql
 delete mode 100644 sql/2nf/allstargames.sql
 delete mode 100644 sql/3nf/allstarfull.sql

diff --git a/Makefile b/Makefile
index 665bb3e..2b9d652 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ bbdb = baseballdatabank-2023.1
 
 db: baseball.db
 
-baseball.db: sql/corrections/*.sql sql/keys/*.sql sql/1nf/*.sql sql/2nf/*.sql sql/3nf/*.sql
+baseball.db: sql/corrections/*.sql sql/keys/*.sql sql/1nf/*.sql sql/2nf/*.sql
 	rm -f baseball.db
 	sqlite3 baseball.db ".import --csv $(bbdb)/core/AllstarFull.csv allstarfull"
 	sqlite3 baseball.db ".import --csv $(bbdb)/core/Appearances.csv appearances"
@@ -37,5 +37,4 @@ baseball.db: sql/corrections/*.sql sql/keys/*.sql sql/1nf/*.sql sql/2nf/*.sql sq
 	cat sql/keys/*.sql | sqlite3 baseball.db
 	cat sql/1nf/*.sql | sqlite3 baseball.db
 	cat sql/2nf/*.sql | sqlite3 baseball.db
-	cat sql/3nf/*.sql | sqlite3 baseball.db
 	sqlite3 baseball.db "VACUUM"
diff --git a/sql/2nf/allstarfull.sql b/sql/2nf/allstarfull.sql
new file mode 100644
index 0000000..0b3c13f
--- /dev/null
+++ b/sql/2nf/allstarfull.sql
@@ -0,0 +1,34 @@
+begin;
+create table if not exists allstargames (
+	"yearID"	numeric,
+	"gameNum"	numeric,
+	"gameID"	text,
+	primary key("yearID","gameNum")
+);
+
+insert into allstargames
+select distinct yearid, gamenum, gameid
+from allstarfull;
+
+alter table allstarfull drop column "gameID";
+
+alter table allstarfull rename to "allstarstartingpos";
+
+create table if not exists "allstars" (
+	"playerID"	text,
+	"yearID"	text,
+	"gameNum"	text,
+	"teamID"	text,
+	"GP"	numeric,
+	primary key("playerID","yearID","gameNum"),
+	foreign key("playerID") references "people"("playerID")
+);
+
+insert into allstars
+select distinct playerid, yearid, gamenum, teamid, gp
+from allstarstartingpos;
+
+alter table allstarstartingpos drop column "teamid";
+alter table allstarstartingpos drop column "lgID";
+alter table allstarstartingpos drop column "gp";
+commit;
diff --git a/sql/2nf/allstargames.sql b/sql/2nf/allstargames.sql
deleted file mode 100644
index cad87ee..0000000
--- a/sql/2nf/allstargames.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-begin;
-create table if not exists allstargames (
-	"yearID"	numeric,
-	"gameNum"	numeric,
-	"gameID"	text,
-	primary key("yearID","gameNum")
-);
-
-insert into allstargames
-select distinct yearid, gamenum, gameid
-from allstarfull;
-
-alter table allstarfull drop column "gameID";
-commit;
diff --git a/sql/3nf/allstarfull.sql b/sql/3nf/allstarfull.sql
deleted file mode 100644
index f7e5061..0000000
--- a/sql/3nf/allstarfull.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-begin;
-alter table allstarfull drop column "lgID";
-commit;