correlr/tutor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split oracle and scryfall card data

Browse source
This commit is contained in:
Correl Roush 2023-01-10 10:29:52 -05:00
parent c6af9b1cba
commit 0adb79c871
2 changed files with 63 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
postgres/000-schema.sql
View file

@ -29,7 +29,22 @@ DO $$ BEGIN
END IF; END IF;
END $$; END $$;
CREATE TABLE IF NOT EXISTS "cards" ( CREATE TABLE IF NOT EXISTS "oracle" (
"oracle_id" UUID PRIMARY KEY,
"name" TEXT NOT NULL,
"color_identity" TEXT NOT NULL,
"cmc" DECIMAL(10, 2) NOT NULL,
"type_line" TEXT NOT NULL,
"edhrec_rank" INTEGER,
"oracle_text" TEXT,
"games" TEXT[] DEFAULT ARRAY[]::TEXT[],
"legalities" TEXT[] DEFAULT ARRAY[]::TEXT[]
);
CREATE INDEX IF NOT EXISTS "oracle_name" ON "oracle" ("name" COLLATE en_us_ci);
CREATE INDEX IF NOT EXISTS "oracle_color_identity" ON "oracle" ("color_identity");
CREATE TABLE IF NOT EXISTS "scryfall" (
"scryfall_id" UUID PRIMARY KEY, "scryfall_id" UUID PRIMARY KEY,
"oracle_id" UUID, "oracle_id" UUID,
"name" TEXT NOT NULL, "name" TEXT NOT NULL,
@ -50,10 +65,10 @@ CREATE TABLE IF NOT EXISTS "cards" (
FOREIGN KEY ("set_code") REFERENCES "sets" ("set_code") FOREIGN KEY ("set_code") REFERENCES "sets" ("set_code")
); );
CREATE INDEX IF NOT EXISTS "cards_name" ON "cards" ("name" COLLATE en_us_ci); CREATE INDEX IF NOT EXISTS "cards_name" ON "scryfall" ("name" COLLATE en_us_ci);
CREATE INDEX IF NOT EXISTS "cards_rarity" ON "cards" ("rarity"); CREATE INDEX IF NOT EXISTS "cards_rarity" ON "scryfall" ("rarity");
CREATE INDEX IF NOT EXISTS "cards_color_identity" ON "cards" ("color_identity"); CREATE INDEX IF NOT EXISTS "cards_color_identity" ON "scryfall" ("color_identity");
CREATE INDEX IF NOT EXISTS "cards_oracle_id" ON "cards" ("oracle_id"); CREATE INDEX IF NOT EXISTS "cards_oracle_id" ON "scryfall" ("oracle_id");
CREATE TABLE IF NOT EXISTS "copies" ( CREATE TABLE IF NOT EXISTS "copies" (
"id" BIGSERIAL PRIMARY KEY, "id" BIGSERIAL PRIMARY KEY,
@ -62,7 +77,7 @@ CREATE TABLE IF NOT EXISTS "copies" (
"isFoil" BOOLEAN NOT NULL DEFAULT FALSE, "isFoil" BOOLEAN NOT NULL DEFAULT FALSE,
"language" TEXT, "language" TEXT,
"condition" TEXT, "condition" TEXT,
FOREIGN KEY ("scryfall_id") REFERENCES "cards" ("scryfall_id") ON DELETE CASCADE FOREIGN KEY ("scryfall_id") REFERENCES "scryfall" ("scryfall_id") ON DELETE CASCADE
); );
CREATE TABLE IF NOT EXISTS "card_prices" ( CREATE TABLE IF NOT EXISTS "card_prices" (
@ -74,7 +89,7 @@ CREATE TABLE IF NOT EXISTS "card_prices" (
"eur_foil" DECIMAL(10, 2), "eur_foil" DECIMAL(10, 2),
"tix" DECIMAL(10, 2), "tix" DECIMAL(10, 2),
PRIMARY KEY ("scryfall_id", "date"), PRIMARY KEY ("scryfall_id", "date"),
FOREIGN KEY ("scryfall_id") REFERENCES "cards" ("scryfall_id") ON DELETE CASCADE FOREIGN KEY ("scryfall_id") REFERENCES "scryfall" ("scryfall_id") ON DELETE CASCADE
); );
CREATE TABLE IF NOT EXISTS "legalities" ( CREATE TABLE IF NOT EXISTS "legalities" (
@ -82,7 +97,7 @@ CREATE TABLE IF NOT EXISTS "legalities" (
"format" TEXT NOT NULL, "format" TEXT NOT NULL,
"legality" TEXT NOT NULL, "legality" TEXT NOT NULL,
PRIMARY KEY ("scryfall_id", "format"), PRIMARY KEY ("scryfall_id", "format"),
FOREIGN KEY ("scryfall_id") REFERENCES "cards" ("scryfall_id") FOREIGN KEY ("scryfall_id") REFERENCES "scryfall" ("scryfall_id")
); );
DO $$ BEGIN DO $$ BEGIN
@ -99,7 +114,7 @@ CREATE TABLE IF NOT EXISTS "games" (
"scryfall_id" UUID NOT NULL, "scryfall_id" UUID NOT NULL,
"game" game NOT NULL, "game" game NOT NULL,
PRIMARY KEY ("scryfall_id", "game"), PRIMARY KEY ("scryfall_id", "game"),
FOREIGN KEY ("scryfall_id") REFERENCES "cards" ("scryfall_id") FOREIGN KEY ("scryfall_id") REFERENCES "scryfall" ("scryfall_id")
); );
CREATE TABLE IF NOT EXISTS "decks" ( CREATE TABLE IF NOT EXISTS "decks" (
@ -120,10 +135,26 @@ CREATE TABLE IF NOT EXISTS "deck_cards" (
"scryfall_id" UUID NOT NULL, "scryfall_id" UUID NOT NULL,
PRIMARY KEY ("deck_id", "scryfall_id"), PRIMARY KEY ("deck_id", "scryfall_id"),
FOREIGN KEY ("deck_id") REFERENCES "decks" ("deck_id") ON DELETE CASCADE, FOREIGN KEY ("deck_id") REFERENCES "decks" ("deck_id") ON DELETE CASCADE,
FOREIGN KEY ("scryfall_id") REFERENCES "cards" ("scryfall_id") FOREIGN KEY ("scryfall_id") REFERENCES "scryfall" ("scryfall_id")
); );
CREATE TABLE IF NOT EXISTS "vars" ( CREATE TABLE IF NOT EXISTS "vars" (
"key" TEXT PRIMARY KEY, "key" TEXT PRIMARY KEY,
"value" TEXT "value" TEXT
); );
CREATE OR REPLACE VIEW "cards" AS
SELECT "oracle"."oracle_id"
, "oracle"."name"
, "oracle"."color_identity"
, "oracle"."cmc"
, "oracle"."type_line"
, "oracle"."edhrec_rank"
, "oracle"."oracle_text"
, "scryfall"."scryfall_id"
, "scryfall"."set_code"
, "scryfall"."collector_number"
, "scryfall"."rarity"
, "scryfall"."release_date"
FROM "oracle"
JOIN "scryfall" USING ("oracle_id");

23
tutor/cli.py
View file

@ -252,7 +252,28 @@ def update_scryfall(ctx, filename):
print("Updating card data & indexes") print("Updating card data & indexes")
await cursor.execute( await cursor.execute(
""" """
INSERT INTO "cards" SELECT * FROM "tmp_cards" INSERT INTO "oracle"
SELECT DISTINCT "oracle_id"
, "name"
, "color_identity"
, "cmc"
, "type_line"
, "edhrec_rank"
, "oracle_text"
FROM "tmp_cards"
ON CONFLICT (oracle_id) DO UPDATE
SET "oracle_id" = "excluded"."oracle_id"
, "name" = "excluded"."name"
, "color_identity" = "excluded"."color_identity"
, "cmc" = "excluded"."cmc"
, "type_line" = "excluded"."type_line"
, "edhrec_rank" = "excluded"."edhrec_rank"
, "oracle_text" = "excluded"."oracle_text"
"""
)
await cursor.execute(
"""
INSERT INTO "scryfall" SELECT * FROM "tmp_cards"
ON CONFLICT (scryfall_id) DO UPDATE ON CONFLICT (scryfall_id) DO UPDATE
SET "oracle_id" = "excluded"."oracle_id" SET "oracle_id" = "excluded"."oracle_id"
, "name" = "excluded"."name" , "name" = "excluded"."name"