Hanabi/Py-Hanabi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move initialization of tables into own schema file

Browse source
This commit is contained in:
Maximilian Keßler 2023-05-12 19:05:05 +02:00
parent 406348f07e
commit 550df72a28
Signed by: max
GPG key ID: BCC5A619923C0BA5
2 changed files with 120 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
database.py
View file

@ -62,88 +62,6 @@ def create_seeds_table():
conn.commit() conn.commit()
def create_static_tables():
cur.execute("DROP TABLE IF EXISTS suits CASCADE;")
cur.execute(
"CREATE TABLE suits ("
"id SERIAL PRIMARY KEY,"
"name TEXT NOT NULL UNIQUE,"
"display_name TEXT NOT NULL,"
"abbreviation CHAR(1) NOT NULL,"
"ranks SMALLINT NOT NULL," # 0: not touched by rank, 1: touched by actual rank, 2: touched by all ranks
"colors SMALLINT NOT NULL," # 0: not touched by color, 1: touched by native colors, 2: touched by all colors
"prism BOOLEAN NOT NULL,"
"dark BOOLEAN NOT NULL,"
"reversed BOOLEAN NOT NULL"
")"
)
cur.execute(
"CREATE INDEX suits_name_idx ON suits (name)"
)
cur.execute("DROP TABLE IF EXISTS colors CASCADE;")
cur.execute(
"CREATE TABLE colors ("
"id SERIAL PRIMARY KEY,"
"name TEXT NOT NULL UNIQUE"
")"
)
cur.execute(
"CREATE INDEX colors_name_idx ON colors (name)"
)
cur.execute("DROP TABLE IF EXISTS suit_colors CASCADE;")
cur.execute(
"CREATE TABLE suit_colors ("
"suit_id INTEGER NOT NULL,"
"color_id INTEGER NOT NULL,"
"FOREIGN KEY (suit_id) REFERENCES suits (id) ON DELETE CASCADE,"
"FOREIGN KEY (color_id) REFERENCES colors (id) ON DELETE CASCADE,"
"UNIQUE (suit_id, color_id)"
")"
)
cur.execute("DROP TABLE IF EXISTS variants CASCADE")
cur.execute(
"CREATE TABLE variants ("
"id SERIAL PRIMARY KEY,"
"name TEXT NOT NULL UNIQUE,"
"clue_starved BOOLEAN NOT NULL,"
"throw_it_in_a_hole BOOLEAN NOT NULL,"
"alternating_clues BOOLEAN NOT NULL,"
"synesthesia BOOLEAN NOT NULL,"
"chimneys BOOLEAN NOT NULL,"
"funnels BOOLEAN NOT NULL,"
"no_colors BOOLEAN NOT NULL,"
"no_ranks BOOLEAN NOT NULL,"
"odds_and_evens BOOLEAN NOT NULL,"
"up_or_down BOOLEAN NOT NULL,"
"critical_fours BOOLEAN NOT NULL,"
"num_suits SMALLINT NOT NULL,"
"special_rank_ranks SMALLINT NOT NULL,"
"special_rank_colors SMALLINT NOT NULL,"
"special_rank SMALLINT"
")"
)
cur.execute(
"CREATE INDEX variants_name_idx ON variants (name)"
)
cur.execute("DROP TABLE IF EXISTS variant_suits CASCADE")
cur.execute(
"CREATE TABLE variant_suits ("
"variant_id INT NOT NULL,"
"suit_id INT NOT NULL,"
"index SMALLINT NOT NULL,"
"FOREIGN KEY (variant_id) REFERENCES variants (id) ON DELETE CASCADE,"
"FOREIGN KEY (suit_id) REFERENCES suits (id) ON DELETE CASCADE,"
"UNIQUE (variant_id, suit_id),"
"UNIQUE (variant_id, index)"
")"
)
conn.commit()
def init_static_tables(): def init_static_tables():
# check if table already exists # check if table already exists
@ -160,7 +78,9 @@ def init_static_tables():
if not create: if not create:
return return
create_static_tables() # init tables in database
with open("variant_suits_schema.sql", "r") as f:
cur.execute(f.read())
with open("suits.json", "r") as f: with open("suits.json", "r") as f:
suits: Dict = json.loads(f.read()) suits: Dict = json.loads(f.read())
@ -180,17 +100,17 @@ def init_static_tables():
abbreviation = suit.get('abbreviation', name[0].upper()) abbreviation = suit.get('abbreviation', name[0].upper())
all_colors = suit.get('allClueColors', False) all_colors = suit.get('allClueColors', False)
no_colors = suit.get('noClueColors', False) no_color_clues = suit.get('noClueColors', False)
all_ranks = suit.get('allClueRanks', False) all_ranks = suit.get('allClueRanks', False)
no_ranks = suit.get('noClueRanks', False) no_rank_clues = suit.get('noClueRanks', False)
prism = suit.get('prism', False) prism = suit.get('prism', False)
dark = suit.get('oneOfEach', False) dark = suit.get('oneOfEach', False)
assert([all_colors, no_colors, prism].count(True) <= 1) assert([all_colors, no_color_clues, prism].count(True) <= 1)
assert(not all([no_ranks, all_ranks])) assert(not all([no_rank_clues, all_ranks]))
colors = 2 if all_colors else (0 if no_colors else 1) colors = 2 if all_colors else (0 if no_color_clues else 1)
ranks = 2 if all_ranks else (0 if no_ranks else 1) ranks = 2 if all_ranks else (0 if no_rank_clues else 1)
clue_colors = suit.get('clueColors', [name] if (colors == 1 and not prism) else []) clue_colors = suit.get('clueColors', [name] if (colors == 1 and not prism) else [])
@ -239,8 +159,8 @@ def init_static_tables():
synesthesia = var.get('synesthesia', False) synesthesia = var.get('synesthesia', False)
chimneys = var.get('chimneys', False) chimneys = var.get('chimneys', False)
funnels = var.get('funnels', False) funnels = var.get('funnels', False)
no_colors = var.get('colorCluesTouchNothing', False) no_color_clues = var.get('colorCluesTouchNothing', False)
no_ranks = var.get('rankCluesTouchNothing', False) no_rank_clues = var.get('rankCluesTouchNothing', False)
odds_and_evens = var.get('oddsAndEvens', False) odds_and_evens = var.get('oddsAndEvens', False)
up_or_down = var.get('upOrDown', False) up_or_down = var.get('upOrDown', False)
critical_fours = var.get('criticalFours', False) critical_fours = var.get('criticalFours', False)
@ -261,16 +181,16 @@ def init_static_tables():
cur.execute( cur.execute(
"INSERT INTO variants (" "INSERT INTO variants ("
"id, name, clue_starved, throw_it_in_a_hole, alternating_clues, synesthesia, chimneys, funnels, no_colors," "id, name, clue_starved, throw_it_in_a_hole, alternating_clues, synesthesia, chimneys, funnels,"
"no_ranks, odds_and_evens, up_or_down, critical_fours, num_suits, special_rank_ranks, special_rank_colors," "no_color_clues, no_rank_clues, odds_and_evens, up_or_down, critical_fours, num_suits, special_rank,"
"special_rank" "special_rank_ranks, special_rank_colors"
")" ")"
"VALUES" "VALUES"
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
( (
var_id, name, clue_starved, throw_it_in_a_hole, alternating_clues, synesthesia, chimneys, funnels, var_id, name, clue_starved, throw_it_in_a_hole, alternating_clues, synesthesia, chimneys, funnels,
no_colors, no_ranks, odds_and_evens, up_or_down, critical_fours, num_suits, special_rank_ranks, no_color_clues, no_rank_clues, odds_and_evens, up_or_down, critical_fours, num_suits, special_rank,
special_rank_colors, special_rank special_rank_ranks, special_rank_colors
) )
) )

