From 603f7a34911bb441724313a6eb788472162f908f Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Wed, 28 Jul 2021 02:03:49 +0000 Subject: [PATCH] modify schema for consistent naming. --- ngsplanner_schema.sql | 8 ++++---- ngsplanner_seed.sql | 31 ++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ngsplanner_schema.sql b/ngsplanner_schema.sql index 217edaa..9838b59 100644 --- a/ngsplanner_schema.sql +++ b/ngsplanner_schema.sql @@ -186,7 +186,7 @@ CREATE TABLE "users" ( "email" text UNIQUE, "password_hash" text, "created_on" timestamptz, - "role_id" int, + "roles_id" int, "avatar" text ); @@ -197,7 +197,7 @@ CREATE TABLE "roles" ( CREATE TABLE "builds" ( "id" SERIAL UNIQUE PRIMARY KEY, - "user_id" int, + "users_id" int, "creator" text, "build_name" text, "class1" int, @@ -234,13 +234,13 @@ ALTER TABLE "skill_data" ADD FOREIGN KEY ("skill_id") REFERENCES "skill" ("id"); ALTER TABLE "skill" ADD FOREIGN KEY ("skill_type_id") REFERENCES "skill_type" ("id"); -ALTER TABLE "builds" ADD FOREIGN KEY ("user_id") REFERENCES "users" ("id"); +ALTER TABLE "builds" ADD FOREIGN KEY ("users_id") REFERENCES "users" ("id"); ALTER TABLE "builds" ADD FOREIGN KEY ("class1") REFERENCES "class" ("id"); ALTER TABLE "builds" ADD FOREIGN KEY ("class2") REFERENCES "class" ("id"); -ALTER TABLE "users" ADD FOREIGN KEY ("role_id") REFERENCES "roles" ("id"); +ALTER TABLE "users" ADD FOREIGN KEY ("roles_id") REFERENCES "roles" ("id"); ALTER TABLE "weapon_existence_data" ADD FOREIGN KEY ("weapon_id") REFERENCES "weapon" ("id"); diff --git a/ngsplanner_seed.sql b/ngsplanner_seed.sql index bd1d682..2508b77 100644 --- a/ngsplanner_seed.sql +++ b/ngsplanner_seed.sql @@ -1,6 +1,23 @@ -delete from food_mult; delete from food; delete from armor; delete from augment; -delete from augment_type; delete from skill_data; delete from skill; delete from skill_type; delete from builds; delete from users; delete from roles; -delete from weapon_existence_data; delete from class_weapon_type_data; delete from class_level_data; delete from potential_data; delete from weapon; delete from weapon_type; delete from class; delete from potential; +delete from food_mult; +delete from food; +delete from armor; +delete from augment; +delete from augment_type; +delete from skill_data; +delete from skill; +delete from skill_type; +delete from builds; +delete from users; +delete from roles; +delete from weapon_existence_data; +delete from class_weapon_type_data; +delete from class_level_data; +delete from potential_data; +delete from weapon; +delete from weapon_type; +delete from class; +delete from potential; + insert into food_mult(amount,potency,pp,dmg_res,hp,pp_consumption,pp_recovery,weak_point_dmg,hp_recovery) values(0,1,0,1,1,1,1,1,1); insert into food_mult(amount,potency,pp,dmg_res,hp,pp_consumption,pp_recovery,weak_point_dmg,hp_recovery) @@ -137,14 +154,14 @@ insert into roles(name) insert into roles(name) values('Guest'); -insert into users(username,email,password_hash,created_on,role_id,avatar) +insert into users(username,email,password_hash,created_on,roles_id,avatar) values('sigonasr2','sigonasr2@gmail.com','ABCDEFG','2021-07-13 04:30+00',(select id from roles where name='Administrator'),''); -insert into users(username,email,password_hash,created_on,role_id,avatar) +insert into users(username,email,password_hash,created_on,roles_id,avatar) values('sigonasr3','sigonasr3@gmail.com','ABCDEF','2021-07-14 05:30+00',(select id from roles where name='Editor'),''); -insert into builds(user_id,creator,build_name,class1,class2,created_on,last_modified,likes,data) +insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data) values((select id from users where username='sigonasr2'),'sigonasr2','Test Build',(select id from class where name='Ranger'),(select id from class where name='Force'),'2021-07-13 04:30+00','2021-07-13 04:30+00',5,''); -insert into builds(user_id,creator,build_name,class1,class2,created_on,last_modified,likes,data) +insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data) values((select id from users where username='sigonasr3'),'sigonasr3','Test Build2',(select id from class where name='Techter'),(select id from class where name='Fighter'),'2021-07-13 06:30+00','2021-07-13 07:30+00',27,''); insert into skill_type(name)