diff --git a/Makefile b/Makefile index 25cd319..805feca 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/franchiseseasons.sql sql/seasons.sql sql/parks.sql sql/collegeplaying.sql sql/schools.sql sql/people.sql +baseball-transformed.db: baseball-raw.db sql/awards.sql sql/franchises.sql sql/franchiseseasons.sql sql/seasons.sql sql/parks.sql sql/collegeplaying.sql sql/schools.sql sql/people.sql sql/salaries.sql rm -f baseball-transformed.db cp baseball-raw.db baseball-transformed.db cat sql/franchises.sql | sqlite3 baseball-transformed.db @@ -19,6 +19,7 @@ baseball-transformed.db: baseball-raw.db sql/awards.sql sql/franchises.sql sql/f cat sql/parks.sql | sqlite3 baseball-transformed.db cat sql/collegeplaying.sql | sqlite3 baseball-transformed.db cat sql/schools.sql | sqlite3 baseball-transformed.db + cat sql/salaries.sql | sqlite3 baseball-transformed.db baseball-raw.db: rm -f baseball-raw.db diff --git a/sql/keys/salaries.sql b/sql/keys/salaries.sql deleted file mode 100644 index 11b195d..0000000 --- a/sql/keys/salaries.sql +++ /dev/null @@ -1,15 +0,0 @@ -BEGIN; -CREATE TABLE IF NOT EXISTS "pk_salaries" ( - "yearID" NUMERIC, - "teamID" TEXT, - "lgID" TEXT, - "playerID" TEXT, - "salary" NUMERIC, - PRIMARY KEY("yearID","playerID","teamID"), - foreign key("playerID") references "people"("playerID") -); - -INSERT INTO "pk_salaries" SELECT DISTINCT * FROM "salaries"; -DROP TABLE "salaries"; -ALTER TABLE "pk_salaries" RENAME TO "salaries"; -COMMIT; diff --git a/sql/load.sql b/sql/load.sql index 26865d2..851fc8c 100644 --- a/sql/load.sql +++ b/sql/load.sql @@ -156,4 +156,16 @@ CREATE TABLE IF NOT EXISTS "schools" ( ); insert into schools select distinct * from "transformed"."schools"; + +CREATE TABLE IF NOT EXISTS "salaries" ( + "year" NUMERIC, + "team" TEXT, + "player" TEXT, + "salary" NUMERIC, + PRIMARY KEY("year","player","team"), + foreign key("player") references "people"("ID"), + foreign key("year") references "seasons"("year") +); + +insert into salaries select distinct * from "transformed"."salaries"; COMMIT; diff --git a/sql/2nf/salaries.sql b/sql/salaries.sql similarity index 100% rename from sql/2nf/salaries.sql rename to sql/salaries.sql