104
variant_suits_schema.sql Normal file
View file

@ -0,0 +1,104 @@
/* Database schema for the tables storing information on available hanab.live variants, suits and colors */
/* Available suits. The associated id is arbitrary upon initial generation, but fixed for referentiability */
DROP TABLE IF EXISTS suits CASCADE;
CREATE TABLE suits (
id SERIAL PRIMARY KEY,
name TEXT NOT NULL UNIQUE,
display_name TEXT NOT NULL,
abbreviation CHAR(1) NOT NULL,
/**
This is encodes how cards of this suit behave under rank clues, we use:
0: not touched by rank,
1: touched by actual rank of the cards
2: touched by all ranks
*/
ranks SMALLINT NOT NULL DEFAULT 1,
/**
This encodes how cards of this suit behave under color clues, we use:
0: not touched by color,
1: touched by native colors,
2: touched by all colors
*/
colors SMALLINT NOT NULL DEFAULT 1,
prism BOOLEAN NOT NULL DEFAULT FALSE,
dark BOOLEAN NOT NULL DEFAULT FALSE,
reversed BOOLEAN NOT NULL DEFAULT FALSE
);
CREATE INDEX suits_name_idx ON suits (name);
/* Available color clues. The indexing is arbitrary upon initial generation, but fixed for referentiability */
DROP TABLE IF EXISTS colors CASCADE;
CREATE TABLE colors (
id SERIAL PRIMARY KEY,
name TEXT NOT NULL UNIQUE
);
CREATE INDEX colors_name_idx ON colors (name);
/**
Stores the native colors of each suit,
i.e. the colors that are available in a variant where that suit is available
and which touch the suit
*/
DROP TABLE IF EXISTS suit_colors CASCADE;
CREATE TABLE suit_colors (
suit_id INTEGER NOT NULL,
color_id INTEGER NOT NULL,
FOREIGN KEY (suit_id) REFERENCES suits (id) ON DELETE CASCADE,
FOREIGN KEY (color_id) REFERENCES colors (id) ON DELETE CASCADE,
UNIQUE (suit_id, color_id)
);
/* Available variants. ids correspond to the same ids used by hanab.live */
DROP TABLE IF EXISTS variants CASCADE;
CREATE TABLE variants (
id SERIAL PRIMARY KEY,
name TEXT NOT NULL UNIQUE,
clue_starved BOOLEAN NOT NULL DEFAULT FALSE,
throw_it_in_a_hole BOOLEAN NOT NULL DEFAULT FALSE,
alternating_clues BOOLEAN NOT NULL DEFAULT FALSE,
synesthesia BOOLEAN NOT NULL DEFAULT FALSE,
chimneys BOOLEAN NOT NULL DEFAULT FALSE,
funnels BOOLEAN NOT NULL DEFAULT FALSE,
no_color_clues BOOLEAN NOT NULL DEFAULT FALSE,
no_rank_clues BOOLEAN NOT NULL DEFAULT FALSE,
odds_and_evens BOOLEAN NOT NULL DEFAULT FALSE,
up_or_down BOOLEAN NOT NULL DEFAULT FALSE,
critical_fours BOOLEAN NOT NULL DEFAULT FALSE,
num_suits SMALLINT NOT NULL,
/**
A variant can have a special rank.
Cards of that rank will behave different from their actual suit,
the next two parameters control this behaviour
If set to null, there is no such special rank
*/
special_rank SMALLINT DEFAULT NULL,
/**
Encodes how cards of the special rank (if present) are touched by ranks,
in the same manner how we encoded in @table suits
*/
special_rank_ranks SMALLINT NOT NULL DEFAULT 1,
/**
Encodes how cards of the special rank (if present) are touched by colorss,
in the same manner how we encoded in @table suits
*/
special_rank_colors SMALLINT NOT NULL DEFAULT 1
);
CREATE INDEX variants_name_idx ON variants (name);
/**
Stores the suits appearing in each variant
Among all entries with fixed (variant_id, suit_id),
the stored index controls the order of the suits appearing in this variant (in ascending order)
*/
DROP TABLE IF EXISTS variant_suits CASCADE;
CREATE TABLE variant_suits (
variant_id INT NOT NULL,
suit_id INT NOT NULL,
index SMALLINT NOT NULL,
FOREIGN KEY (variant_id) REFERENCES variants (id) ON DELETE CASCADE,
FOREIGN KEY (suit_id) REFERENCES suits (id) ON DELETE CASCADE,
UNIQUE (variant_id, suit_id),
UNIQUE (variant_id, index)
);
CREATE INDEX variant_suits_index ON variant_suits (variant_id, index);