From c37e9c8c1e8a249aefe3f229b34d170f282f2db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 25 Feb 2021 21:22:01 +0100 Subject: [PATCH 001/113] sync: update sprites https://github.com/PokeAPI/sprites/pull/44 --- data/v2/sprites | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/sprites b/data/v2/sprites index 5bdf2287..9e153cef 160000 --- a/data/v2/sprites +++ b/data/v2/sprites @@ -1 +1 @@ -Subproject commit 5bdf22873dddb3829ebc2c05473ba19fb2b2e9ca +Subproject commit 9e153cefb7822564678646176cf847f64adbc028 From 8a0f5a7a5dd4dcd3a86c2f7a1b1b8f05915b664e Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Sat, 6 Mar 2021 20:19:53 +0000 Subject: [PATCH 002/113] Added encounter methods, encounter methods values for new encounters --- data/v2/csv/encounter_condition_prose.csv | 3 +++ data/v2/csv/encounter_condition_value_prose.csv | 13 +++++++++++++ data/v2/csv/encounter_condition_values.csv | 13 +++++++++++++ data/v2/csv/encounter_conditions.csv | 3 +++ 4 files changed, 32 insertions(+) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 13102f73..827164ca 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -17,3 +17,6 @@ encounter_condition_id,local_language_id,name 6,5,Saison 6,6,Jahreszeit 6,9,Season +7,9,Chosen Starter +8,9,Chosen dialogue at the news report +9,9,Story Progress diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 6ca33654..0c30ce3b 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -39,3 +39,16 @@ encounter_condition_value_id,local_language_id,name 19,9,During Autumn 20,6,Im Winter 20,9,During Winter +21,9,Bulbasaur as starter +22,9,Squirtle as starter +23,9,Charmander as starter +24,9,Chespin as starter +25,9,Fennekin as starter +26,9,Froakie as starter +27,9,Chose ‘Blue’ on the TV news report +28,9,Chose ‘Red’ on the TV news report +29,9,Awakened the legendary beasts at Burned Tower +30,9,Visited Lake Verity after defeating Team Galactic at Mt. Coronet +31,9,Talked to Professor Oak at Eterna City +32,9,Visited the Pokémon Fan Club with Copycat’s doll +33,9,Met Tornadus or Thundurus in a cutscene diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index bf00b4b2..00b19474 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -19,3 +19,16 @@ id,encounter_condition_id,identifier,is_default 18,6,season-summer,0 19,6,season-autumn,0 20,6,season-winter,0 +21,7,starter-bulbasaur,0 +22,7,starter-squirtle,0 +23,7,starter-charmander,0 +24,7,starter-chespin,0 +25,7,starter-fennekin,0 +26,7,starter-froakie,0 +27,8,tv-option-blue,1 +28,8,tv-option-red,0 +29,9,story-progress-awakened-beasts,1 +30,9,story-progress-beat-galactic-coronet,0 +31,9,story-progress-oak-eterna-city,0 +32,9,story-progress-vermilion-copycat,0 +33,9,story-progress-met-tornadus-thundurus,0 diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index f4f38c93..3ac3e218 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -5,3 +5,6 @@ id,identifier 4,slot2 5,radio 6,season +7,starter +8,tv-option +9,story-progress From 01827cd63c6fa200a76ac5bb1bcf7bf312f768e4 Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Sat, 6 Mar 2021 21:29:40 +0000 Subject: [PATCH 003/113] =?UTF-8?q?Add=20special=20encounters=20for=20Red/?= =?UTF-8?q?Blue/Yellow=20Added=20encounters=20method=20"Only=20One"=20and?= =?UTF-8?q?=20"Pok=C3=A9flute".=20Added=20encounters=20for=20Voltorb,=20El?= =?UTF-8?q?ectrode,=20Snorlax,=20Articuno,=20Zapdos,=20Moltres=20and=20Mew?= =?UTF-8?q?two=20for=20Red/Blue=20and=20yellow=20versions.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/v2/csv/encounter_method_prose.csv | 2 ++ data/v2/csv/encounter_methods.csv | 2 ++ data/v2/csv/encounter_slots.csv | 26 ++++++++++++++++++++++++++ data/v2/csv/encounters.csv | 24 ++++++++++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index 45a99490..dd09cd3e 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -35,3 +35,5 @@ encounter_method_id,local_language_id,name 17,9,Walking on rough terrain 18,9,Receive as a gift 19,9,Receive egg as a gift +20,9,"Static encounter, only one chance" +21,9,Playing Pokéflute diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index 20debcd3..a3411a44 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -18,3 +18,5 @@ id,identifier,order 17,rough-terrain,9 18,gift,18 19,gift-egg,19 +20,only-one,20 +21,pokeflute,21 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 377ecd5a..973ba4b5 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -559,3 +559,29 @@ id,version_group_id,encounter_method_id,slot,rarity 558,4,5,3,10 559,4,6,1,90 560,4,6,2,10 +561,1,20,,100 +562,2,20,,100 +563,3,20,,100 +564,4,20,,100 +565,5,20,,100 +566,6,20,,100 +567,7,20,,100 +568,8,20,,100 +569,9,20,,100 +570,10,20,,100 +571,11,20,,100 +572,14,20,,100 +573,15,20,,100 +574,16,20,,100 +575,17,20,,100 +576,18,20,,100 +577,19,20,,100 +578,20,20,,100 +579,1,21,,100 +580,2,21,,100 +581,3,21,,100 +582,4,21,,100 +583,7,21,,100 +584,10,21,,100 +585,15,21,,100 +586,19,21,,100 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 9ac68ad5..deca48bb 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -54349,3 +54349,27 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58059,6,235,560,213,15,15 58060,6,225,559,98,15,15 58061,6,225,560,213,15,15 +58062,1,262,561,144,50,50 +58063,1,330,561,145,50,50 +58064,1,330,561,100,40,40 +58065,1,330,561,101,43,43 +58066,1,332,561,146,50,50 +58067,1,276,579,143,30,30 +58068,1,309,579,143,30,30 +58069,2,262,561,144,50,50 +58070,2,330,561,145,50,50 +58071,2,330,561,100,40,40 +58072,2,330,561,101,43,43 +58073,2,332,561,146,50,50 +58074,2,276,579,143,30,30 +58075,2,309,579,143,30,30 +58076,3,262,561,144,50,50 +58077,3,330,561,145,50,50 +58078,3,330,561,100,40,40 +58079,3,330,561,101,43,43 +58080,3,332,561,146,50,50 +58081,3,276,579,143,30,30 +58082,3,309,579,143,30,30 +58083,1,325,561,150,70,70 +58084,2,325,561,150,70,70 +58085,3,325,561,150,70,70 From 04a1f5848c9bf2c9af7318ab86433f3d8fab481b Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Sat, 6 Mar 2021 21:44:46 +0000 Subject: [PATCH 004/113] Add special encounter for Fire Red/Leaf Green Added encounters for Electrode, Snorlax, Articuno, Zapdos, Moltres and Mewtwo for FR/LG. --- data/v2/csv/encounters.csv | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index deca48bb..78755b09 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -54373,3 +54373,17 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58083,1,325,561,150,70,70 58084,2,325,561,150,70,70 58085,3,325,561,150,70,70 +58086,10,262,567,144,50,50 +58087,10,330,567,145,50,50 +58088,10,330,567,101,34,34 +58089,10,332,567,146,50,50 +58090,10,276,583,143,30,30 +58091,10,309,583,143,30,30 +58092,11,262,567,144,50,50 +58093,11,330,567,145,50,50 +58094,11,330,567,101,34,34 +58095,11,332,567,146,50,50 +58096,11,276,583,143,30,30 +58097,11,309,583,143,30,30 +58098,10,325,567,150,70,70 +58099,11,325,567,150,70,70 From 9489eaff88d12eb5dd49d0581f187c875a0397f8 Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Sat, 6 Mar 2021 22:45:05 +0000 Subject: [PATCH 005/113] Add special encounters for Gold Silver Crystal Added encounters for Lugia, Ho-Oh and Suicune in GSC. --- data/v2/csv/encounters.csv | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 78755b09..10cf2654 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -54363,16 +54363,16 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58073,2,332,561,146,50,50 58074,2,276,579,143,30,30 58075,2,309,579,143,30,30 -58076,3,262,561,144,50,50 -58077,3,330,561,145,50,50 -58078,3,330,561,100,40,40 -58079,3,330,561,101,43,43 -58080,3,332,561,146,50,50 -58081,3,276,579,143,30,30 -58082,3,309,579,143,30,30 +58076,3,262,562,144,50,50 +58077,3,330,562,145,50,50 +58078,3,330,562,100,40,40 +58079,3,330,562,101,43,43 +58080,3,332,562,146,50,50 +58081,3,276,580,143,30,30 +58082,3,309,580,143,30,30 58083,1,325,561,150,70,70 58084,2,325,561,150,70,70 -58085,3,325,561,150,70,70 +58085,3,325,562,150,70,70 58086,10,262,567,144,50,50 58087,10,330,567,145,50,50 58088,10,330,567,101,34,34 @@ -54387,3 +54387,10 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58097,11,309,583,143,30,30 58098,10,325,567,150,70,70 58099,11,325,567,150,70,70 +58100,4,230,563,249,70,70 +58101,5,230,563,249,40,40 +58102,6,230,564,249,60,60 +58103,4,268,563,250,40,40 +58104,5,268,563,250,70,70 +58105,6,268,564,250,60,60 +58106,6,268,564,245,40,40 From 94869bcd65cb605ebb59defd1f8eaf7a45bebb39 Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Sun, 7 Mar 2021 00:13:20 +0000 Subject: [PATCH 006/113] =?UTF-8?q?Add=20missing=20special=20encounters=20?= =?UTF-8?q?to=20GSC,=20RSE,=20FRLG,=20HGSS=20Added:=20-=20Encounter=20cond?= =?UTF-8?q?itions=20for=20beat=20elite=20four,=20beat=20elite=20four=20rou?= =?UTF-8?q?nd=202=20-=20Added=20locations=20and=20areas=20for=20roaming=20?= =?UTF-8?q?Pok=C3=A9mon=20(One=20for=20each=20region)=20-=20Added=20area?= =?UTF-8?q?=20for=20Bell=20Tower=20Roof=20-=20Added=20encounters=20for=20L?= =?UTF-8?q?ugia,=20Ho-Oh,=20Articuno,=20Zapdos,=20Moltres,=20Mewtwo,=20Rai?= =?UTF-8?q?kou,=20Entei,=20Suicune,=20Latios=20and=20Latias=20to=20GSC,=20?= =?UTF-8?q?HGSS,=20FRLG=20and=20RSE=20where=20applicable.=20-=20Bound=20en?= =?UTF-8?q?counter=20conditions=20where=20applicable.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/v2/csv/encounter_condition_value_map.csv | 32 ++++++++++++++ .../csv/encounter_condition_value_prose.csv | 2 + data/v2/csv/encounter_condition_values.csv | 2 + data/v2/csv/encounters.csv | 42 +++++++++++++++++-- data/v2/csv/location_area_prose.csv | 5 +++ data/v2/csv/location_areas.csv | 5 +++ data/v2/csv/locations.csv | 4 ++ 7 files changed, 88 insertions(+), 4 deletions(-) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index d88a35a2..bcd9e971 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -16939,3 +16939,35 @@ encounter_id,encounter_condition_value_id 57870,5 57871,5 57872,5 +58117,29 +58118,29 +58119,29 +58120,29 +58121,29 +58122,29 +58123,29 +58124,29 +58125,34 +58126,34 +58127,34 +58128,34 +58129,34 +58130,34 +58131,29 +58132,29 +58133,29 +58134,29 +58135,32 +58136,32 +58125,22 +58126,22 +58127,21 +58128,21 +58129,23 +58130,23 +58137,35 +58138,35 +58139,35 +58140,35 +58138,28 +58140,27 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 0c30ce3b..81187657 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -52,3 +52,5 @@ encounter_condition_value_id,local_language_id,name 31,9,Talked to Professor Oak at Eterna City 32,9,Visited the Pokémon Fan Club with Copycat’s doll 33,9,Met Tornadus or Thundurus in a cutscene +34,9,Beat the Elite 4 for the second time +35,9,Enter the Hall of Fame diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 00b19474..c59f2fd2 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -32,3 +32,5 @@ id,encounter_condition_id,identifier,is_default 31,9,story-progress-oak-eterna-city,0 32,9,story-progress-vermilion-copycat,0 33,9,story-progress-met-tornadus-thundurus,0 +34,9,story-progress-beat-elite-four-round-two,0 +35,9,story-progress-hall-of-fame,0 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 10cf2654..28fa6336 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -54390,7 +54390,41 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58100,4,230,563,249,70,70 58101,5,230,563,249,40,40 58102,6,230,564,249,60,60 -58103,4,268,563,250,40,40 -58104,5,268,563,250,70,70 -58105,6,268,564,250,60,60 -58106,6,268,564,245,40,40 +58103,4,793,563,250,40,40 +58104,5,793,563,250,70,70 +58105,6,793,564,250,60,60 +58106,6,793,564,245,40,40 +58107,15,793,570,250,45,45 +58108,16,793,570,250,70,70 +58109,15,232,570,249,70,70 +58110,16,232,570,249,45,45 +58111,15,325,570,150,70,70 +58112,16,325,570,150,70,70 +58113,15,262,570,144,50,50 +58114,16,262,570,144,50,50 +58115,15,304,570,145,50,50 +58116,16,304,570,145,50,50 +58117,4,795,563,243,40,40 +58118,5,795,563,243,40,40 +58119,6,795,564,243,40,40 +58120,4,795,563,244,40,40 +58121,5,795,563,244,40,40 +58122,6,795,564,244,40,40 +58123,4,795,563,245,40,40 +58124,5,795,563,245,40,40 +58125,10,794,567,243,50,50 +58126,11,794,567,243,50,50 +58127,10,794,567,244,50,50 +58128,11,794,567,244,50,50 +58129,10,794,567,245,50,50 +58130,11,794,567,245,50,50 +58131,15,795,570,243,40,40 +58132,16,795,570,243,40,40 +58133,15,795,570,244,40,40 +58134,16,795,570,244,40,40 +58135,15,795,570,380,35,35 +58136,16,795,570,381,35,35 +58137,8,796,565,380,40,40 +58138,9,796,566,380,40,40 +58139,7,796,565,381,40,40 +58140,9,796,566,381,40,40 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 42223479..7b21554f 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -650,3 +650,8 @@ location_area_id,local_language_id,name 790,9,Poke Mart 791,9,Pokemon Center 792,9,West Gate +793,9,Bell Tower Roof +794,9,Roaming Kanto +795,9,Roaming Johto +796,9,Roaming Hoenn +797,9,Roaming Sinnoh diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 3ddc00d6..37b64f78 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -682,3 +682,8 @@ id,location_id,game_index,identifier 790,153,0,poke-mart 791,153,0,pokemon-center 792,349,0,west-gate +793,139,0,bell-tower-roof +794,799,0,roaming-kanto-area +795,800,0,roaming-johto-area +796,801,0,roaming-hoenn-area +797,802,0,roaming-sinnoh-area diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index e97060d5..3245851f 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -780,3 +780,7 @@ id,region_id,identifier 796,7,aether-paradise 797,7,ultra-space 798,7,malie-city--outer-cape +799,1,roaming-kanto +800,2,roaming-johto +801,3,roaming-hoenn +802,4,roaming-sinnoh From 13a36e6b9e6727b33edc13f9641e68b5612ba83b Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Mon, 8 Mar 2021 00:11:03 +0000 Subject: [PATCH 007/113] =?UTF-8?q?Add=20heabutt=20encounters=20Add:=20-?= =?UTF-8?q?=20Encounter=20methods:=20Headbutt=20low=20encounter=20rate=20t?= =?UTF-8?q?ree,=20Headbutt=20normal=20encounter=20rate=20tree,=20Headbutt?= =?UTF-8?q?=20high=20encounter=20rate=20tree=20-=20Location:=20Azalea=20To?= =?UTF-8?q?wn=20and=20it's=20area=20(Required=20for=20headbutt=20encounter?= =?UTF-8?q?s)=20-=20Encounter=20Slots:=20Encounter=20slots=20for=20heabutt?= =?UTF-8?q?=20low,=20normal=20and=20high=20for=20Gold,=20Silver=20and=20Cr?= =?UTF-8?q?ystal,=20along=20with=20their=20respective=20and=20correct=20ch?= =?UTF-8?q?ances=20-=20Encounters:=201682=20new=20encounters=20correspondi?= =?UTF-8?q?ng=20to=20every=20missing=20headbutt=20encounter=20from=20Pok?= =?UTF-8?q?=C3=A9mon=20Gold=20Silver=20and=20Crystal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PS: The source of all this data is the Pokémon decompilations by pret on github (https://github.com/pret/pokecrystal)[Pokémon Crystal decompilation], (https://github.com/pret/pokegold)[Pokémon Gold and Pokémon Silver Decompilation] The data is as accurate as these decompilations are. --- data/v2/csv/encounter_method_prose.csv | 3 + data/v2/csv/encounter_methods.csv | 3 + data/v2/csv/encounter_slots.csv | 46 + data/v2/csv/encounters.csv | 1683 ++++++++++++++++++++++++ data/v2/csv/location_area_prose.csv | 3 + data/v2/csv/location_areas.csv | 3 + 6 files changed, 1741 insertions(+) diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index dd09cd3e..b11cf47a 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -37,3 +37,6 @@ encounter_method_id,local_language_id,name 19,9,Receive egg as a gift 20,9,"Static encounter, only one chance" 21,9,Playing Pokéflute +22,9,Heabutting a low encounter rate tree +23,9,Heabutting a normal encounter rate tree +24,9,Heabutting a high encounter rate tree diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index a3411a44..f05fbd4f 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -20,3 +20,6 @@ id,identifier,order 19,gift-egg,19 20,only-one,20 21,pokeflute,21 +22,headbutt-low,22 +23,heabutt-normal,23 +24,heabutt-high,24 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 973ba4b5..023fe190 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -585,3 +585,49 @@ id,version_group_id,encounter_method_id,slot,rarity 584,10,21,,100 585,15,21,,100 586,19,21,,100 +587,3,22,1,50 +588,3,22,2,15 +589,3,22,3,15 +590,3,22,4,10 +591,3,22,5,5 +592,3,22,6,5 +593,3,23,1,50 +594,3,23,2,15 +595,3,23,3,15 +596,3,23,4,10 +597,3,23,5,5 +598,3,23,6,5 +599,3,22,1,50 +600,3,22,2,30 +601,3,22,3,10 +602,3,22,4,5 +603,3,22,5,5 +604,3,23,1,50 +605,3,23,2,30 +606,3,23,3,10 +607,3,23,4,5 +608,3,23,5,5 +609,3,24,1,50 +610,3,24,2,15 +611,3,24,3,15 +612,3,24,4,10 +613,3,24,5,5 +614,3,24,6,5 +615,4,22,1,50 +616,4,22,2,15 +617,4,22,3,15 +618,4,22,4,10 +619,4,22,5,5 +620,4,22,6,5 +621,4,23,1,50 +622,4,23,2,15 +623,4,23,3,15 +624,4,23,4,10 +625,4,23,5,5 +626,4,23,6,5 +627,4,24,1,50 +628,4,24,2,15 +629,4,24,3,15 +630,4,24,4,10 +631,4,24,5,5 +632,4,24,6,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 28fa6336..6bc9ba10 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -54428,3 +54428,1686 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58138,9,796,566,380,40,40 58139,7,796,565,381,40,40 58140,9,796,566,381,40,40 +58141,6,287,593,163,10,10 +58142,6,287,594,23,10,10 +58143,6,287,595,163,10,10 +58144,6,287,596,102,10,10 +58145,6,287,597,102,10,10 +58146,6,287,598,102,10,10 +58147,6,288,593,163,10,10 +58148,6,288,594,23,10,10 +58149,6,288,595,163,10,10 +58150,6,288,596,102,10,10 +58151,6,288,597,102,10,10 +58152,6,288,598,102,10,10 +58153,6,185,593,163,10,10 +58154,6,185,594,167,10,10 +58155,6,185,595,165,10,10 +58156,6,185,596,102,10,10 +58157,6,185,597,102,10,10 +58158,6,185,598,102,10,10 +58159,6,187,593,163,10,10 +58160,6,187,594,167,10,10 +58161,6,187,595,165,10,10 +58162,6,187,596,102,10,10 +58163,6,187,597,102,10,10 +58164,6,187,598,102,10,10 +58165,6,188,593,163,10,10 +58166,6,188,594,167,10,10 +58167,6,188,595,165,10,10 +58168,6,188,596,102,10,10 +58169,6,188,597,102,10,10 +58170,6,188,598,102,10,10 +58171,6,192,593,163,10,10 +58172,6,192,594,23,10,10 +58173,6,192,595,163,10,10 +58174,6,192,596,102,10,10 +58175,6,192,597,102,10,10 +58176,6,192,598,102,10,10 +58177,6,201,593,21,10,10 +58178,6,201,594,23,10,10 +58179,6,201,595,21,10,10 +58180,6,201,596,190,10,10 +58181,6,201,597,190,10,10 +58182,6,201,598,190,10,10 +58183,6,205,593,163,10,10 +58184,6,205,594,167,10,10 +58185,6,205,595,165,10,10 +58186,6,205,596,102,10,10 +58187,6,205,597,102,10,10 +58188,6,205,598,102,10,10 +58189,6,206,593,163,10,10 +58190,6,206,594,167,10,10 +58191,6,206,595,165,10,10 +58192,6,206,596,102,10,10 +58193,6,206,597,102,10,10 +58194,6,206,598,102,10,10 +58195,6,209,593,163,10,10 +58196,6,209,594,167,10,10 +58197,6,209,595,165,10,10 +58198,6,209,596,102,10,10 +58199,6,209,597,102,10,10 +58200,6,209,598,102,10,10 +58201,6,210,593,163,10,10 +58202,6,210,594,167,10,10 +58203,6,210,595,165,10,10 +58204,6,210,596,102,10,10 +58205,6,210,597,102,10,10 +58206,6,210,598,102,10,10 +58207,6,222,593,163,10,10 +58208,6,222,594,167,10,10 +58209,6,222,595,165,10,10 +58210,6,222,596,102,10,10 +58211,6,222,597,102,10,10 +58212,6,222,598,102,10,10 +58213,6,223,593,163,10,10 +58214,6,223,594,167,10,10 +58215,6,223,595,165,10,10 +58216,6,223,596,102,10,10 +58217,6,223,597,102,10,10 +58218,6,223,598,102,10,10 +58219,6,236,593,21,10,10 +58220,6,236,594,23,10,10 +58221,6,236,595,21,10,10 +58222,6,236,596,190,10,10 +58223,6,236,597,190,10,10 +58224,6,236,598,190,10,10 +58225,6,241,593,163,10,10 +58226,6,241,594,48,10,10 +58227,6,241,595,163,10,10 +58228,6,241,596,102,10,10 +58229,6,241,597,102,10,10 +58230,6,241,598,102,10,10 +58231,6,243,593,21,10,10 +58232,6,243,594,21,10,10 +58233,6,243,595,21,10,10 +58234,6,243,596,190,10,10 +58235,6,243,597,190,10,10 +58236,6,243,598,190,10,10 +58237,6,251,593,21,10,10 +58238,6,251,594,21,10,10 +58239,6,251,595,21,10,10 +58240,6,251,596,190,10,10 +58241,6,251,597,190,10,10 +58242,6,251,598,190,10,10 +58243,6,252,593,21,10,10 +58244,6,252,594,21,10,10 +58245,6,252,595,21,10,10 +58246,6,252,596,190,10,10 +58247,6,252,597,190,10,10 +58248,6,252,598,190,10,10 +58249,6,798,593,21,10,10 +58250,6,798,594,23,10,10 +58251,6,798,595,21,10,10 +58252,6,798,596,190,10,10 +58253,6,798,597,190,10,10 +58254,6,798,598,190,10,10 +58255,6,242,593,163,10,10 +58256,6,242,594,48,10,10 +58257,6,242,595,163,10,10 +58258,6,242,596,102,10,10 +58259,6,242,597,102,10,10 +58260,6,242,598,102,10,10 +58261,6,204,593,163,10,10 +58262,6,204,594,204,10,10 +58263,6,204,595,204,10,10 +58264,6,204,596,164,10,10 +58265,6,204,597,12,10,10 +58266,6,204,598,15,10,10 +58267,6,287,610,163,10,10 +58268,6,287,611,23,10,10 +58269,6,287,612,163,10,10 +58270,6,287,613,102,10,10 +58271,6,287,614,102,10,10 +58272,6,287,615,102,10,10 +58273,6,288,610,163,10,10 +58274,6,288,611,23,10,10 +58275,6,288,612,163,10,10 +58276,6,288,613,102,10,10 +58277,6,288,614,102,10,10 +58278,6,288,615,102,10,10 +58279,6,185,610,163,10,10 +58280,6,185,611,167,10,10 +58281,6,185,612,165,10,10 +58282,6,185,613,102,10,10 +58283,6,185,614,102,10,10 +58284,6,185,615,102,10,10 +58285,6,187,610,163,10,10 +58286,6,187,611,167,10,10 +58287,6,187,612,165,10,10 +58288,6,187,613,102,10,10 +58289,6,187,614,102,10,10 +58290,6,187,615,102,10,10 +58291,6,188,610,163,10,10 +58292,6,188,611,167,10,10 +58293,6,188,612,165,10,10 +58294,6,188,613,102,10,10 +58295,6,188,614,102,10,10 +58296,6,188,615,102,10,10 +58297,6,192,610,163,10,10 +58298,6,192,611,23,10,10 +58299,6,192,612,163,10,10 +58300,6,192,613,102,10,10 +58301,6,192,614,102,10,10 +58302,6,192,615,102,10,10 +58303,6,201,610,21,10,10 +58304,6,201,611,23,10,10 +58305,6,201,612,21,10,10 +58306,6,201,613,190,10,10 +58307,6,201,614,190,10,10 +58308,6,201,615,190,10,10 +58309,6,205,610,163,10,10 +58310,6,205,611,167,10,10 +58311,6,205,612,165,10,10 +58312,6,205,613,102,10,10 +58313,6,205,614,102,10,10 +58314,6,205,615,102,10,10 +58315,6,206,610,163,10,10 +58316,6,206,611,167,10,10 +58317,6,206,612,165,10,10 +58318,6,206,613,102,10,10 +58319,6,206,614,102,10,10 +58320,6,206,615,102,10,10 +58321,6,209,610,163,10,10 +58322,6,209,611,167,10,10 +58323,6,209,612,165,10,10 +58324,6,209,613,102,10,10 +58325,6,209,614,102,10,10 +58326,6,209,615,102,10,10 +58327,6,210,610,163,10,10 +58328,6,210,611,167,10,10 +58329,6,210,612,165,10,10 +58330,6,210,613,102,10,10 +58331,6,210,614,102,10,10 +58332,6,210,615,102,10,10 +58333,6,222,610,163,10,10 +58334,6,222,611,167,10,10 +58335,6,222,612,165,10,10 +58336,6,222,613,102,10,10 +58337,6,222,614,102,10,10 +58338,6,222,615,102,10,10 +58339,6,223,610,163,10,10 +58340,6,223,611,167,10,10 +58341,6,223,612,165,10,10 +58342,6,223,613,102,10,10 +58343,6,223,614,102,10,10 +58344,6,223,615,102,10,10 +58345,6,236,610,21,10,10 +58346,6,236,611,23,10,10 +58347,6,236,612,21,10,10 +58348,6,236,613,190,10,10 +58349,6,236,614,190,10,10 +58350,6,236,615,190,10,10 +58351,6,241,610,163,10,10 +58352,6,241,611,48,10,10 +58353,6,241,612,163,10,10 +58354,6,241,613,102,10,10 +58355,6,241,614,102,10,10 +58356,6,241,615,102,10,10 +58357,6,243,610,21,10,10 +58358,6,243,611,21,10,10 +58359,6,243,612,21,10,10 +58360,6,243,613,190,10,10 +58361,6,243,614,190,10,10 +58362,6,243,615,190,10,10 +58363,6,251,610,21,10,10 +58364,6,251,611,21,10,10 +58365,6,251,612,21,10,10 +58366,6,251,613,190,10,10 +58367,6,251,614,190,10,10 +58368,6,251,615,190,10,10 +58369,6,252,610,21,10,10 +58370,6,252,611,21,10,10 +58371,6,252,612,21,10,10 +58372,6,252,613,190,10,10 +58373,6,252,614,190,10,10 +58374,6,252,615,190,10,10 +58375,6,798,610,21,10,10 +58376,6,798,611,23,10,10 +58377,6,798,612,21,10,10 +58378,6,798,613,190,10,10 +58379,6,798,614,190,10,10 +58380,6,798,615,190,10,10 +58381,6,242,610,163,10,10 +58382,6,242,611,48,10,10 +58383,6,242,612,163,10,10 +58384,6,242,613,102,10,10 +58385,6,242,614,102,10,10 +58386,6,242,615,102,10,10 +58387,6,204,610,163,10,10 +58388,6,204,611,204,10,10 +58389,6,204,612,204,10,10 +58390,6,204,613,164,10,10 +58391,6,204,614,12,10,10 +58392,6,204,615,15,10,10 +58393,6,287,610,163,10,10 +58394,6,287,611,204,10,10 +58395,6,287,612,204,10,10 +58396,6,287,613,102,10,10 +58397,6,287,614,102,10,10 +58398,6,287,615,102,10,10 +58399,6,288,610,163,10,10 +58400,6,288,611,204,10,10 +58401,6,288,612,204,10,10 +58402,6,288,613,102,10,10 +58403,6,288,614,102,10,10 +58404,6,288,615,102,10,10 +58405,6,185,610,163,10,10 +58406,6,185,611,204,10,10 +58407,6,185,612,204,10,10 +58408,6,185,613,102,10,10 +58409,6,185,614,102,10,10 +58410,6,185,615,102,10,10 +58411,6,187,610,163,10,10 +58412,6,187,611,204,10,10 +58413,6,187,612,204,10,10 +58414,6,187,613,102,10,10 +58415,6,187,614,102,10,10 +58416,6,187,615,102,10,10 +58417,6,188,610,163,10,10 +58418,6,188,611,204,10,10 +58419,6,188,612,204,10,10 +58420,6,188,613,102,10,10 +58421,6,188,614,102,10,10 +58422,6,188,615,102,10,10 +58423,6,192,610,163,10,10 +58424,6,192,611,204,10,10 +58425,6,192,612,204,10,10 +58426,6,192,613,102,10,10 +58427,6,192,614,102,10,10 +58428,6,192,615,102,10,10 +58429,6,201,610,21,10,10 +58430,6,201,611,214,10,10 +58431,6,201,612,214,10,10 +58432,6,201,613,190,10,10 +58433,6,201,614,190,10,10 +58434,6,201,615,190,10,10 +58435,6,205,610,163,10,10 +58436,6,205,611,204,10,10 +58437,6,205,612,204,10,10 +58438,6,205,613,102,10,10 +58439,6,205,614,102,10,10 +58440,6,205,615,102,10,10 +58441,6,206,610,163,10,10 +58442,6,206,611,204,10,10 +58443,6,206,612,204,10,10 +58444,6,206,613,102,10,10 +58445,6,206,614,102,10,10 +58446,6,206,615,102,10,10 +58447,6,209,610,163,10,10 +58448,6,209,611,204,10,10 +58449,6,209,612,204,10,10 +58450,6,209,613,102,10,10 +58451,6,209,614,102,10,10 +58452,6,209,615,102,10,10 +58453,6,210,610,163,10,10 +58454,6,210,611,204,10,10 +58455,6,210,612,204,10,10 +58456,6,210,613,102,10,10 +58457,6,210,614,102,10,10 +58458,6,210,615,102,10,10 +58459,6,222,610,163,10,10 +58460,6,222,611,204,10,10 +58461,6,222,612,204,10,10 +58462,6,222,613,102,10,10 +58463,6,222,614,102,10,10 +58464,6,222,615,102,10,10 +58465,6,223,610,163,10,10 +58466,6,223,611,204,10,10 +58467,6,223,612,204,10,10 +58468,6,223,613,102,10,10 +58469,6,223,614,102,10,10 +58470,6,223,615,102,10,10 +58471,6,236,610,21,10,10 +58472,6,236,611,214,10,10 +58473,6,236,612,214,10,10 +58474,6,236,613,190,10,10 +58475,6,236,614,190,10,10 +58476,6,236,615,190,10,10 +58477,6,241,610,163,10,10 +58478,6,241,611,204,10,10 +58479,6,241,612,204,10,10 +58480,6,241,613,102,10,10 +58481,6,241,614,102,10,10 +58482,6,241,615,102,10,10 +58483,6,243,610,21,10,10 +58484,6,243,611,214,10,10 +58485,6,243,612,214,10,10 +58486,6,243,613,190,10,10 +58487,6,243,614,190,10,10 +58488,6,243,615,190,10,10 +58489,6,251,610,21,10,10 +58490,6,251,611,214,10,10 +58491,6,251,612,214,10,10 +58492,6,251,613,190,10,10 +58493,6,251,614,190,10,10 +58494,6,251,615,190,10,10 +58495,6,252,610,21,10,10 +58496,6,252,611,214,10,10 +58497,6,252,612,214,10,10 +58498,6,252,613,190,10,10 +58499,6,252,614,190,10,10 +58500,6,252,615,190,10,10 +58501,6,798,610,21,10,10 +58502,6,798,611,214,10,10 +58503,6,798,612,214,10,10 +58504,6,798,613,190,10,10 +58505,6,798,614,190,10,10 +58506,6,798,615,190,10,10 +58507,6,242,610,163,10,10 +58508,6,242,611,204,10,10 +58509,6,242,612,204,10,10 +58510,6,242,613,102,10,10 +58511,6,242,614,102,10,10 +58512,6,242,615,102,10,10 +58513,6,204,610,163,10,10 +58514,6,204,611,10,10,10 +58515,6,204,612,13,10,10 +58516,6,204,613,163,10,10 +58517,6,204,614,11,10,10 +58518,6,204,615,14,10,10 +58519,5,287,587,48,15,15 +58520,5,287,588,48,15,15 +58521,5,287,589,63,15,15 +58522,5,287,590,63,15,15 +58523,5,287,591,49,15,15 +58524,5,288,587,48,15,15 +58525,5,288,588,48,15,15 +58526,5,288,589,63,15,15 +58527,5,288,590,63,15,15 +58528,5,288,591,49,15,15 +58529,5,185,587,13,10,10 +58530,5,185,588,13,10,10 +58531,5,185,589,14,10,10 +58532,5,185,590,102,10,10 +58533,5,185,591,102,10,10 +58534,5,185,592,15,10,10 +58535,5,187,587,13,10,10 +58536,5,187,588,13,10,10 +58537,5,187,589,14,10,10 +58538,5,187,590,102,10,10 +58539,5,187,591,102,10,10 +58540,5,187,592,15,10,10 +58541,5,188,587,13,10,10 +58542,5,188,588,13,10,10 +58543,5,188,589,14,10,10 +58544,5,188,590,102,10,10 +58545,5,188,591,102,10,10 +58546,5,188,592,15,10,10 +58547,5,192,587,13,10,10 +58548,5,192,588,13,10,10 +58549,5,192,589,14,10,10 +58550,5,192,590,102,10,10 +58551,5,192,591,102,10,10 +58552,5,192,592,15,10,10 +58553,5,201,587,13,10,10 +58554,5,201,588,13,10,10 +58555,5,201,589,14,10,10 +58556,5,201,590,102,10,10 +58557,5,201,591,102,10,10 +58558,5,201,592,15,10,10 +58559,5,205,587,48,15,15 +58560,5,205,588,48,15,15 +58561,5,205,589,63,15,15 +58562,5,205,590,63,15,15 +58563,5,205,591,49,15,15 +58564,5,206,587,48,15,15 +58565,5,206,588,48,15,15 +58566,5,206,589,63,15,15 +58567,5,206,590,63,15,15 +58568,5,206,591,49,15,15 +58569,5,209,587,48,15,15 +58570,5,209,588,48,15,15 +58571,5,209,589,63,15,15 +58572,5,209,590,63,15,15 +58573,5,209,591,49,15,15 +58574,5,210,587,48,15,15 +58575,5,210,588,48,15,15 +58576,5,210,589,63,15,15 +58577,5,210,590,63,15,15 +58578,5,210,591,49,15,15 +58579,5,222,587,48,15,15 +58580,5,222,588,48,15,15 +58581,5,222,589,63,15,15 +58582,5,222,590,63,15,15 +58583,5,222,591,49,15,15 +58584,5,223,587,48,15,15 +58585,5,223,588,48,15,15 +58586,5,223,589,63,15,15 +58587,5,223,590,63,15,15 +58588,5,223,591,49,15,15 +58589,5,236,587,13,10,10 +58590,5,236,588,13,10,10 +58591,5,236,589,14,10,10 +58592,5,236,590,102,10,10 +58593,5,236,591,102,10,10 +58594,5,236,592,15,10,10 +58595,5,241,587,13,10,10 +58596,5,241,588,13,10,10 +58597,5,241,589,14,10,10 +58598,5,241,590,102,10,10 +58599,5,241,591,102,10,10 +58600,5,241,592,15,10,10 +58601,5,243,587,13,10,10 +58602,5,243,588,13,10,10 +58603,5,243,589,14,10,10 +58604,5,243,590,102,10,10 +58605,5,243,591,102,10,10 +58606,5,243,592,15,10,10 +58607,5,251,587,13,10,10 +58608,5,251,588,13,10,10 +58609,5,251,589,14,10,10 +58610,5,251,590,102,10,10 +58611,5,251,591,102,10,10 +58612,5,251,592,15,10,10 +58613,5,252,587,13,10,10 +58614,5,252,588,13,10,10 +58615,5,252,589,14,10,10 +58616,5,252,590,102,10,10 +58617,5,252,591,102,10,10 +58618,5,252,592,15,10,10 +58619,5,184,587,21,10,10 +58620,5,184,588,21,10,10 +58621,5,184,589,21,10,10 +58622,5,184,590,190,10,10 +58623,5,184,591,190,10,10 +58624,5,184,592,190,10,10 +58625,5,189,587,21,10,10 +58626,5,189,588,21,10,10 +58627,5,189,589,21,10,10 +58628,5,189,590,190,10,10 +58629,5,189,591,190,10,10 +58630,5,189,592,190,10,10 +58631,5,798,587,48,15,15 +58632,5,798,588,48,15,15 +58633,5,798,589,63,15,15 +58634,5,798,590,63,15,15 +58635,5,798,591,49,15,15 +58636,5,211,587,21,10,10 +58637,5,211,588,21,10,10 +58638,5,211,589,21,10,10 +58639,5,211,590,190,10,10 +58640,5,211,591,190,10,10 +58641,5,211,592,190,10,10 +58642,5,800,587,21,10,10 +58643,5,800,588,21,10,10 +58644,5,800,589,21,10,10 +58645,5,800,590,190,10,10 +58646,5,800,591,190,10,10 +58647,5,800,592,190,10,10 +58648,5,242,587,48,15,15 +58649,5,242,588,48,15,15 +58650,5,242,589,63,15,15 +58651,5,242,590,63,15,15 +58652,5,242,591,49,15,15 +58653,5,249,587,21,10,10 +58654,5,249,588,21,10,10 +58655,5,249,589,21,10,10 +58656,5,249,590,190,10,10 +58657,5,249,591,190,10,10 +58658,5,249,592,190,10,10 +58659,5,204,587,48,15,15 +58660,5,204,588,48,15,15 +58661,5,204,589,63,15,15 +58662,5,204,590,63,15,15 +58663,5,204,591,49,15,15 +58664,5,287,593,48,15,15 +58665,5,287,594,48,15,15 +58666,5,287,595,63,15,15 +58667,5,287,596,63,15,15 +58668,5,287,597,49,15,15 +58669,5,288,593,48,15,15 +58670,5,288,594,48,15,15 +58671,5,288,595,63,15,15 +58672,5,288,596,63,15,15 +58673,5,288,597,49,15,15 +58674,5,185,593,13,10,10 +58675,5,185,594,13,10,10 +58676,5,185,595,14,10,10 +58677,5,185,596,102,10,10 +58678,5,185,597,102,10,10 +58679,5,185,598,15,10,10 +58680,5,187,593,13,10,10 +58681,5,187,594,13,10,10 +58682,5,187,595,14,10,10 +58683,5,187,596,102,10,10 +58684,5,187,597,102,10,10 +58685,5,187,598,15,10,10 +58686,5,188,593,13,10,10 +58687,5,188,594,13,10,10 +58688,5,188,595,14,10,10 +58689,5,188,596,102,10,10 +58690,5,188,597,102,10,10 +58691,5,188,598,15,10,10 +58692,5,192,593,13,10,10 +58693,5,192,594,13,10,10 +58694,5,192,595,14,10,10 +58695,5,192,596,102,10,10 +58696,5,192,597,102,10,10 +58697,5,192,598,15,10,10 +58698,5,201,593,13,10,10 +58699,5,201,594,13,10,10 +58700,5,201,595,14,10,10 +58701,5,201,596,102,10,10 +58702,5,201,597,102,10,10 +58703,5,201,598,15,10,10 +58704,5,205,593,48,15,15 +58705,5,205,594,48,15,15 +58706,5,205,595,63,15,15 +58707,5,205,596,63,15,15 +58708,5,205,597,49,15,15 +58709,5,206,593,48,15,15 +58710,5,206,594,48,15,15 +58711,5,206,595,63,15,15 +58712,5,206,596,63,15,15 +58713,5,206,597,49,15,15 +58714,5,209,593,48,15,15 +58715,5,209,594,48,15,15 +58716,5,209,595,63,15,15 +58717,5,209,596,63,15,15 +58718,5,209,597,49,15,15 +58719,5,210,593,48,15,15 +58720,5,210,594,48,15,15 +58721,5,210,595,63,15,15 +58722,5,210,596,63,15,15 +58723,5,210,597,49,15,15 +58724,5,222,593,48,15,15 +58725,5,222,594,48,15,15 +58726,5,222,595,63,15,15 +58727,5,222,596,63,15,15 +58728,5,222,597,49,15,15 +58729,5,223,593,48,15,15 +58730,5,223,594,48,15,15 +58731,5,223,595,63,15,15 +58732,5,223,596,63,15,15 +58733,5,223,597,49,15,15 +58734,5,236,593,13,10,10 +58735,5,236,594,13,10,10 +58736,5,236,595,14,10,10 +58737,5,236,596,102,10,10 +58738,5,236,597,102,10,10 +58739,5,236,598,15,10,10 +58740,5,241,593,13,10,10 +58741,5,241,594,13,10,10 +58742,5,241,595,14,10,10 +58743,5,241,596,102,10,10 +58744,5,241,597,102,10,10 +58745,5,241,598,15,10,10 +58746,5,243,593,13,10,10 +58747,5,243,594,13,10,10 +58748,5,243,595,14,10,10 +58749,5,243,596,102,10,10 +58750,5,243,597,102,10,10 +58751,5,243,598,15,10,10 +58752,5,251,593,13,10,10 +58753,5,251,594,13,10,10 +58754,5,251,595,14,10,10 +58755,5,251,596,102,10,10 +58756,5,251,597,102,10,10 +58757,5,251,598,15,10,10 +58758,5,252,593,13,10,10 +58759,5,252,594,13,10,10 +58760,5,252,595,14,10,10 +58761,5,252,596,102,10,10 +58762,5,252,597,102,10,10 +58763,5,252,598,15,10,10 +58764,5,184,593,21,10,10 +58765,5,184,594,21,10,10 +58766,5,184,595,21,10,10 +58767,5,184,596,190,10,10 +58768,5,184,597,190,10,10 +58769,5,184,598,190,10,10 +58770,5,189,593,21,10,10 +58771,5,189,594,21,10,10 +58772,5,189,595,21,10,10 +58773,5,189,596,190,10,10 +58774,5,189,597,190,10,10 +58775,5,189,598,190,10,10 +58776,5,798,593,48,15,15 +58777,5,798,594,48,15,15 +58778,5,798,595,63,15,15 +58779,5,798,596,63,15,15 +58780,5,798,597,49,15,15 +58781,5,211,593,21,10,10 +58782,5,211,594,21,10,10 +58783,5,211,595,21,10,10 +58784,5,211,596,190,10,10 +58785,5,211,597,190,10,10 +58786,5,211,598,190,10,10 +58787,5,800,593,21,10,10 +58788,5,800,594,21,10,10 +58789,5,800,595,21,10,10 +58790,5,800,596,190,10,10 +58791,5,800,597,190,10,10 +58792,5,800,598,190,10,10 +58793,5,242,593,48,15,15 +58794,5,242,594,48,15,15 +58795,5,242,595,63,15,15 +58796,5,242,596,63,15,15 +58797,5,242,597,49,15,15 +58798,5,249,593,21,10,10 +58799,5,249,594,21,10,10 +58800,5,249,595,21,10,10 +58801,5,249,596,190,10,10 +58802,5,249,597,190,10,10 +58803,5,249,598,190,10,10 +58804,5,204,593,48,15,15 +58805,5,204,594,48,15,15 +58806,5,204,595,63,15,15 +58807,5,204,596,63,15,15 +58808,5,204,597,49,15,15 +58809,5,287,609,48,15,15 +58810,5,287,610,81,15,15 +58811,5,287,611,63,15,15 +58812,5,287,612,63,15,15 +58813,5,287,613,49,15,15 +58814,5,288,609,48,15,15 +58815,5,288,610,81,15,15 +58816,5,288,611,63,15,15 +58817,5,288,612,63,15,15 +58818,5,288,613,49,15,15 +58819,5,185,609,13,10,10 +58820,5,185,610,204,10,10 +58821,5,185,611,204,10,10 +58822,5,185,612,102,10,10 +58823,5,185,613,102,10,10 +58824,5,185,614,15,10,10 +58825,5,187,609,13,10,10 +58826,5,187,610,204,10,10 +58827,5,187,611,204,10,10 +58828,5,187,612,102,10,10 +58829,5,187,613,102,10,10 +58830,5,187,614,15,10,10 +58831,5,188,609,13,10,10 +58832,5,188,610,204,10,10 +58833,5,188,611,204,10,10 +58834,5,188,612,102,10,10 +58835,5,188,613,102,10,10 +58836,5,188,614,15,10,10 +58837,5,192,609,13,10,10 +58838,5,192,610,204,10,10 +58839,5,192,611,204,10,10 +58840,5,192,612,102,10,10 +58841,5,192,613,102,10,10 +58842,5,192,614,15,10,10 +58843,5,201,609,13,10,10 +58844,5,201,610,204,10,10 +58845,5,201,611,204,10,10 +58846,5,201,612,102,10,10 +58847,5,201,613,102,10,10 +58848,5,201,614,15,10,10 +58849,5,205,609,48,15,15 +58850,5,205,610,81,15,15 +58851,5,205,611,63,15,15 +58852,5,205,612,63,15,15 +58853,5,205,613,49,15,15 +58854,5,206,609,48,15,15 +58855,5,206,610,81,15,15 +58856,5,206,611,63,15,15 +58857,5,206,612,63,15,15 +58858,5,206,613,49,15,15 +58859,5,209,609,48,15,15 +58860,5,209,610,81,15,15 +58861,5,209,611,63,15,15 +58862,5,209,612,63,15,15 +58863,5,209,613,49,15,15 +58864,5,210,609,48,15,15 +58865,5,210,610,81,15,15 +58866,5,210,611,63,15,15 +58867,5,210,612,63,15,15 +58868,5,210,613,49,15,15 +58869,5,222,609,48,15,15 +58870,5,222,610,81,15,15 +58871,5,222,611,63,15,15 +58872,5,222,612,63,15,15 +58873,5,222,613,49,15,15 +58874,5,223,609,48,15,15 +58875,5,223,610,81,15,15 +58876,5,223,611,63,15,15 +58877,5,223,612,63,15,15 +58878,5,223,613,49,15,15 +58879,5,236,609,13,10,10 +58880,5,236,610,204,10,10 +58881,5,236,611,204,10,10 +58882,5,236,612,102,10,10 +58883,5,236,613,102,10,10 +58884,5,236,614,15,10,10 +58885,5,241,609,13,10,10 +58886,5,241,610,204,10,10 +58887,5,241,611,204,10,10 +58888,5,241,612,102,10,10 +58889,5,241,613,102,10,10 +58890,5,241,614,15,10,10 +58891,5,243,609,13,10,10 +58892,5,243,610,204,10,10 +58893,5,243,611,204,10,10 +58894,5,243,612,102,10,10 +58895,5,243,613,102,10,10 +58896,5,243,614,15,10,10 +58897,5,251,609,13,10,10 +58898,5,251,610,204,10,10 +58899,5,251,611,204,10,10 +58900,5,251,612,102,10,10 +58901,5,251,613,102,10,10 +58902,5,251,614,15,10,10 +58903,5,252,609,13,10,10 +58904,5,252,610,204,10,10 +58905,5,252,611,204,10,10 +58906,5,252,612,102,10,10 +58907,5,252,613,102,10,10 +58908,5,252,614,15,10,10 +58909,5,184,609,21,10,10 +58910,5,184,610,214,10,10 +58911,5,184,611,214,10,10 +58912,5,184,612,190,10,10 +58913,5,184,613,190,10,10 +58914,5,184,614,190,10,10 +58915,5,189,609,21,10,10 +58916,5,189,610,214,10,10 +58917,5,189,611,214,10,10 +58918,5,189,612,190,10,10 +58919,5,189,613,190,10,10 +58920,5,189,614,190,10,10 +58921,5,798,609,48,15,15 +58922,5,798,610,81,15,15 +58923,5,798,611,63,15,15 +58924,5,798,612,63,15,15 +58925,5,798,613,49,15,15 +58926,5,211,609,21,10,10 +58927,5,211,610,214,10,10 +58928,5,211,611,214,10,10 +58929,5,211,612,190,10,10 +58930,5,211,613,190,10,10 +58931,5,211,614,190,10,10 +58932,5,800,609,21,10,10 +58933,5,800,610,214,10,10 +58934,5,800,611,214,10,10 +58935,5,800,612,190,10,10 +58936,5,800,613,190,10,10 +58937,5,800,614,190,10,10 +58938,5,242,609,48,15,15 +58939,5,242,610,81,15,15 +58940,5,242,611,63,15,15 +58941,5,242,612,63,15,15 +58942,5,242,613,49,15,15 +58943,5,249,609,21,10,10 +58944,5,249,610,214,10,10 +58945,5,249,611,214,10,10 +58946,5,249,612,190,10,10 +58947,5,249,613,190,10,10 +58948,5,249,614,190,10,10 +58949,5,204,609,48,15,15 +58950,5,204,610,81,15,15 +58951,5,204,611,63,15,15 +58952,5,204,612,63,15,15 +58953,5,204,613,49,15,15 +58954,5,287,599,48,15,15 +58955,5,287,600,48,15,15 +58956,5,287,601,63,15,15 +58957,5,287,602,63,15,15 +58958,5,287,603,49,15,15 +58959,5,288,599,48,15,15 +58960,5,288,600,48,15,15 +58961,5,288,601,63,15,15 +58962,5,288,602,63,15,15 +58963,5,288,603,49,15,15 +58964,5,185,587,13,10,10 +58965,5,185,588,13,10,10 +58966,5,185,589,14,10,10 +58967,5,185,590,102,10,10 +58968,5,185,591,102,10,10 +58969,5,185,592,15,10,10 +58970,5,187,587,13,10,10 +58971,5,187,588,13,10,10 +58972,5,187,589,14,10,10 +58973,5,187,590,102,10,10 +58974,5,187,591,102,10,10 +58975,5,187,592,15,10,10 +58976,5,188,587,13,10,10 +58977,5,188,588,13,10,10 +58978,5,188,589,14,10,10 +58979,5,188,590,102,10,10 +58980,5,188,591,102,10,10 +58981,5,188,592,15,10,10 +58982,5,192,587,13,10,10 +58983,5,192,588,13,10,10 +58984,5,192,589,14,10,10 +58985,5,192,590,102,10,10 +58986,5,192,591,102,10,10 +58987,5,192,592,15,10,10 +58988,5,201,587,13,10,10 +58989,5,201,588,13,10,10 +58990,5,201,589,14,10,10 +58991,5,201,590,102,10,10 +58992,5,201,591,102,10,10 +58993,5,201,592,15,10,10 +58994,5,205,599,48,15,15 +58995,5,205,600,48,15,15 +58996,5,205,601,63,15,15 +58997,5,205,602,63,15,15 +58998,5,205,603,49,15,15 +58999,5,206,599,48,15,15 +59000,5,206,600,48,15,15 +59001,5,206,601,63,15,15 +59002,5,206,602,63,15,15 +59003,5,206,603,49,15,15 +59004,5,209,599,48,15,15 +59005,5,209,600,48,15,15 +59006,5,209,601,63,15,15 +59007,5,209,602,63,15,15 +59008,5,209,603,49,15,15 +59009,5,210,599,48,15,15 +59010,5,210,600,48,15,15 +59011,5,210,601,63,15,15 +59012,5,210,602,63,15,15 +59013,5,210,603,49,15,15 +59014,5,222,599,48,15,15 +59015,5,222,600,48,15,15 +59016,5,222,601,63,15,15 +59017,5,222,602,63,15,15 +59018,5,222,603,49,15,15 +59019,5,223,599,48,15,15 +59020,5,223,600,48,15,15 +59021,5,223,601,63,15,15 +59022,5,223,602,63,15,15 +59023,5,223,603,49,15,15 +59024,5,236,587,13,10,10 +59025,5,236,588,13,10,10 +59026,5,236,589,14,10,10 +59027,5,236,590,102,10,10 +59028,5,236,591,102,10,10 +59029,5,236,592,15,10,10 +59030,5,241,587,13,10,10 +59031,5,241,588,13,10,10 +59032,5,241,589,14,10,10 +59033,5,241,590,102,10,10 +59034,5,241,591,102,10,10 +59035,5,241,592,15,10,10 +59036,5,243,587,13,10,10 +59037,5,243,588,13,10,10 +59038,5,243,589,14,10,10 +59039,5,243,590,102,10,10 +59040,5,243,591,102,10,10 +59041,5,243,592,15,10,10 +59042,5,251,587,13,10,10 +59043,5,251,588,13,10,10 +59044,5,251,589,14,10,10 +59045,5,251,590,102,10,10 +59046,5,251,591,102,10,10 +59047,5,251,592,15,10,10 +59048,5,252,587,13,10,10 +59049,5,252,588,13,10,10 +59050,5,252,589,14,10,10 +59051,5,252,590,102,10,10 +59052,5,252,591,102,10,10 +59053,5,252,592,15,10,10 +59054,5,184,587,21,10,10 +59055,5,184,588,21,10,10 +59056,5,184,589,21,10,10 +59057,5,184,590,190,10,10 +59058,5,184,591,190,10,10 +59059,5,184,592,190,10,10 +59060,5,189,587,21,10,10 +59061,5,189,588,21,10,10 +59062,5,189,589,21,10,10 +59063,5,189,590,190,10,10 +59064,5,189,591,190,10,10 +59065,5,189,592,190,10,10 +59066,5,798,599,48,15,15 +59067,5,798,600,48,15,15 +59068,5,798,601,63,15,15 +59069,5,798,602,63,15,15 +59070,5,798,603,49,15,15 +59071,5,211,587,21,10,10 +59072,5,211,588,21,10,10 +59073,5,211,589,21,10,10 +59074,5,211,590,190,10,10 +59075,5,211,591,190,10,10 +59076,5,211,592,190,10,10 +59077,5,800,587,21,10,10 +59078,5,800,588,21,10,10 +59079,5,800,589,21,10,10 +59080,5,800,590,190,10,10 +59081,5,800,591,190,10,10 +59082,5,800,592,190,10,10 +59083,5,242,599,48,15,15 +59084,5,242,600,48,15,15 +59085,5,242,601,63,15,15 +59086,5,242,602,63,15,15 +59087,5,242,603,49,15,15 +59088,5,249,587,21,10,10 +59089,5,249,588,21,10,10 +59090,5,249,589,21,10,10 +59091,5,249,590,190,10,10 +59092,5,249,591,190,10,10 +59093,5,249,592,190,10,10 +59094,5,204,599,48,15,15 +59095,5,204,600,48,15,15 +59096,5,204,601,63,15,15 +59097,5,204,602,63,15,15 +59098,5,204,603,49,15,15 +59099,5,287,604,48,15,15 +59100,5,287,605,48,15,15 +59101,5,287,606,63,15,15 +59102,5,287,607,63,15,15 +59103,5,287,608,49,15,15 +59104,5,288,604,48,15,15 +59105,5,288,605,48,15,15 +59106,5,288,606,63,15,15 +59107,5,288,607,63,15,15 +59108,5,288,608,49,15,15 +59109,5,185,593,13,10,10 +59110,5,185,594,13,10,10 +59111,5,185,595,14,10,10 +59112,5,185,596,102,10,10 +59113,5,185,597,102,10,10 +59114,5,185,598,15,10,10 +59115,5,187,593,13,10,10 +59116,5,187,594,13,10,10 +59117,5,187,595,14,10,10 +59118,5,187,596,102,10,10 +59119,5,187,597,102,10,10 +59120,5,187,598,15,10,10 +59121,5,188,593,13,10,10 +59122,5,188,594,13,10,10 +59123,5,188,595,14,10,10 +59124,5,188,596,102,10,10 +59125,5,188,597,102,10,10 +59126,5,188,598,15,10,10 +59127,5,192,593,13,10,10 +59128,5,192,594,13,10,10 +59129,5,192,595,14,10,10 +59130,5,192,596,102,10,10 +59131,5,192,597,102,10,10 +59132,5,192,598,15,10,10 +59133,5,201,593,13,10,10 +59134,5,201,594,13,10,10 +59135,5,201,595,14,10,10 +59136,5,201,596,102,10,10 +59137,5,201,597,102,10,10 +59138,5,201,598,15,10,10 +59139,5,205,604,48,15,15 +59140,5,205,605,48,15,15 +59141,5,205,606,63,15,15 +59142,5,205,607,63,15,15 +59143,5,205,608,49,15,15 +59144,5,206,604,48,15,15 +59145,5,206,605,48,15,15 +59146,5,206,606,63,15,15 +59147,5,206,607,63,15,15 +59148,5,206,608,49,15,15 +59149,5,209,604,48,15,15 +59150,5,209,605,48,15,15 +59151,5,209,606,63,15,15 +59152,5,209,607,63,15,15 +59153,5,209,608,49,15,15 +59154,5,210,604,48,15,15 +59155,5,210,605,48,15,15 +59156,5,210,606,63,15,15 +59157,5,210,607,63,15,15 +59158,5,210,608,49,15,15 +59159,5,222,604,48,15,15 +59160,5,222,605,48,15,15 +59161,5,222,606,63,15,15 +59162,5,222,607,63,15,15 +59163,5,222,608,49,15,15 +59164,5,223,604,48,15,15 +59165,5,223,605,48,15,15 +59166,5,223,606,63,15,15 +59167,5,223,607,63,15,15 +59168,5,223,608,49,15,15 +59169,5,236,593,13,10,10 +59170,5,236,594,13,10,10 +59171,5,236,595,14,10,10 +59172,5,236,596,102,10,10 +59173,5,236,597,102,10,10 +59174,5,236,598,15,10,10 +59175,5,241,593,13,10,10 +59176,5,241,594,13,10,10 +59177,5,241,595,14,10,10 +59178,5,241,596,102,10,10 +59179,5,241,597,102,10,10 +59180,5,241,598,15,10,10 +59181,5,243,593,13,10,10 +59182,5,243,594,13,10,10 +59183,5,243,595,14,10,10 +59184,5,243,596,102,10,10 +59185,5,243,597,102,10,10 +59186,5,243,598,15,10,10 +59187,5,251,593,13,10,10 +59188,5,251,594,13,10,10 +59189,5,251,595,14,10,10 +59190,5,251,596,102,10,10 +59191,5,251,597,102,10,10 +59192,5,251,598,15,10,10 +59193,5,252,593,13,10,10 +59194,5,252,594,13,10,10 +59195,5,252,595,14,10,10 +59196,5,252,596,102,10,10 +59197,5,252,597,102,10,10 +59198,5,252,598,15,10,10 +59199,5,184,593,21,10,10 +59200,5,184,594,21,10,10 +59201,5,184,595,21,10,10 +59202,5,184,596,190,10,10 +59203,5,184,597,190,10,10 +59204,5,184,598,190,10,10 +59205,5,189,593,21,10,10 +59206,5,189,594,21,10,10 +59207,5,189,595,21,10,10 +59208,5,189,596,190,10,10 +59209,5,189,597,190,10,10 +59210,5,189,598,190,10,10 +59211,5,798,604,48,15,15 +59212,5,798,605,48,15,15 +59213,5,798,606,63,15,15 +59214,5,798,607,63,15,15 +59215,5,798,608,49,15,15 +59216,5,211,593,21,10,10 +59217,5,211,594,21,10,10 +59218,5,211,595,21,10,10 +59219,5,211,596,190,10,10 +59220,5,211,597,190,10,10 +59221,5,211,598,190,10,10 +59222,5,800,593,21,10,10 +59223,5,800,594,21,10,10 +59224,5,800,595,21,10,10 +59225,5,800,596,190,10,10 +59226,5,800,597,190,10,10 +59227,5,800,598,190,10,10 +59228,5,242,604,48,15,15 +59229,5,242,605,48,15,15 +59230,5,242,606,63,15,15 +59231,5,242,607,63,15,15 +59232,5,242,608,49,15,15 +59233,5,249,593,21,10,10 +59234,5,249,594,21,10,10 +59235,5,249,595,21,10,10 +59236,5,249,596,190,10,10 +59237,5,249,597,190,10,10 +59238,5,249,598,190,10,10 +59239,5,204,604,48,15,15 +59240,5,204,605,48,15,15 +59241,5,204,606,63,15,15 +59242,5,204,607,63,15,15 +59243,5,204,608,49,15,15 +59244,5,287,609,48,15,15 +59245,5,287,610,81,15,15 +59246,5,287,611,63,15,15 +59247,5,287,612,63,15,15 +59248,5,287,613,49,15,15 +59249,5,288,609,48,15,15 +59250,5,288,610,81,15,15 +59251,5,288,611,63,15,15 +59252,5,288,612,63,15,15 +59253,5,288,613,49,15,15 +59254,5,185,609,13,10,10 +59255,5,185,610,204,10,10 +59256,5,185,611,204,10,10 +59257,5,185,612,102,10,10 +59258,5,185,613,102,10,10 +59259,5,185,614,15,10,10 +59260,5,187,609,13,10,10 +59261,5,187,610,204,10,10 +59262,5,187,611,204,10,10 +59263,5,187,612,102,10,10 +59264,5,187,613,102,10,10 +59265,5,187,614,15,10,10 +59266,5,188,609,13,10,10 +59267,5,188,610,204,10,10 +59268,5,188,611,204,10,10 +59269,5,188,612,102,10,10 +59270,5,188,613,102,10,10 +59271,5,188,614,15,10,10 +59272,5,192,609,13,10,10 +59273,5,192,610,204,10,10 +59274,5,192,611,204,10,10 +59275,5,192,612,102,10,10 +59276,5,192,613,102,10,10 +59277,5,192,614,15,10,10 +59278,5,201,609,13,10,10 +59279,5,201,610,204,10,10 +59280,5,201,611,204,10,10 +59281,5,201,612,102,10,10 +59282,5,201,613,102,10,10 +59283,5,201,614,15,10,10 +59284,5,205,609,48,15,15 +59285,5,205,610,81,15,15 +59286,5,205,611,63,15,15 +59287,5,205,612,63,15,15 +59288,5,205,613,49,15,15 +59289,5,206,609,48,15,15 +59290,5,206,610,81,15,15 +59291,5,206,611,63,15,15 +59292,5,206,612,63,15,15 +59293,5,206,613,49,15,15 +59294,5,209,609,48,15,15 +59295,5,209,610,81,15,15 +59296,5,209,611,63,15,15 +59297,5,209,612,63,15,15 +59298,5,209,613,49,15,15 +59299,5,210,609,48,15,15 +59300,5,210,610,81,15,15 +59301,5,210,611,63,15,15 +59302,5,210,612,63,15,15 +59303,5,210,613,49,15,15 +59304,5,222,609,48,15,15 +59305,5,222,610,81,15,15 +59306,5,222,611,63,15,15 +59307,5,222,612,63,15,15 +59308,5,222,613,49,15,15 +59309,5,223,609,48,15,15 +59310,5,223,610,81,15,15 +59311,5,223,611,63,15,15 +59312,5,223,612,63,15,15 +59313,5,223,613,49,15,15 +59314,5,236,609,13,10,10 +59315,5,236,610,204,10,10 +59316,5,236,611,204,10,10 +59317,5,236,612,102,10,10 +59318,5,236,613,102,10,10 +59319,5,236,614,15,10,10 +59320,5,241,609,13,10,10 +59321,5,241,610,204,10,10 +59322,5,241,611,204,10,10 +59323,5,241,612,102,10,10 +59324,5,241,613,102,10,10 +59325,5,241,614,15,10,10 +59326,5,243,609,13,10,10 +59327,5,243,610,204,10,10 +59328,5,243,611,204,10,10 +59329,5,243,612,102,10,10 +59330,5,243,613,102,10,10 +59331,5,243,614,15,10,10 +59332,5,251,609,13,10,10 +59333,5,251,610,204,10,10 +59334,5,251,611,204,10,10 +59335,5,251,612,102,10,10 +59336,5,251,613,102,10,10 +59337,5,251,614,15,10,10 +59338,5,252,609,13,10,10 +59339,5,252,610,204,10,10 +59340,5,252,611,204,10,10 +59341,5,252,612,102,10,10 +59342,5,252,613,102,10,10 +59343,5,252,614,15,10,10 +59344,5,184,609,21,10,10 +59345,5,184,610,214,10,10 +59346,5,184,611,214,10,10 +59347,5,184,612,190,10,10 +59348,5,184,613,190,10,10 +59349,5,184,614,190,10,10 +59350,5,189,609,21,10,10 +59351,5,189,610,214,10,10 +59352,5,189,611,214,10,10 +59353,5,189,612,190,10,10 +59354,5,189,613,190,10,10 +59355,5,189,614,190,10,10 +59356,5,798,609,48,15,15 +59357,5,798,610,81,15,15 +59358,5,798,611,63,15,15 +59359,5,798,612,63,15,15 +59360,5,798,613,49,15,15 +59361,5,211,609,21,10,10 +59362,5,211,610,214,10,10 +59363,5,211,611,214,10,10 +59364,5,211,612,190,10,10 +59365,5,211,613,190,10,10 +59366,5,211,614,190,10,10 +59367,5,800,609,21,10,10 +59368,5,800,610,214,10,10 +59369,5,800,611,214,10,10 +59370,5,800,612,190,10,10 +59371,5,800,613,190,10,10 +59372,5,800,614,190,10,10 +59373,5,242,609,48,15,15 +59374,5,242,610,81,15,15 +59375,5,242,611,63,15,15 +59376,5,242,612,63,15,15 +59377,5,242,613,49,15,15 +59378,5,249,609,21,10,10 +59379,5,249,610,214,10,10 +59380,5,249,611,214,10,10 +59381,5,249,612,190,10,10 +59382,5,249,613,190,10,10 +59383,5,249,614,190,10,10 +59384,5,204,609,48,15,15 +59385,5,204,610,81,15,15 +59386,5,204,611,63,15,15 +59387,5,204,612,63,15,15 +59388,5,204,613,49,15,15 +59389,4,287,599,48,15,15 +59390,4,287,600,48,15,15 +59391,4,287,601,63,15,15 +59392,4,287,602,63,15,15 +59393,4,287,603,49,15,15 +59394,4,288,599,48,15,15 +59395,4,288,600,48,15,15 +59396,4,288,601,63,15,15 +59397,4,288,602,63,15,15 +59398,4,288,603,49,15,15 +59399,4,185,587,10,10,10 +59400,4,185,588,10,10,10 +59401,4,185,589,11,10,10 +59402,4,185,590,102,10,10 +59403,4,185,591,102,10,10 +59404,4,185,592,12,10,10 +59405,4,187,587,10,10,10 +59406,4,187,588,10,10,10 +59407,4,187,589,11,10,10 +59408,4,187,590,102,10,10 +59409,4,187,591,102,10,10 +59410,4,187,592,12,10,10 +59411,4,188,587,10,10,10 +59412,4,188,588,10,10,10 +59413,4,188,589,11,10,10 +59414,4,188,590,102,10,10 +59415,4,188,591,102,10,10 +59416,4,188,592,12,10,10 +59417,4,192,587,10,10,10 +59418,4,192,588,10,10,10 +59419,4,192,589,11,10,10 +59420,4,192,590,102,10,10 +59421,4,192,591,102,10,10 +59422,4,192,592,12,10,10 +59423,4,201,587,10,10,10 +59424,4,201,588,10,10,10 +59425,4,201,589,11,10,10 +59426,4,201,590,102,10,10 +59427,4,201,591,102,10,10 +59428,4,201,592,12,10,10 +59429,4,205,599,48,15,15 +59430,4,205,600,48,15,15 +59431,4,205,601,63,15,15 +59432,4,205,602,63,15,15 +59433,4,205,603,49,15,15 +59434,4,206,599,48,15,15 +59435,4,206,600,48,15,15 +59436,4,206,601,63,15,15 +59437,4,206,602,63,15,15 +59438,4,206,603,49,15,15 +59439,4,209,599,48,15,15 +59440,4,209,600,48,15,15 +59441,4,209,601,63,15,15 +59442,4,209,602,63,15,15 +59443,4,209,603,49,15,15 +59444,4,210,599,48,15,15 +59445,4,210,600,48,15,15 +59446,4,210,601,63,15,15 +59447,4,210,602,63,15,15 +59448,4,210,603,49,15,15 +59449,4,222,599,48,15,15 +59450,4,222,600,48,15,15 +59451,4,222,601,63,15,15 +59452,4,222,602,63,15,15 +59453,4,222,603,49,15,15 +59454,4,223,599,48,15,15 +59455,4,223,600,48,15,15 +59456,4,223,601,63,15,15 +59457,4,223,602,63,15,15 +59458,4,223,603,49,15,15 +59459,4,236,587,10,10,10 +59460,4,236,588,10,10,10 +59461,4,236,589,11,10,10 +59462,4,236,590,102,10,10 +59463,4,236,591,102,10,10 +59464,4,236,592,12,10,10 +59465,4,241,587,10,10,10 +59466,4,241,588,10,10,10 +59467,4,241,589,11,10,10 +59468,4,241,590,102,10,10 +59469,4,241,591,102,10,10 +59470,4,241,592,12,10,10 +59471,4,243,587,10,10,10 +59472,4,243,588,10,10,10 +59473,4,243,589,11,10,10 +59474,4,243,590,102,10,10 +59475,4,243,591,102,10,10 +59476,4,243,592,12,10,10 +59477,4,251,587,10,10,10 +59478,4,251,588,10,10,10 +59479,4,251,589,11,10,10 +59480,4,251,590,102,10,10 +59481,4,251,591,102,10,10 +59482,4,251,592,12,10,10 +59483,4,252,587,10,10,10 +59484,4,252,588,10,10,10 +59485,4,252,589,11,10,10 +59486,4,252,590,102,10,10 +59487,4,252,591,102,10,10 +59488,4,252,592,12,10,10 +59489,4,184,587,21,10,10 +59490,4,184,588,21,10,10 +59491,4,184,589,21,10,10 +59492,4,184,590,190,10,10 +59493,4,184,591,190,10,10 +59494,4,184,592,190,10,10 +59495,4,189,587,21,10,10 +59496,4,189,588,21,10,10 +59497,4,189,589,21,10,10 +59498,4,189,590,190,10,10 +59499,4,189,591,190,10,10 +59500,4,189,592,190,10,10 +59501,4,798,599,48,15,15 +59502,4,798,600,48,15,15 +59503,4,798,601,63,15,15 +59504,4,798,602,63,15,15 +59505,4,798,603,49,15,15 +59506,4,211,587,21,10,10 +59507,4,211,588,21,10,10 +59508,4,211,589,21,10,10 +59509,4,211,590,190,10,10 +59510,4,211,591,190,10,10 +59511,4,211,592,190,10,10 +59512,4,800,587,21,10,10 +59513,4,800,588,21,10,10 +59514,4,800,589,21,10,10 +59515,4,800,590,190,10,10 +59516,4,800,591,190,10,10 +59517,4,800,592,190,10,10 +59518,4,242,599,48,15,15 +59519,4,242,600,48,15,15 +59520,4,242,601,63,15,15 +59521,4,242,602,63,15,15 +59522,4,242,603,49,15,15 +59523,4,249,587,21,10,10 +59524,4,249,588,21,10,10 +59525,4,249,589,21,10,10 +59526,4,249,590,190,10,10 +59527,4,249,591,190,10,10 +59528,4,249,592,190,10,10 +59529,4,204,599,48,15,15 +59530,4,204,600,48,15,15 +59531,4,204,601,63,15,15 +59532,4,204,602,63,15,15 +59533,4,204,603,49,15,15 +59534,4,287,604,48,15,15 +59535,4,287,605,48,15,15 +59536,4,287,606,63,15,15 +59537,4,287,607,63,15,15 +59538,4,287,608,49,15,15 +59539,4,288,604,48,15,15 +59540,4,288,605,48,15,15 +59541,4,288,606,63,15,15 +59542,4,288,607,63,15,15 +59543,4,288,608,49,15,15 +59544,4,185,593,10,10,10 +59545,4,185,594,10,10,10 +59546,4,185,595,11,10,10 +59547,4,185,596,102,10,10 +59548,4,185,597,102,10,10 +59549,4,185,598,12,10,10 +59550,4,187,593,10,10,10 +59551,4,187,594,10,10,10 +59552,4,187,595,11,10,10 +59553,4,187,596,102,10,10 +59554,4,187,597,102,10,10 +59555,4,187,598,12,10,10 +59556,4,188,593,10,10,10 +59557,4,188,594,10,10,10 +59558,4,188,595,11,10,10 +59559,4,188,596,102,10,10 +59560,4,188,597,102,10,10 +59561,4,188,598,12,10,10 +59562,4,192,593,10,10,10 +59563,4,192,594,10,10,10 +59564,4,192,595,11,10,10 +59565,4,192,596,102,10,10 +59566,4,192,597,102,10,10 +59567,4,192,598,12,10,10 +59568,4,201,593,10,10,10 +59569,4,201,594,10,10,10 +59570,4,201,595,11,10,10 +59571,4,201,596,102,10,10 +59572,4,201,597,102,10,10 +59573,4,201,598,12,10,10 +59574,4,205,604,48,15,15 +59575,4,205,605,48,15,15 +59576,4,205,606,63,15,15 +59577,4,205,607,63,15,15 +59578,4,205,608,49,15,15 +59579,4,206,604,48,15,15 +59580,4,206,605,48,15,15 +59581,4,206,606,63,15,15 +59582,4,206,607,63,15,15 +59583,4,206,608,49,15,15 +59584,4,209,604,48,15,15 +59585,4,209,605,48,15,15 +59586,4,209,606,63,15,15 +59587,4,209,607,63,15,15 +59588,4,209,608,49,15,15 +59589,4,210,604,48,15,15 +59590,4,210,605,48,15,15 +59591,4,210,606,63,15,15 +59592,4,210,607,63,15,15 +59593,4,210,608,49,15,15 +59594,4,222,604,48,15,15 +59595,4,222,605,48,15,15 +59596,4,222,606,63,15,15 +59597,4,222,607,63,15,15 +59598,4,222,608,49,15,15 +59599,4,223,604,48,15,15 +59600,4,223,605,48,15,15 +59601,4,223,606,63,15,15 +59602,4,223,607,63,15,15 +59603,4,223,608,49,15,15 +59604,4,236,593,10,10,10 +59605,4,236,594,10,10,10 +59606,4,236,595,11,10,10 +59607,4,236,596,102,10,10 +59608,4,236,597,102,10,10 +59609,4,236,598,12,10,10 +59610,4,241,593,10,10,10 +59611,4,241,594,10,10,10 +59612,4,241,595,11,10,10 +59613,4,241,596,102,10,10 +59614,4,241,597,102,10,10 +59615,4,241,598,12,10,10 +59616,4,243,593,10,10,10 +59617,4,243,594,10,10,10 +59618,4,243,595,11,10,10 +59619,4,243,596,102,10,10 +59620,4,243,597,102,10,10 +59621,4,243,598,12,10,10 +59622,4,251,593,10,10,10 +59623,4,251,594,10,10,10 +59624,4,251,595,11,10,10 +59625,4,251,596,102,10,10 +59626,4,251,597,102,10,10 +59627,4,251,598,12,10,10 +59628,4,252,593,10,10,10 +59629,4,252,594,10,10,10 +59630,4,252,595,11,10,10 +59631,4,252,596,102,10,10 +59632,4,252,597,102,10,10 +59633,4,252,598,12,10,10 +59634,4,184,593,21,10,10 +59635,4,184,594,21,10,10 +59636,4,184,595,21,10,10 +59637,4,184,596,190,10,10 +59638,4,184,597,190,10,10 +59639,4,184,598,190,10,10 +59640,4,189,593,21,10,10 +59641,4,189,594,21,10,10 +59642,4,189,595,21,10,10 +59643,4,189,596,190,10,10 +59644,4,189,597,190,10,10 +59645,4,189,598,190,10,10 +59646,4,798,604,48,15,15 +59647,4,798,605,48,15,15 +59648,4,798,606,63,15,15 +59649,4,798,607,63,15,15 +59650,4,798,608,49,15,15 +59651,4,211,593,21,10,10 +59652,4,211,594,21,10,10 +59653,4,211,595,21,10,10 +59654,4,211,596,190,10,10 +59655,4,211,597,190,10,10 +59656,4,211,598,190,10,10 +59657,4,800,593,21,10,10 +59658,4,800,594,21,10,10 +59659,4,800,595,21,10,10 +59660,4,800,596,190,10,10 +59661,4,800,597,190,10,10 +59662,4,800,598,190,10,10 +59663,4,242,604,48,15,15 +59664,4,242,605,48,15,15 +59665,4,242,606,63,15,15 +59666,4,242,607,63,15,15 +59667,4,242,608,49,15,15 +59668,4,249,593,21,10,10 +59669,4,249,594,21,10,10 +59670,4,249,595,21,10,10 +59671,4,249,596,190,10,10 +59672,4,249,597,190,10,10 +59673,4,249,598,190,10,10 +59674,4,204,604,48,15,15 +59675,4,204,605,48,15,15 +59676,4,204,606,63,15,15 +59677,4,204,607,63,15,15 +59678,4,204,608,49,15,15 +59679,4,287,609,48,15,15 +59680,4,287,610,81,15,15 +59681,4,287,611,63,15,15 +59682,4,287,612,63,15,15 +59683,4,287,613,49,15,15 +59684,4,288,609,48,15,15 +59685,4,288,610,81,15,15 +59686,4,288,611,63,15,15 +59687,4,288,612,63,15,15 +59688,4,288,613,49,15,15 +59689,4,185,609,10,10,10 +59690,4,185,610,204,10,10 +59691,4,185,611,204,10,10 +59692,4,185,612,102,10,10 +59693,4,185,613,102,10,10 +59694,4,185,614,12,10,10 +59695,4,187,609,10,10,10 +59696,4,187,610,204,10,10 +59697,4,187,611,204,10,10 +59698,4,187,612,102,10,10 +59699,4,187,613,102,10,10 +59700,4,187,614,12,10,10 +59701,4,188,609,10,10,10 +59702,4,188,610,204,10,10 +59703,4,188,611,204,10,10 +59704,4,188,612,102,10,10 +59705,4,188,613,102,10,10 +59706,4,188,614,12,10,10 +59707,4,192,609,10,10,10 +59708,4,192,610,204,10,10 +59709,4,192,611,204,10,10 +59710,4,192,612,102,10,10 +59711,4,192,613,102,10,10 +59712,4,192,614,12,10,10 +59713,4,201,609,10,10,10 +59714,4,201,610,204,10,10 +59715,4,201,611,204,10,10 +59716,4,201,612,102,10,10 +59717,4,201,613,102,10,10 +59718,4,201,614,12,10,10 +59719,4,205,609,48,15,15 +59720,4,205,610,81,15,15 +59721,4,205,611,63,15,15 +59722,4,205,612,63,15,15 +59723,4,205,613,49,15,15 +59724,4,206,609,48,15,15 +59725,4,206,610,81,15,15 +59726,4,206,611,63,15,15 +59727,4,206,612,63,15,15 +59728,4,206,613,49,15,15 +59729,4,209,609,48,15,15 +59730,4,209,610,81,15,15 +59731,4,209,611,63,15,15 +59732,4,209,612,63,15,15 +59733,4,209,613,49,15,15 +59734,4,210,609,48,15,15 +59735,4,210,610,81,15,15 +59736,4,210,611,63,15,15 +59737,4,210,612,63,15,15 +59738,4,210,613,49,15,15 +59739,4,222,609,48,15,15 +59740,4,222,610,81,15,15 +59741,4,222,611,63,15,15 +59742,4,222,612,63,15,15 +59743,4,222,613,49,15,15 +59744,4,223,609,48,15,15 +59745,4,223,610,81,15,15 +59746,4,223,611,63,15,15 +59747,4,223,612,63,15,15 +59748,4,223,613,49,15,15 +59749,4,236,609,10,10,10 +59750,4,236,610,204,10,10 +59751,4,236,611,204,10,10 +59752,4,236,612,102,10,10 +59753,4,236,613,102,10,10 +59754,4,236,614,12,10,10 +59755,4,241,609,10,10,10 +59756,4,241,610,204,10,10 +59757,4,241,611,204,10,10 +59758,4,241,612,102,10,10 +59759,4,241,613,102,10,10 +59760,4,241,614,12,10,10 +59761,4,243,609,10,10,10 +59762,4,243,610,204,10,10 +59763,4,243,611,204,10,10 +59764,4,243,612,102,10,10 +59765,4,243,613,102,10,10 +59766,4,243,614,12,10,10 +59767,4,251,609,10,10,10 +59768,4,251,610,204,10,10 +59769,4,251,611,204,10,10 +59770,4,251,612,102,10,10 +59771,4,251,613,102,10,10 +59772,4,251,614,12,10,10 +59773,4,252,609,10,10,10 +59774,4,252,610,204,10,10 +59775,4,252,611,204,10,10 +59776,4,252,612,102,10,10 +59777,4,252,613,102,10,10 +59778,4,252,614,12,10,10 +59779,4,184,609,21,10,10 +59780,4,184,610,214,10,10 +59781,4,184,611,214,10,10 +59782,4,184,612,190,10,10 +59783,4,184,613,190,10,10 +59784,4,184,614,190,10,10 +59785,4,189,609,21,10,10 +59786,4,189,610,214,10,10 +59787,4,189,611,214,10,10 +59788,4,189,612,190,10,10 +59789,4,189,613,190,10,10 +59790,4,189,614,190,10,10 +59791,4,798,609,48,15,15 +59792,4,798,610,81,15,15 +59793,4,798,611,63,15,15 +59794,4,798,612,63,15,15 +59795,4,798,613,49,15,15 +59796,4,211,609,21,10,10 +59797,4,211,610,214,10,10 +59798,4,211,611,214,10,10 +59799,4,211,612,190,10,10 +59800,4,211,613,190,10,10 +59801,4,211,614,190,10,10 +59802,4,800,609,21,10,10 +59803,4,800,610,214,10,10 +59804,4,800,611,214,10,10 +59805,4,800,612,190,10,10 +59806,4,800,613,190,10,10 +59807,4,800,614,190,10,10 +59808,4,242,609,48,15,15 +59809,4,242,610,81,15,15 +59810,4,242,611,63,15,15 +59811,4,242,612,63,15,15 +59812,4,242,613,49,15,15 +59813,4,249,609,21,10,10 +59814,4,249,610,214,10,10 +59815,4,249,611,214,10,10 +59816,4,249,612,190,10,10 +59817,4,249,613,190,10,10 +59818,4,249,614,190,10,10 +59819,4,204,609,48,15,15 +59820,4,204,610,81,15,15 +59821,4,204,611,63,15,15 +59822,4,204,612,63,15,15 +59823,4,204,613,49,15,15 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 7b21554f..109817ba 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -655,3 +655,6 @@ location_area_id,local_language_id,name 795,9,Roaming Johto 796,9,Roaming Hoenn 797,9,Roaming Sinnoh +798,9,Azalea Town +799,9,Goldenrod City +800,9,Mahogany City diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 37b64f78..d26bd08c 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -687,3 +687,6 @@ id,location_id,game_index,identifier 795,800,0,roaming-johto-area 796,801,0,roaming-hoenn-area 797,802,0,roaming-sinnoh-area +798,228,0,azalea-town-area +799,229,0,goldenrod-city-area +800,230,0,mahogany-city-area From 8b11fda6f8b9b9c961832b9aaa0bb35d6bb5a27a Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Mon, 8 Mar 2021 01:51:18 +0000 Subject: [PATCH 008/113] Add missing special encounters - Snorlax in GSC, HGSS - Groudon, Kyogre and Rayquaza in RSE - Removed unused Goldenrod city area location area - Changed location area prose to some areas to correct duplicate location name in display - Added proper default values for story-progress condition - Added new condition 'other' for weirder conditions - Added missing areas for legendary encounters in Hoenn - Added missing locations for legendary encounters in Hoenn --- data/v2/csv/encounter_condition_prose.csv | 1 + data/v2/csv/encounter_condition_value_map.csv | 2 ++ .../csv/encounter_condition_value_prose.csv | 4 ++++ data/v2/csv/encounter_condition_values.csv | 6 +++++- data/v2/csv/encounter_conditions.csv | 1 + data/v2/csv/encounters.csv | 14 ++++++++++++++ data/v2/csv/location_area_prose.csv | 5 ++++- data/v2/csv/location_areas.csv | 19 +++++++++++-------- data/v2/csv/location_names.csv | 6 ++++++ data/v2/csv/locations.csv | 2 ++ 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 827164ca..8139e8e9 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -20,3 +20,4 @@ encounter_condition_id,local_language_id,name 7,9,Chosen Starter 8,9,Chosen dialogue at the news report 9,9,Story Progress +10,9,Miscellaneous diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index bcd9e971..138da3ed 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -16971,3 +16971,5 @@ encounter_id,encounter_condition_value_id 58140,35 58138,28 58140,27 +59829,39 +59830,39 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 81187657..0844fbd6 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -54,3 +54,7 @@ encounter_condition_value_id,local_language_id,name 33,9,Met Tornadus or Thundurus in a cutscene 34,9,Beat the Elite 4 for the second time 35,9,Enter the Hall of Fame +36,9,None +37,9,Acquired National Pokédex +38,9,None +39,9,Beat the Pokémon league after knocking out Snorlax at Route 11 diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index c59f2fd2..e34afa7e 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -27,10 +27,14 @@ id,encounter_condition_id,identifier,is_default 26,7,starter-froakie,0 27,8,tv-option-blue,1 28,8,tv-option-red,0 -29,9,story-progress-awakened-beasts,1 +29,9,story-progress-awakened-beasts,0 30,9,story-progress-beat-galactic-coronet,0 31,9,story-progress-oak-eterna-city,0 32,9,story-progress-vermilion-copycat,0 33,9,story-progress-met-tornadus-thundurus,0 34,9,story-progress-beat-elite-four-round-two,0 35,9,story-progress-hall-of-fame,0 +36,9,story-progress-none,1 +37,9,story-progress-national-dex,0 +38,10,other-none,1 +39,10,other-snorlax-11-beat-league,0 diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index 3ac3e218..7bc8a2ad 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -8,3 +8,4 @@ id,identifier 7,starter 8,tv-option 9,story-progress +10,other diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 6bc9ba10..85f36a29 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -56111,3 +56111,17 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 59821,4,204,611,63,15,15 59822,4,204,612,63,15,15 59823,4,204,613,49,15,15 +59824,4,282,581,143,50,50 +59825,5,282,581,143,50,50 +59826,6,282,582,143,50,50 +59827,15,305,584,143,50,50 +59828,16,305,584,143,50,50 +59829,15,276,584,143,50,50 +59830,16,276,584,143,50,50 +59831,7,801,565,383,45,45 +59832,8,801,565,382,45,45 +59833,9,802,566,383,70,70 +59834,9,803,566,382,70,70 +59835,7,804,565,384,70,70 +59836,8,804,565,384,70,70 +59837,9,804,566,384,70,70 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 109817ba..aeed77ca 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -656,5 +656,8 @@ location_area_id,local_language_id,name 796,9,Roaming Hoenn 797,9,Roaming Sinnoh 798,9,Azalea Town -799,9,Goldenrod City 800,9,Mahogany City +801,9,Cave of Origin B4F +802,9,Terra Cave +803,9,Marine Cave +804,9,Sky Pillar Apex diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index d26bd08c..a70d40a1 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -682,11 +682,14 @@ id,location_id,game_index,identifier 790,153,0,poke-mart 791,153,0,pokemon-center 792,349,0,west-gate -793,139,0,bell-tower-roof -794,799,0,roaming-kanto-area -795,800,0,roaming-johto-area -796,801,0,roaming-hoenn-area -797,802,0,roaming-sinnoh-area -798,228,0,azalea-town-area -799,229,0,goldenrod-city-area -800,230,0,mahogany-city-area +793,139,0,roof +794,799,0,area +795,800,0,area +796,801,0,area +797,802,0,area +798,228,0,area +800,230,0,area +801,443,0,b4f +802,803,0,area +803,804,0,area +804,448,0,apex diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index c1195bf4..a58e1ce2 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -3576,3 +3576,9 @@ location_id,local_language_id,name,subtitle 798,9,Malie City,Outer Cape 798,11,マリエシティ,はずれの岬 798,12,马利埃静市,市郊海角 +799,9,Roaming Kanto, +800,9,Roaming Johto, +801,9,Roaming Hoenn, +802,9,Roaming Sinnoh, +803,9,Terra Cave, +804,9,Marine Cave, diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index 3245851f..deb6dd48 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -784,3 +784,5 @@ id,region_id,identifier 800,2,roaming-johto 801,3,roaming-hoenn 802,4,roaming-sinnoh +803,3,terra-cave +804,3,marine-cave From 79841f23588aa69e88d579bdc62cff478bb082b7 Mon Sep 17 00:00:00 2001 From: Simply BLG <61010688+SimplyBLGDev@users.noreply.github.com> Date: Sun, 7 Mar 2021 23:32:06 -0300 Subject: [PATCH 009/113] Typo corrections for encounter_method_prose --- data/v2/csv/encounter_method_prose.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index b11cf47a..2ead64df 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -37,6 +37,6 @@ encounter_method_id,local_language_id,name 19,9,Receive egg as a gift 20,9,"Static encounter, only one chance" 21,9,Playing Pokéflute -22,9,Heabutting a low encounter rate tree -23,9,Heabutting a normal encounter rate tree -24,9,Heabutting a high encounter rate tree +22,9,Headbutting a low encounter rate tree +23,9,Headbutting a normal encounter rate tree +24,9,Headbutting a high encounter rate tree From 682b36298307d40df184ba4e1dbb7a803cc193de Mon Sep 17 00:00:00 2001 From: Simply BLG <61010688+SimplyBLGDev@users.noreply.github.com> Date: Sun, 7 Mar 2021 23:32:42 -0300 Subject: [PATCH 010/113] Typo corrections on encounter_methods --- data/v2/csv/encounter_methods.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index f05fbd4f..76f597fd 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -21,5 +21,5 @@ id,identifier,order 20,only-one,20 21,pokeflute,21 22,headbutt-low,22 -23,heabutt-normal,23 -24,heabutt-high,24 +23,headbutt-normal,23 +24,headbutt-high,24 From 0a2a72f1ea109c0dbb62e24a919a30c4ee76e743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 8 Mar 2021 22:48:16 +0100 Subject: [PATCH 011/113] feat: add hasura/examples/configuration --- apollo.config.js | 11 + docker-compose.yml | 21 + hasura/config.yaml | 6 + hasura/examples/alola_road_encounters.gql | 18 + hasura/examples/pokemon.gql | 65 +++ hasura/metadata/actions.graphql | 2 + hasura/metadata/actions.yaml | 6 + hasura/metadata/allow_list.yaml | 1 + hasura/metadata/cron_triggers.yaml | 1 + hasura/metadata/databases/databases.yaml | 161 +++++++ .../tables/public_pokemon_v2_ability.yaml | 50 ++ .../public_pokemon_v2_abilitychange.yaml | 25 + ...ic_pokemon_v2_abilitychangeeffecttext.yaml | 17 + .../public_pokemon_v2_abilityeffecttext.yaml | 17 + .../public_pokemon_v2_abilityflavortext.yaml | 20 + .../tables/public_pokemon_v2_abilityname.yaml | 17 + .../tables/public_pokemon_v2_berry.yaml | 28 ++ .../public_pokemon_v2_berryfirmness.yaml | 25 + .../public_pokemon_v2_berryfirmnessname.yaml | 17 + .../tables/public_pokemon_v2_berryflavor.yaml | 43 ++ .../public_pokemon_v2_berryflavormap.yaml | 17 + .../public_pokemon_v2_berryflavorname.yaml | 17 + .../public_pokemon_v2_characteristic.yaml | 22 + ..._pokemon_v2_characteristicdescription.yaml | 17 + .../public_pokemon_v2_contestcombo.yaml | 17 + .../public_pokemon_v2_contesteffect.yaml | 32 ++ ...ic_pokemon_v2_contesteffecteffecttext.yaml | 17 + ...ic_pokemon_v2_contesteffectflavortext.yaml | 17 + .../tables/public_pokemon_v2_contesttype.yaml | 32 ++ .../public_pokemon_v2_contesttypename.yaml | 17 + .../tables/public_pokemon_v2_egggroup.yaml | 25 + .../public_pokemon_v2_egggroupname.yaml | 17 + .../tables/public_pokemon_v2_encounter.yaml | 31 ++ .../public_pokemon_v2_encountercondition.yaml | 25 + ...lic_pokemon_v2_encounterconditionname.yaml | 17 + ...ic_pokemon_v2_encounterconditionvalue.yaml | 29 ++ ...pokemon_v2_encounterconditionvaluemap.yaml | 17 + ...okemon_v2_encounterconditionvaluename.yaml | 17 + .../public_pokemon_v2_encountermethod.yaml | 32 ++ ...public_pokemon_v2_encountermethodname.yaml | 17 + .../public_pokemon_v2_encounterslot.yaml | 25 + .../public_pokemon_v2_evolutionchain.yaml | 22 + .../public_pokemon_v2_evolutiontrigger.yaml | 25 + ...ublic_pokemon_v2_evolutiontriggername.yaml | 17 + .../tables/public_pokemon_v2_experience.yaml | 14 + .../tables/public_pokemon_v2_gender.yaml | 18 + .../tables/public_pokemon_v2_generation.yaml | 92 ++++ .../public_pokemon_v2_generationname.yaml | 17 + .../tables/public_pokemon_v2_growthrate.yaml | 39 ++ ...blic_pokemon_v2_growthratedescription.yaml | 17 + .../tables/public_pokemon_v2_item.yaml | 102 ++++ .../public_pokemon_v2_itemattribute.yaml | 32 ++ ...c_pokemon_v2_itemattributedescription.yaml | 17 + .../public_pokemon_v2_itemattributemap.yaml | 17 + .../public_pokemon_v2_itemattributename.yaml | 17 + .../public_pokemon_v2_itemcategory.yaml | 29 ++ .../public_pokemon_v2_itemcategoryname.yaml | 17 + .../public_pokemon_v2_itemeffecttext.yaml | 17 + .../public_pokemon_v2_itemflavortext.yaml | 20 + .../public_pokemon_v2_itemflingeffect.yaml | 25 + ..._pokemon_v2_itemflingeffecteffecttext.yaml | 17 + .../public_pokemon_v2_itemgameindex.yaml | 17 + .../tables/public_pokemon_v2_itemname.yaml | 17 + .../tables/public_pokemon_v2_itempocket.yaml | 25 + .../public_pokemon_v2_itempocketname.yaml | 17 + .../tables/public_pokemon_v2_itemsprites.yaml | 14 + .../tables/public_pokemon_v2_language.yaml | 438 ++++++++++++++++++ .../public_pokemon_v2_languagename.yaml | 17 + .../tables/public_pokemon_v2_location.yaml | 43 ++ .../public_pokemon_v2_locationarea.yaml | 36 ++ ..._pokemon_v2_locationareaencounterrate.yaml | 20 + .../public_pokemon_v2_locationareaname.yaml | 17 + .../public_pokemon_v2_locationgameindex.yaml | 17 + .../public_pokemon_v2_locationname.yaml | 17 + .../tables/public_pokemon_v2_machine.yaml | 23 + .../tables/public_pokemon_v2_move.yaml | 127 +++++ .../public_pokemon_v2_moveattribute.yaml | 32 ++ ...c_pokemon_v2_moveattributedescription.yaml | 17 + .../public_pokemon_v2_moveattributemap.yaml | 17 + .../public_pokemon_v2_moveattributename.yaml | 17 + .../public_pokemon_v2_movebattlestyle.yaml | 25 + ...public_pokemon_v2_movebattlestylename.yaml | 17 + .../tables/public_pokemon_v2_movechange.yaml | 23 + .../public_pokemon_v2_movedamageclass.yaml | 46 ++ ...pokemon_v2_movedamageclassdescription.yaml | 17 + ...public_pokemon_v2_movedamageclassname.yaml | 17 + .../tables/public_pokemon_v2_moveeffect.yaml | 39 ++ .../public_pokemon_v2_moveeffectchange.yaml | 25 + ...pokemon_v2_moveeffectchangeeffecttext.yaml | 17 + ...ublic_pokemon_v2_moveeffecteffecttext.yaml | 17 + .../public_pokemon_v2_moveflavortext.yaml | 20 + .../public_pokemon_v2_movelearnmethod.yaml | 39 ++ ...pokemon_v2_movelearnmethoddescription.yaml | 17 + ...public_pokemon_v2_movelearnmethodname.yaml | 17 + .../tables/public_pokemon_v2_movemeta.yaml | 20 + .../public_pokemon_v2_movemetaailment.yaml | 25 + ...public_pokemon_v2_movemetaailmentname.yaml | 17 + .../public_pokemon_v2_movemetacategory.yaml | 25 + ...okemon_v2_movemetacategorydescription.yaml | 17 + .../public_pokemon_v2_movemetastatchange.yaml | 17 + .../tables/public_pokemon_v2_movename.yaml | 17 + .../tables/public_pokemon_v2_movetarget.yaml | 32 ++ ...blic_pokemon_v2_movetargetdescription.yaml | 17 + .../public_pokemon_v2_movetargetname.yaml | 17 + .../tables/public_pokemon_v2_nature.yaml | 45 ++ ...okemon_v2_naturebattlestylepreference.yaml | 17 + .../tables/public_pokemon_v2_naturename.yaml | 17 + ...ublic_pokemon_v2_naturepokeathlonstat.yaml | 17 + .../tables/public_pokemon_v2_palpark.yaml | 17 + .../tables/public_pokemon_v2_palparkarea.yaml | 25 + .../public_pokemon_v2_palparkareaname.yaml | 17 + .../public_pokemon_v2_pokeathlonstat.yaml | 25 + .../public_pokemon_v2_pokeathlonstatname.yaml | 17 + .../tables/public_pokemon_v2_pokedex.yaml | 43 ++ .../public_pokemon_v2_pokedexdescription.yaml | 17 + .../tables/public_pokemon_v2_pokedexname.yaml | 17 + ...public_pokemon_v2_pokedexversiongroup.yaml | 17 + .../tables/public_pokemon_v2_pokemon.yaml | 85 ++++ .../public_pokemon_v2_pokemonability.yaml | 17 + .../public_pokemon_v2_pokemoncolor.yaml | 25 + .../public_pokemon_v2_pokemoncolorname.yaml | 17 + .../public_pokemon_v2_pokemondexnumber.yaml | 17 + .../public_pokemon_v2_pokemonegggroup.yaml | 17 + .../public_pokemon_v2_pokemonevolution.yaml | 44 ++ .../tables/public_pokemon_v2_pokemonform.yaml | 46 ++ ...blic_pokemon_v2_pokemonformgeneration.yaml | 17 + .../public_pokemon_v2_pokemonformname.yaml | 17 + .../public_pokemon_v2_pokemonformsprites.yaml | 14 + .../public_pokemon_v2_pokemonformtype.yaml | 17 + .../public_pokemon_v2_pokemongameindex.yaml | 17 + .../public_pokemon_v2_pokemonhabitat.yaml | 25 + .../public_pokemon_v2_pokemonhabitatname.yaml | 17 + .../tables/public_pokemon_v2_pokemonitem.yaml | 20 + .../tables/public_pokemon_v2_pokemonmove.yaml | 23 + .../public_pokemon_v2_pokemonshape.yaml | 25 + .../public_pokemon_v2_pokemonshapename.yaml | 17 + .../public_pokemon_v2_pokemonspecies.yaml | 110 +++++ ..._pokemon_v2_pokemonspeciesdescription.yaml | 17 + ...c_pokemon_v2_pokemonspeciesflavortext.yaml | 20 + .../public_pokemon_v2_pokemonspeciesname.yaml | 17 + .../public_pokemon_v2_pokemonsprites.yaml | 14 + .../tables/public_pokemon_v2_pokemonstat.yaml | 17 + .../tables/public_pokemon_v2_pokemontype.yaml | 17 + .../public_pokemon_v2_pokemontypepast.yaml | 20 + .../tables/public_pokemon_v2_region.yaml | 46 ++ .../tables/public_pokemon_v2_regionname.yaml | 17 + .../tables/public_pokemon_v2_stat.yaml | 57 +++ .../tables/public_pokemon_v2_statname.yaml | 17 + .../public_pokemon_v2_supercontestcombo.yaml | 17 + .../public_pokemon_v2_supercontesteffect.yaml | 25 + ...kemon_v2_supercontesteffectflavortext.yaml | 17 + .../tables/public_pokemon_v2_type.yaml | 102 ++++ .../public_pokemon_v2_typeefficacy.yaml | 17 + .../public_pokemon_v2_typegameindex.yaml | 17 + .../tables/public_pokemon_v2_typename.yaml | 17 + .../tables/public_pokemon_v2_version.yaml | 57 +++ .../public_pokemon_v2_versiongroup.yaml | 113 +++++ ...okemon_v2_versiongroupmovelearnmethod.yaml | 17 + .../public_pokemon_v2_versiongroupregion.yaml | 17 + .../tables/public_pokemon_v2_versionname.yaml | 17 + hasura/metadata/query_collections.yaml | 1 + hasura/metadata/remote_schemas.yaml | 1 + hasura/metadata/version.yaml | 1 + 163 files changed, 4620 insertions(+) create mode 100644 apollo.config.js create mode 100644 hasura/config.yaml create mode 100644 hasura/examples/alola_road_encounters.gql create mode 100644 hasura/examples/pokemon.gql create mode 100644 hasura/metadata/actions.graphql create mode 100644 hasura/metadata/actions.yaml create mode 100644 hasura/metadata/allow_list.yaml create mode 100644 hasura/metadata/cron_triggers.yaml create mode 100644 hasura/metadata/databases/databases.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml create mode 100644 hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml create mode 100644 hasura/metadata/query_collections.yaml create mode 100644 hasura/metadata/remote_schemas.yaml create mode 100644 hasura/metadata/version.yaml diff --git a/apollo.config.js b/apollo.config.js new file mode 100644 index 00000000..313c996f --- /dev/null +++ b/apollo.config.js @@ -0,0 +1,11 @@ +module.exports = { + client: { + service: { + name: "pokeapi", + url: "http://localhost:8080/v1/graphql", + headers: { + "x-hasura-admin-secret": "pokemon", + }, + }, + }, +}; diff --git a/docker-compose.yml b/docker-compose.yml index 82ca055a..a1fb2307 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: image: redis:alpine volumes: - redis_data:/data + restart: always db: image: postgres @@ -13,6 +14,7 @@ services: POSTGRES_DB: 'pokeapi' volumes: - pg_data:/var/lib/postgresql/data + restart: always app: build: @@ -26,6 +28,7 @@ services: depends_on: - db - cache + restart: always web: build: @@ -34,11 +37,29 @@ services: ports: - "80:80" - "443:443" + restart: always volumes_from: - app:ro links: - app + graphql-engine: + image: hasura/graphql-engine:v2.0.0-alpha.3 + ports: + - "8080:8080" + depends_on: + - "db" + restart: always + environment: + HASURA_GRAPHQL_DATABASE_URL: postgres://ash:pokemon@db:5432/pokeapi + HASURA_GRAPHQL_ENABLE_CONSOLE: "true" + HASURA_GRAPHQL_DEV_MODE: "false" + HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log + HASURA_GRAPHQL_ADMIN_SECRET: pokemon + HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anon + HASURA_GRAPHQL_ENABLE_TELEMETRY: "false" + HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets + volumes: pg_data: redis_data: diff --git a/hasura/config.yaml b/hasura/config.yaml new file mode 100644 index 00000000..725c8005 --- /dev/null +++ b/hasura/config.yaml @@ -0,0 +1,6 @@ +version: 3 +endpoint: http://localhost:8080 +metadata_directory: metadata +actions: + kind: synchronous + handler_webhook_baseurl: http://localhost:3000 diff --git a/hasura/examples/alola_road_encounters.gql b/hasura/examples/alola_road_encounters.gql new file mode 100644 index 00000000..500c5815 --- /dev/null +++ b/hasura/examples/alola_road_encounters.gql @@ -0,0 +1,18 @@ +query location_evolutions_in_alola($region: String) { + region: pokemon_v2_region(where: {name: {_eq: $region}}) { + name + location: pokemon_v2_locations_aggregate(where: {pokemon_v2_pokemonevolutions: {id: {_is_null: false}}}) { + nodes { + name + evolutions: pokemon_v2_pokemonevolutions_aggregate { + nodes { + species: pokemon_v2_pokemonspecy { + name + } + } + } + } + } + } +} + diff --git a/hasura/examples/pokemon.gql b/hasura/examples/pokemon.gql new file mode 100644 index 00000000..ee95d261 --- /dev/null +++ b/hasura/examples/pokemon.gql @@ -0,0 +1,65 @@ + +query pokemon_details { + species: pokemon_v2_pokemonspecies(where: {name: {_eq: "staryu"}}) { + name + base_happiness + is_legendary + is_mythical + generation: pokemon_v2_generation { + name + } + habitat: pokemon_v2_pokemonhabitat { + name + } + pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { + nodes { + height + name + id + weight + abilities: pokemon_v2_pokemonabilities_aggregate { + nodes { + ability: pokemon_v2_ability { + name + } + } + } + stats: pokemon_v2_pokemonstats { + base_stat + stat: pokemon_v2_stat { + name + } + } + types: pokemon_v2_pokemontypes { + slot + type: pokemon_v2_type { + name + } + } + levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { + nodes { + move: pokemon_v2_move { + name + } + level + } + } + pokemon_v2_encounters_aggregate { + aggregate { + count + } + } + pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { + pokemon_v2_item { + name + cost + } + rarity + } + } + } + flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { + flavor_text + } + } +} \ No newline at end of file diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/hasura/metadata/actions.graphql @@ -0,0 +1,2 @@ + + diff --git a/hasura/metadata/actions.yaml b/hasura/metadata/actions.yaml new file mode 100644 index 00000000..1edb4c2f --- /dev/null +++ b/hasura/metadata/actions.yaml @@ -0,0 +1,6 @@ +actions: [] +custom_types: + enums: [] + input_objects: [] + objects: [] + scalars: [] diff --git a/hasura/metadata/allow_list.yaml b/hasura/metadata/allow_list.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/metadata/allow_list.yaml @@ -0,0 +1 @@ +[] diff --git a/hasura/metadata/cron_triggers.yaml b/hasura/metadata/cron_triggers.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/metadata/cron_triggers.yaml @@ -0,0 +1 @@ +[] diff --git a/hasura/metadata/databases/databases.yaml b/hasura/metadata/databases/databases.yaml new file mode 100644 index 00000000..4e5f99cf --- /dev/null +++ b/hasura/metadata/databases/databases.yaml @@ -0,0 +1,161 @@ +- name: default + configuration: + connection_info: + database_url: + from_env: HASURA_GRAPHQL_DATABASE_URL + pool_settings: + idle_timeout: 180 + max_connections: 50 + retries: 1 + tables: + - "!include public_pokemon_v2_ability.yaml" + - "!include public_pokemon_v2_abilitychange.yaml" + - "!include public_pokemon_v2_abilitychangeeffecttext.yaml" + - "!include public_pokemon_v2_abilityeffecttext.yaml" + - "!include public_pokemon_v2_abilityflavortext.yaml" + - "!include public_pokemon_v2_abilityname.yaml" + - "!include public_pokemon_v2_berry.yaml" + - "!include public_pokemon_v2_berryfirmness.yaml" + - "!include public_pokemon_v2_berryfirmnessname.yaml" + - "!include public_pokemon_v2_berryflavor.yaml" + - "!include public_pokemon_v2_berryflavormap.yaml" + - "!include public_pokemon_v2_berryflavorname.yaml" + - "!include public_pokemon_v2_characteristic.yaml" + - "!include public_pokemon_v2_characteristicdescription.yaml" + - "!include public_pokemon_v2_contestcombo.yaml" + - "!include public_pokemon_v2_contesteffect.yaml" + - "!include public_pokemon_v2_contesteffecteffecttext.yaml" + - "!include public_pokemon_v2_contesteffectflavortext.yaml" + - "!include public_pokemon_v2_contesttype.yaml" + - "!include public_pokemon_v2_contesttypename.yaml" + - "!include public_pokemon_v2_egggroup.yaml" + - "!include public_pokemon_v2_egggroupname.yaml" + - "!include public_pokemon_v2_encounter.yaml" + - "!include public_pokemon_v2_encountercondition.yaml" + - "!include public_pokemon_v2_encounterconditionname.yaml" + - "!include public_pokemon_v2_encounterconditionvalue.yaml" + - "!include public_pokemon_v2_encounterconditionvaluemap.yaml" + - "!include public_pokemon_v2_encounterconditionvaluename.yaml" + - "!include public_pokemon_v2_encountermethod.yaml" + - "!include public_pokemon_v2_encountermethodname.yaml" + - "!include public_pokemon_v2_encounterslot.yaml" + - "!include public_pokemon_v2_evolutionchain.yaml" + - "!include public_pokemon_v2_evolutiontrigger.yaml" + - "!include public_pokemon_v2_evolutiontriggername.yaml" + - "!include public_pokemon_v2_experience.yaml" + - "!include public_pokemon_v2_gender.yaml" + - "!include public_pokemon_v2_generation.yaml" + - "!include public_pokemon_v2_generationname.yaml" + - "!include public_pokemon_v2_growthrate.yaml" + - "!include public_pokemon_v2_growthratedescription.yaml" + - "!include public_pokemon_v2_item.yaml" + - "!include public_pokemon_v2_itemattribute.yaml" + - "!include public_pokemon_v2_itemattributedescription.yaml" + - "!include public_pokemon_v2_itemattributemap.yaml" + - "!include public_pokemon_v2_itemattributename.yaml" + - "!include public_pokemon_v2_itemcategory.yaml" + - "!include public_pokemon_v2_itemcategoryname.yaml" + - "!include public_pokemon_v2_itemeffecttext.yaml" + - "!include public_pokemon_v2_itemflavortext.yaml" + - "!include public_pokemon_v2_itemflingeffect.yaml" + - "!include public_pokemon_v2_itemflingeffecteffecttext.yaml" + - "!include public_pokemon_v2_itemgameindex.yaml" + - "!include public_pokemon_v2_itemname.yaml" + - "!include public_pokemon_v2_itempocket.yaml" + - "!include public_pokemon_v2_itempocketname.yaml" + - "!include public_pokemon_v2_itemsprites.yaml" + - "!include public_pokemon_v2_language.yaml" + - "!include public_pokemon_v2_languagename.yaml" + - "!include public_pokemon_v2_location.yaml" + - "!include public_pokemon_v2_locationarea.yaml" + - "!include public_pokemon_v2_locationareaencounterrate.yaml" + - "!include public_pokemon_v2_locationareaname.yaml" + - "!include public_pokemon_v2_locationgameindex.yaml" + - "!include public_pokemon_v2_locationname.yaml" + - "!include public_pokemon_v2_machine.yaml" + - "!include public_pokemon_v2_move.yaml" + - "!include public_pokemon_v2_moveattribute.yaml" + - "!include public_pokemon_v2_moveattributedescription.yaml" + - "!include public_pokemon_v2_moveattributemap.yaml" + - "!include public_pokemon_v2_moveattributename.yaml" + - "!include public_pokemon_v2_movebattlestyle.yaml" + - "!include public_pokemon_v2_movebattlestylename.yaml" + - "!include public_pokemon_v2_movechange.yaml" + - "!include public_pokemon_v2_movedamageclass.yaml" + - "!include public_pokemon_v2_movedamageclassdescription.yaml" + - "!include public_pokemon_v2_movedamageclassname.yaml" + - "!include public_pokemon_v2_moveeffect.yaml" + - "!include public_pokemon_v2_moveeffectchange.yaml" + - "!include public_pokemon_v2_moveeffectchangeeffecttext.yaml" + - "!include public_pokemon_v2_moveeffecteffecttext.yaml" + - "!include public_pokemon_v2_moveflavortext.yaml" + - "!include public_pokemon_v2_movelearnmethod.yaml" + - "!include public_pokemon_v2_movelearnmethoddescription.yaml" + - "!include public_pokemon_v2_movelearnmethodname.yaml" + - "!include public_pokemon_v2_movemeta.yaml" + - "!include public_pokemon_v2_movemetaailment.yaml" + - "!include public_pokemon_v2_movemetaailmentname.yaml" + - "!include public_pokemon_v2_movemetacategory.yaml" + - "!include public_pokemon_v2_movemetacategorydescription.yaml" + - "!include public_pokemon_v2_movemetastatchange.yaml" + - "!include public_pokemon_v2_movename.yaml" + - "!include public_pokemon_v2_movetarget.yaml" + - "!include public_pokemon_v2_movetargetdescription.yaml" + - "!include public_pokemon_v2_movetargetname.yaml" + - "!include public_pokemon_v2_nature.yaml" + - "!include public_pokemon_v2_naturebattlestylepreference.yaml" + - "!include public_pokemon_v2_naturename.yaml" + - "!include public_pokemon_v2_naturepokeathlonstat.yaml" + - "!include public_pokemon_v2_palpark.yaml" + - "!include public_pokemon_v2_palparkarea.yaml" + - "!include public_pokemon_v2_palparkareaname.yaml" + - "!include public_pokemon_v2_pokeathlonstat.yaml" + - "!include public_pokemon_v2_pokeathlonstatname.yaml" + - "!include public_pokemon_v2_pokedex.yaml" + - "!include public_pokemon_v2_pokedexdescription.yaml" + - "!include public_pokemon_v2_pokedexname.yaml" + - "!include public_pokemon_v2_pokedexversiongroup.yaml" + - "!include public_pokemon_v2_pokemon.yaml" + - "!include public_pokemon_v2_pokemonability.yaml" + - "!include public_pokemon_v2_pokemoncolor.yaml" + - "!include public_pokemon_v2_pokemoncolorname.yaml" + - "!include public_pokemon_v2_pokemondexnumber.yaml" + - "!include public_pokemon_v2_pokemonegggroup.yaml" + - "!include public_pokemon_v2_pokemonevolution.yaml" + - "!include public_pokemon_v2_pokemonform.yaml" + - "!include public_pokemon_v2_pokemonformgeneration.yaml" + - "!include public_pokemon_v2_pokemonformname.yaml" + - "!include public_pokemon_v2_pokemonformsprites.yaml" + - "!include public_pokemon_v2_pokemonformtype.yaml" + - "!include public_pokemon_v2_pokemongameindex.yaml" + - "!include public_pokemon_v2_pokemonhabitat.yaml" + - "!include public_pokemon_v2_pokemonhabitatname.yaml" + - "!include public_pokemon_v2_pokemonitem.yaml" + - "!include public_pokemon_v2_pokemonmove.yaml" + - "!include public_pokemon_v2_pokemonshape.yaml" + - "!include public_pokemon_v2_pokemonshapename.yaml" + - "!include public_pokemon_v2_pokemonspecies.yaml" + - "!include public_pokemon_v2_pokemonspeciesdescription.yaml" + - "!include public_pokemon_v2_pokemonspeciesflavortext.yaml" + - "!include public_pokemon_v2_pokemonspeciesname.yaml" + - "!include public_pokemon_v2_pokemonsprites.yaml" + - "!include public_pokemon_v2_pokemonstat.yaml" + - "!include public_pokemon_v2_pokemontype.yaml" + - "!include public_pokemon_v2_pokemontypepast.yaml" + - "!include public_pokemon_v2_region.yaml" + - "!include public_pokemon_v2_regionname.yaml" + - "!include public_pokemon_v2_stat.yaml" + - "!include public_pokemon_v2_statname.yaml" + - "!include public_pokemon_v2_supercontestcombo.yaml" + - "!include public_pokemon_v2_supercontesteffect.yaml" + - "!include public_pokemon_v2_supercontesteffectflavortext.yaml" + - "!include public_pokemon_v2_type.yaml" + - "!include public_pokemon_v2_typeefficacy.yaml" + - "!include public_pokemon_v2_typegameindex.yaml" + - "!include public_pokemon_v2_typename.yaml" + - "!include public_pokemon_v2_version.yaml" + - "!include public_pokemon_v2_versiongroup.yaml" + - "!include public_pokemon_v2_versiongroupmovelearnmethod.yaml" + - "!include public_pokemon_v2_versiongroupregion.yaml" + - "!include public_pokemon_v2_versionname.yaml" + functions: [] diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml new file mode 100644 index 00000000..181980f2 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml @@ -0,0 +1,50 @@ +array_relationships: +- name: pokemon_v2_abilitychanges + using: + foreign_key_constraint_on: + column: ability_id + table: + name: pokemon_v2_abilitychange + schema: public +- name: pokemon_v2_abilityeffecttexts + using: + foreign_key_constraint_on: + column: ability_id + table: + name: pokemon_v2_abilityeffecttext + schema: public +- name: pokemon_v2_abilityflavortexts + using: + foreign_key_constraint_on: + column: ability_id + table: + name: pokemon_v2_abilityflavortext + schema: public +- name: pokemon_v2_abilitynames + using: + foreign_key_constraint_on: + column: ability_id + table: + name: pokemon_v2_abilityname + schema: public +- name: pokemon_v2_pokemonabilities + using: + foreign_key_constraint_on: + column: ability_id + table: + name: pokemon_v2_pokemonability + schema: public +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_ability + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml new file mode 100644 index 00000000..56760b92 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_abilitychangeeffecttexts + using: + foreign_key_constraint_on: + column: ability_change_id + table: + name: pokemon_v2_abilitychangeeffecttext + schema: public +object_relationships: +- name: pokemon_v2_ability + using: + foreign_key_constraint_on: ability_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_abilitychange + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml new file mode 100644 index 00000000..387515f5 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_abilitychange + using: + foreign_key_constraint_on: ability_change_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_abilitychangeeffecttext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml new file mode 100644 index 00000000..e9d815b6 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_ability + using: + foreign_key_constraint_on: ability_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_abilityeffecttext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml new file mode 100644 index 00000000..4143ad22 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_ability + using: + foreign_key_constraint_on: ability_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_abilityflavortext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml new file mode 100644 index 00000000..1c30728d --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_ability + using: + foreign_key_constraint_on: ability_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_abilityname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml new file mode 100644 index 00000000..186821d5 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml @@ -0,0 +1,28 @@ +array_relationships: +- name: pokemon_v2_berryflavormaps + using: + foreign_key_constraint_on: + column: berry_id + table: + name: pokemon_v2_berryflavormap + schema: public +object_relationships: +- name: pokemon_v2_berryfirmness + using: + foreign_key_constraint_on: berry_firmness_id +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: natural_gift_type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_berry + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml new file mode 100644 index 00000000..ee7f7959 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_berries + using: + foreign_key_constraint_on: + column: berry_firmness_id + table: + name: pokemon_v2_berry + schema: public +- name: pokemon_v2_berryfirmnessnames + using: + foreign_key_constraint_on: + column: berry_firmness_id + table: + name: pokemon_v2_berryfirmnessname + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_berryfirmness + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml new file mode 100644 index 00000000..92ec750b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_berryfirmness + using: + foreign_key_constraint_on: berry_firmness_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_berryfirmnessname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml new file mode 100644 index 00000000..a4fd200b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml @@ -0,0 +1,43 @@ +array_relationships: +- name: pokemonV2NaturesByLikesFlavorId + using: + foreign_key_constraint_on: + column: likes_flavor_id + table: + name: pokemon_v2_nature + schema: public +- name: pokemon_v2_berryflavormaps + using: + foreign_key_constraint_on: + column: berry_flavor_id + table: + name: pokemon_v2_berryflavormap + schema: public +- name: pokemon_v2_berryflavornames + using: + foreign_key_constraint_on: + column: berry_flavor_id + table: + name: pokemon_v2_berryflavorname + schema: public +- name: pokemon_v2_natures + using: + foreign_key_constraint_on: + column: hates_flavor_id + table: + name: pokemon_v2_nature + schema: public +object_relationships: +- name: pokemon_v2_contesttype + using: + foreign_key_constraint_on: contest_type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_berryflavor + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml new file mode 100644 index 00000000..6a45dcb6 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_berry + using: + foreign_key_constraint_on: berry_id +- name: pokemon_v2_berryflavor + using: + foreign_key_constraint_on: berry_flavor_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_berryflavormap + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml new file mode 100644 index 00000000..9c37d439 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_berryflavor + using: + foreign_key_constraint_on: berry_flavor_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_berryflavorname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml new file mode 100644 index 00000000..c1248985 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml @@ -0,0 +1,22 @@ +array_relationships: +- name: pokemon_v2_characteristicdescriptions + using: + foreign_key_constraint_on: + column: characteristic_id + table: + name: pokemon_v2_characteristicdescription + schema: public +object_relationships: +- name: pokemon_v2_stat + using: + foreign_key_constraint_on: stat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_characteristic + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml new file mode 100644 index 00000000..1a385618 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_characteristic + using: + foreign_key_constraint_on: characteristic_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_characteristicdescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml new file mode 100644 index 00000000..dcd312c3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemonV2MoveBySecondMoveId + using: + foreign_key_constraint_on: second_move_id +- name: pokemon_v2_move + using: + foreign_key_constraint_on: first_move_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_contestcombo + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml new file mode 100644 index 00000000..c000b6d6 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml @@ -0,0 +1,32 @@ +array_relationships: +- name: pokemon_v2_contesteffecteffecttexts + using: + foreign_key_constraint_on: + column: contest_effect_id + table: + name: pokemon_v2_contesteffecteffecttext + schema: public +- name: pokemon_v2_contesteffectflavortexts + using: + foreign_key_constraint_on: + column: contest_effect_id + table: + name: pokemon_v2_contesteffectflavortext + schema: public +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: contest_effect_id + table: + name: pokemon_v2_move + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_contesteffect + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml new file mode 100644 index 00000000..7e4097f3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_contesteffect + using: + foreign_key_constraint_on: contest_effect_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_contesteffecteffecttext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml new file mode 100644 index 00000000..d2fc6472 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_contesteffect + using: + foreign_key_constraint_on: contest_effect_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_contesteffectflavortext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml new file mode 100644 index 00000000..3b2d4e90 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml @@ -0,0 +1,32 @@ +array_relationships: +- name: pokemon_v2_berryflavors + using: + foreign_key_constraint_on: + column: contest_type_id + table: + name: pokemon_v2_berryflavor + schema: public +- name: pokemon_v2_contesttypenames + using: + foreign_key_constraint_on: + column: contest_type_id + table: + name: pokemon_v2_contesttypename + schema: public +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: contest_type_id + table: + name: pokemon_v2_move + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_contesttype + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml new file mode 100644 index 00000000..3db12522 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_contesttype + using: + foreign_key_constraint_on: contest_type_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_contesttypename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml new file mode 100644 index 00000000..a9121584 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_egggroupnames + using: + foreign_key_constraint_on: + column: egg_group_id + table: + name: pokemon_v2_egggroupname + schema: public +- name: pokemon_v2_pokemonegggroups + using: + foreign_key_constraint_on: + column: egg_group_id + table: + name: pokemon_v2_pokemonegggroup + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_egggroup + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml new file mode 100644 index 00000000..0d9be7c3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_egggroup + using: + foreign_key_constraint_on: egg_group_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_egggroupname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml new file mode 100644 index 00000000..db08152c --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml @@ -0,0 +1,31 @@ +array_relationships: +- name: pokemon_v2_encounterconditionvaluemaps + using: + foreign_key_constraint_on: + column: encounter_id + table: + name: pokemon_v2_encounterconditionvaluemap + schema: public +object_relationships: +- name: pokemon_v2_encounterslot + using: + foreign_key_constraint_on: encounter_slot_id +- name: pokemon_v2_locationarea + using: + foreign_key_constraint_on: location_area_id +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_version + using: + foreign_key_constraint_on: version_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encounter + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml new file mode 100644 index 00000000..eccab225 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_encounterconditionnames + using: + foreign_key_constraint_on: + column: encounter_condition_id + table: + name: pokemon_v2_encounterconditionname + schema: public +- name: pokemon_v2_encounterconditionvalues + using: + foreign_key_constraint_on: + column: encounter_condition_id + table: + name: pokemon_v2_encounterconditionvalue + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encountercondition + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml new file mode 100644 index 00000000..e3b000dc --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_encountercondition + using: + foreign_key_constraint_on: encounter_condition_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encounterconditionname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml new file mode 100644 index 00000000..5fd78c1c --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml @@ -0,0 +1,29 @@ +array_relationships: +- name: pokemon_v2_encounterconditionvaluemaps + using: + foreign_key_constraint_on: + column: encounter_condition_value_id + table: + name: pokemon_v2_encounterconditionvaluemap + schema: public +- name: pokemon_v2_encounterconditionvaluenames + using: + foreign_key_constraint_on: + column: encounter_condition_value_id + table: + name: pokemon_v2_encounterconditionvaluename + schema: public +object_relationships: +- name: pokemon_v2_encountercondition + using: + foreign_key_constraint_on: encounter_condition_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encounterconditionvalue + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml new file mode 100644 index 00000000..cfe99746 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_encounter + using: + foreign_key_constraint_on: encounter_id +- name: pokemon_v2_encounterconditionvalue + using: + foreign_key_constraint_on: encounter_condition_value_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encounterconditionvaluemap + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml new file mode 100644 index 00000000..175b7403 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_encounterconditionvalue + using: + foreign_key_constraint_on: encounter_condition_value_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encounterconditionvaluename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml new file mode 100644 index 00000000..9c314980 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml @@ -0,0 +1,32 @@ +array_relationships: +- name: pokemon_v2_encountermethodnames + using: + foreign_key_constraint_on: + column: encounter_method_id + table: + name: pokemon_v2_encountermethodname + schema: public +- name: pokemon_v2_encounterslots + using: + foreign_key_constraint_on: + column: encounter_method_id + table: + name: pokemon_v2_encounterslot + schema: public +- name: pokemon_v2_locationareaencounterrates + using: + foreign_key_constraint_on: + column: encounter_method_id + table: + name: pokemon_v2_locationareaencounterrate + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encountermethod + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml new file mode 100644 index 00000000..44b4696e --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_encountermethod + using: + foreign_key_constraint_on: encounter_method_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encountermethodname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml new file mode 100644 index 00000000..28368fde --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_encounters + using: + foreign_key_constraint_on: + column: encounter_slot_id + table: + name: pokemon_v2_encounter + schema: public +object_relationships: +- name: pokemon_v2_encountermethod + using: + foreign_key_constraint_on: encounter_method_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_encounterslot + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml new file mode 100644 index 00000000..12f77e9c --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml @@ -0,0 +1,22 @@ +array_relationships: +- name: pokemon_v2_pokemonspecies + using: + foreign_key_constraint_on: + column: evolution_chain_id + table: + name: pokemon_v2_pokemonspecies + schema: public +object_relationships: +- name: pokemon_v2_item + using: + foreign_key_constraint_on: baby_trigger_item_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_evolutionchain + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml new file mode 100644 index 00000000..9578bf3e --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_evolutiontriggernames + using: + foreign_key_constraint_on: + column: evolution_trigger_id + table: + name: pokemon_v2_evolutiontriggername + schema: public +- name: pokemon_v2_pokemonevolutions + using: + foreign_key_constraint_on: + column: evolution_trigger_id + table: + name: pokemon_v2_pokemonevolution + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_evolutiontrigger + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml new file mode 100644 index 00000000..6611951a --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_evolutiontrigger + using: + foreign_key_constraint_on: evolution_trigger_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_evolutiontriggername + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml new file mode 100644 index 00000000..fdea2a6e --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml @@ -0,0 +1,14 @@ +object_relationships: +- name: pokemon_v2_growthrate + using: + foreign_key_constraint_on: growth_rate_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_experience + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml new file mode 100644 index 00000000..0b2ced25 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml @@ -0,0 +1,18 @@ +array_relationships: +- name: pokemon_v2_pokemonevolutions + using: + foreign_key_constraint_on: + column: gender_id + table: + name: pokemon_v2_pokemonevolution + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_gender + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml new file mode 100644 index 00000000..6f7019a3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml @@ -0,0 +1,92 @@ +array_relationships: +- name: pokemon_v2_abilities + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_ability + schema: public +- name: pokemon_v2_generationnames + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_generationname + schema: public +- name: pokemon_v2_itemgameindices + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_itemgameindex + schema: public +- name: pokemon_v2_locationgameindices + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_locationgameindex + schema: public +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_move + schema: public +- name: pokemon_v2_pokemonformgenerations + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_pokemonformgeneration + schema: public +- name: pokemon_v2_pokemonspecies + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_pokemonspecies + schema: public +- name: pokemon_v2_pokemontypepasts + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_pokemontypepast + schema: public +- name: pokemon_v2_typegameindices + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_typegameindex + schema: public +- name: pokemon_v2_types + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_type + schema: public +- name: pokemon_v2_versiongroups + using: + foreign_key_constraint_on: + column: generation_id + table: + name: pokemon_v2_versiongroup + schema: public +object_relationships: +- name: pokemon_v2_region + using: + foreign_key_constraint_on: region_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_generation + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml new file mode 100644 index 00000000..ea40a4f0 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_generationname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml new file mode 100644 index 00000000..a37ec24c --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml @@ -0,0 +1,39 @@ +array_relationships: +- name: pokemon_v2_experiences + using: + foreign_key_constraint_on: + column: growth_rate_id + table: + name: pokemon_v2_experience + schema: public +- name: pokemon_v2_growthratedescriptions + using: + foreign_key_constraint_on: + column: growth_rate_id + table: + name: pokemon_v2_growthratedescription + schema: public +- name: pokemon_v2_machines + using: + foreign_key_constraint_on: + column: growth_rate_id + table: + name: pokemon_v2_machine + schema: public +- name: pokemon_v2_pokemonspecies + using: + foreign_key_constraint_on: + column: growth_rate_id + table: + name: pokemon_v2_pokemonspecies + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_growthrate + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml new file mode 100644 index 00000000..5794026d --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_growthrate + using: + foreign_key_constraint_on: growth_rate_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_growthratedescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml new file mode 100644 index 00000000..9a81f28a --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml @@ -0,0 +1,102 @@ +array_relationships: +- name: pokemonV2PokemonevolutionsByHeldItemId + using: + foreign_key_constraint_on: + column: held_item_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemon_v2_berries + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_berry + schema: public +- name: pokemon_v2_evolutionchains + using: + foreign_key_constraint_on: + column: baby_trigger_item_id + table: + name: pokemon_v2_evolutionchain + schema: public +- name: pokemon_v2_itemattributemaps + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_itemattributemap + schema: public +- name: pokemon_v2_itemeffecttexts + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_itemeffecttext + schema: public +- name: pokemon_v2_itemflavortexts + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_itemflavortext + schema: public +- name: pokemon_v2_itemgameindices + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_itemgameindex + schema: public +- name: pokemon_v2_itemnames + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_itemname + schema: public +- name: pokemon_v2_itemsprites + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_itemsprites + schema: public +- name: pokemon_v2_machines + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_machine + schema: public +- name: pokemon_v2_pokemonevolutions + using: + foreign_key_constraint_on: + column: evolution_item_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemon_v2_pokemonitems + using: + foreign_key_constraint_on: + column: item_id + table: + name: pokemon_v2_pokemonitem + schema: public +object_relationships: +- name: pokemon_v2_itemcategory + using: + foreign_key_constraint_on: item_category_id +- name: pokemon_v2_itemflingeffect + using: + foreign_key_constraint_on: item_fling_effect_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_item + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml new file mode 100644 index 00000000..9e7aa0ef --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml @@ -0,0 +1,32 @@ +array_relationships: +- name: pokemon_v2_itemattributedescriptions + using: + foreign_key_constraint_on: + column: item_attribute_id + table: + name: pokemon_v2_itemattributedescription + schema: public +- name: pokemon_v2_itemattributemaps + using: + foreign_key_constraint_on: + column: item_attribute_id + table: + name: pokemon_v2_itemattributemap + schema: public +- name: pokemon_v2_itemattributenames + using: + foreign_key_constraint_on: + column: item_attribute_id + table: + name: pokemon_v2_itemattributename + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemattribute + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml new file mode 100644 index 00000000..be5154cf --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_itemattribute + using: + foreign_key_constraint_on: item_attribute_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemattributedescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml new file mode 100644 index 00000000..aecdf86f --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +- name: pokemon_v2_itemattribute + using: + foreign_key_constraint_on: item_attribute_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemattributemap + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml new file mode 100644 index 00000000..8f98765a --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_itemattribute + using: + foreign_key_constraint_on: item_attribute_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemattributename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml new file mode 100644 index 00000000..674304fc --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml @@ -0,0 +1,29 @@ +array_relationships: +- name: pokemon_v2_itemcategorynames + using: + foreign_key_constraint_on: + column: item_category_id + table: + name: pokemon_v2_itemcategoryname + schema: public +- name: pokemon_v2_items + using: + foreign_key_constraint_on: + column: item_category_id + table: + name: pokemon_v2_item + schema: public +object_relationships: +- name: pokemon_v2_itempocket + using: + foreign_key_constraint_on: item_pocket_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemcategory + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml new file mode 100644 index 00000000..cc5721b6 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_itemcategory + using: + foreign_key_constraint_on: item_category_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemcategoryname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml new file mode 100644 index 00000000..dfbea21d --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemeffecttext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml new file mode 100644 index 00000000..0d6dba8b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemflavortext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml new file mode 100644 index 00000000..c5f6b9de --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_itemflingeffecteffecttexts + using: + foreign_key_constraint_on: + column: item_fling_effect_id + table: + name: pokemon_v2_itemflingeffecteffecttext + schema: public +- name: pokemon_v2_items + using: + foreign_key_constraint_on: + column: item_fling_effect_id + table: + name: pokemon_v2_item + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemflingeffect + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml new file mode 100644 index 00000000..0ca82b40 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_itemflingeffect + using: + foreign_key_constraint_on: item_fling_effect_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemflingeffecteffecttext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml new file mode 100644 index 00000000..acfe3032 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemgameindex + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml new file mode 100644 index 00000000..3875c6b1 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml new file mode 100644 index 00000000..aa65c8c0 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_itemcategories + using: + foreign_key_constraint_on: + column: item_pocket_id + table: + name: pokemon_v2_itemcategory + schema: public +- name: pokemon_v2_itempocketnames + using: + foreign_key_constraint_on: + column: item_pocket_id + table: + name: pokemon_v2_itempocketname + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itempocket + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml new file mode 100644 index 00000000..cb37c5db --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_itempocket + using: + foreign_key_constraint_on: item_pocket_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itempocketname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml new file mode 100644 index 00000000..3e0a2e98 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml @@ -0,0 +1,14 @@ +object_relationships: +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_itemsprites + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml new file mode 100644 index 00000000..1df8d71b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml @@ -0,0 +1,438 @@ +array_relationships: +- name: pokemonV2LanguagenamesByLocalLanguageId + using: + foreign_key_constraint_on: + column: local_language_id + table: + name: pokemon_v2_languagename + schema: public +- name: pokemon_v2_abilitychangeeffecttexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_abilitychangeeffecttext + schema: public +- name: pokemon_v2_abilityeffecttexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_abilityeffecttext + schema: public +- name: pokemon_v2_abilityflavortexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_abilityflavortext + schema: public +- name: pokemon_v2_abilitynames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_abilityname + schema: public +- name: pokemon_v2_berryfirmnessnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_berryfirmnessname + schema: public +- name: pokemon_v2_berryflavornames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_berryflavorname + schema: public +- name: pokemon_v2_characteristicdescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_characteristicdescription + schema: public +- name: pokemon_v2_contesteffecteffecttexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_contesteffecteffecttext + schema: public +- name: pokemon_v2_contesteffectflavortexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_contesteffectflavortext + schema: public +- name: pokemon_v2_contesttypenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_contesttypename + schema: public +- name: pokemon_v2_egggroupnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_egggroupname + schema: public +- name: pokemon_v2_encounterconditionnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_encounterconditionname + schema: public +- name: pokemon_v2_encounterconditionvaluenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_encounterconditionvaluename + schema: public +- name: pokemon_v2_encountermethodnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_encountermethodname + schema: public +- name: pokemon_v2_evolutiontriggernames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_evolutiontriggername + schema: public +- name: pokemon_v2_generationnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_generationname + schema: public +- name: pokemon_v2_growthratedescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_growthratedescription + schema: public +- name: pokemon_v2_itemattributedescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itemattributedescription + schema: public +- name: pokemon_v2_itemattributenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itemattributename + schema: public +- name: pokemon_v2_itemcategorynames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itemcategoryname + schema: public +- name: pokemon_v2_itemeffecttexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itemeffecttext + schema: public +- name: pokemon_v2_itemflavortexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itemflavortext + schema: public +- name: pokemon_v2_itemflingeffecteffecttexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itemflingeffecteffecttext + schema: public +- name: pokemon_v2_itemnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itemname + schema: public +- name: pokemon_v2_itempocketnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_itempocketname + schema: public +- name: pokemon_v2_languagenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_languagename + schema: public +- name: pokemon_v2_locationareanames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_locationareaname + schema: public +- name: pokemon_v2_locationnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_locationname + schema: public +- name: pokemon_v2_moveattributedescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_moveattributedescription + schema: public +- name: pokemon_v2_moveattributenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_moveattributename + schema: public +- name: pokemon_v2_movebattlestylenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movebattlestylename + schema: public +- name: pokemon_v2_movedamageclassdescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movedamageclassdescription + schema: public +- name: pokemon_v2_movedamageclassnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movedamageclassname + schema: public +- name: pokemon_v2_moveeffectchangeeffecttexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_moveeffectchangeeffecttext + schema: public +- name: pokemon_v2_moveeffecteffecttexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_moveeffecteffecttext + schema: public +- name: pokemon_v2_moveflavortexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_moveflavortext + schema: public +- name: pokemon_v2_movelearnmethoddescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movelearnmethoddescription + schema: public +- name: pokemon_v2_movelearnmethodnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movelearnmethodname + schema: public +- name: pokemon_v2_movemetaailmentnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movemetaailmentname + schema: public +- name: pokemon_v2_movemetacategorydescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movemetacategorydescription + schema: public +- name: pokemon_v2_movenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movename + schema: public +- name: pokemon_v2_movetargetdescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movetargetdescription + schema: public +- name: pokemon_v2_movetargetnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_movetargetname + schema: public +- name: pokemon_v2_naturenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_naturename + schema: public +- name: pokemon_v2_palparkareanames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_palparkareaname + schema: public +- name: pokemon_v2_pokeathlonstatnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokeathlonstatname + schema: public +- name: pokemon_v2_pokedexdescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokedexdescription + schema: public +- name: pokemon_v2_pokedexnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokedexname + schema: public +- name: pokemon_v2_pokemoncolornames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokemoncolorname + schema: public +- name: pokemon_v2_pokemonformnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokemonformname + schema: public +- name: pokemon_v2_pokemonhabitatnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokemonhabitatname + schema: public +- name: pokemon_v2_pokemonshapenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokemonshapename + schema: public +- name: pokemon_v2_pokemonspeciesdescriptions + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokemonspeciesdescription + schema: public +- name: pokemon_v2_pokemonspeciesflavortexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokemonspeciesflavortext + schema: public +- name: pokemon_v2_pokemonspeciesnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_pokemonspeciesname + schema: public +- name: pokemon_v2_regionnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_regionname + schema: public +- name: pokemon_v2_statnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_statname + schema: public +- name: pokemon_v2_supercontesteffectflavortexts + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_supercontesteffectflavortext + schema: public +- name: pokemon_v2_typenames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_typename + schema: public +- name: pokemon_v2_versionnames + using: + foreign_key_constraint_on: + column: language_id + table: + name: pokemon_v2_versionname + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_language + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml new file mode 100644 index 00000000..c53f1a40 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemonV2LanguageByLocalLanguageId + using: + foreign_key_constraint_on: local_language_id +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_languagename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml new file mode 100644 index 00000000..09587efc --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml @@ -0,0 +1,43 @@ +array_relationships: +- name: pokemon_v2_locationareas + using: + foreign_key_constraint_on: + column: location_id + table: + name: pokemon_v2_locationarea + schema: public +- name: pokemon_v2_locationgameindices + using: + foreign_key_constraint_on: + column: location_id + table: + name: pokemon_v2_locationgameindex + schema: public +- name: pokemon_v2_locationnames + using: + foreign_key_constraint_on: + column: location_id + table: + name: pokemon_v2_locationname + schema: public +- name: pokemon_v2_pokemonevolutions + using: + foreign_key_constraint_on: + column: location_id + table: + name: pokemon_v2_pokemonevolution + schema: public +object_relationships: +- name: pokemon_v2_region + using: + foreign_key_constraint_on: region_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_location + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml new file mode 100644 index 00000000..2c897e75 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml @@ -0,0 +1,36 @@ +array_relationships: +- name: pokemon_v2_encounters + using: + foreign_key_constraint_on: + column: location_area_id + table: + name: pokemon_v2_encounter + schema: public +- name: pokemon_v2_locationareaencounterrates + using: + foreign_key_constraint_on: + column: location_area_id + table: + name: pokemon_v2_locationareaencounterrate + schema: public +- name: pokemon_v2_locationareanames + using: + foreign_key_constraint_on: + column: location_area_id + table: + name: pokemon_v2_locationareaname + schema: public +object_relationships: +- name: pokemon_v2_location + using: + foreign_key_constraint_on: location_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_locationarea + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml new file mode 100644 index 00000000..31861e1f --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_encountermethod + using: + foreign_key_constraint_on: encounter_method_id +- name: pokemon_v2_locationarea + using: + foreign_key_constraint_on: location_area_id +- name: pokemon_v2_version + using: + foreign_key_constraint_on: version_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_locationareaencounterrate + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml new file mode 100644 index 00000000..2fc31c20 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_locationarea + using: + foreign_key_constraint_on: location_area_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_locationareaname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml new file mode 100644 index 00000000..10234818 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_location + using: + foreign_key_constraint_on: location_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_locationgameindex + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml new file mode 100644 index 00000000..4aead9f1 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_location + using: + foreign_key_constraint_on: location_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_locationname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml new file mode 100644 index 00000000..b5c6b365 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml @@ -0,0 +1,23 @@ +object_relationships: +- name: pokemon_v2_growthrate + using: + foreign_key_constraint_on: growth_rate_id +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_machine + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml new file mode 100644 index 00000000..9b6287f3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml @@ -0,0 +1,127 @@ +array_relationships: +- name: pokemonV2ContestcombosBySecondMoveId + using: + foreign_key_constraint_on: + column: second_move_id + table: + name: pokemon_v2_contestcombo + schema: public +- name: pokemonV2SupercontestcombosBySecondMoveId + using: + foreign_key_constraint_on: + column: second_move_id + table: + name: pokemon_v2_supercontestcombo + schema: public +- name: pokemon_v2_contestcombos + using: + foreign_key_constraint_on: + column: first_move_id + table: + name: pokemon_v2_contestcombo + schema: public +- name: pokemon_v2_machines + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_machine + schema: public +- name: pokemon_v2_moveattributemaps + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_moveattributemap + schema: public +- name: pokemon_v2_movechanges + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_movechange + schema: public +- name: pokemon_v2_moveflavortexts + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_moveflavortext + schema: public +- name: pokemon_v2_movemeta + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_movemeta + schema: public +- name: pokemon_v2_movemetastatchanges + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_movemetastatchange + schema: public +- name: pokemon_v2_movenames + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_movename + schema: public +- name: pokemon_v2_pokemonevolutions + using: + foreign_key_constraint_on: + column: known_move_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemon_v2_pokemonmoves + using: + foreign_key_constraint_on: + column: move_id + table: + name: pokemon_v2_pokemonmove + schema: public +- name: pokemon_v2_supercontestcombos + using: + foreign_key_constraint_on: + column: first_move_id + table: + name: pokemon_v2_supercontestcombo + schema: public +object_relationships: +- name: pokemon_v2_contesteffect + using: + foreign_key_constraint_on: contest_effect_id +- name: pokemon_v2_contesttype + using: + foreign_key_constraint_on: contest_type_id +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_movedamageclass + using: + foreign_key_constraint_on: move_damage_class_id +- name: pokemon_v2_moveeffect + using: + foreign_key_constraint_on: move_effect_id +- name: pokemon_v2_movetarget + using: + foreign_key_constraint_on: move_target_id +- name: pokemon_v2_supercontesteffect + using: + foreign_key_constraint_on: super_contest_effect_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_move + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml new file mode 100644 index 00000000..f8b6b8de --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml @@ -0,0 +1,32 @@ +array_relationships: +- name: pokemon_v2_moveattributedescriptions + using: + foreign_key_constraint_on: + column: move_attribute_id + table: + name: pokemon_v2_moveattributedescription + schema: public +- name: pokemon_v2_moveattributemaps + using: + foreign_key_constraint_on: + column: move_attribute_id + table: + name: pokemon_v2_moveattributemap + schema: public +- name: pokemon_v2_moveattributenames + using: + foreign_key_constraint_on: + column: move_attribute_id + table: + name: pokemon_v2_moveattributename + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveattribute + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml new file mode 100644 index 00000000..9ee62de3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_moveattribute + using: + foreign_key_constraint_on: move_attribute_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveattributedescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml new file mode 100644 index 00000000..55b5f7e5 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +- name: pokemon_v2_moveattribute + using: + foreign_key_constraint_on: move_attribute_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveattributemap + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml new file mode 100644 index 00000000..c5edfea1 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_moveattribute + using: + foreign_key_constraint_on: move_attribute_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveattributename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml new file mode 100644 index 00000000..c887b964 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_movebattlestylenames + using: + foreign_key_constraint_on: + column: move_battle_style_id + table: + name: pokemon_v2_movebattlestylename + schema: public +- name: pokemon_v2_naturebattlestylepreferences + using: + foreign_key_constraint_on: + column: move_battle_style_id + table: + name: pokemon_v2_naturebattlestylepreference + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movebattlestyle + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml new file mode 100644 index 00000000..209fd562 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movebattlestyle + using: + foreign_key_constraint_on: move_battle_style_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movebattlestylename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml new file mode 100644 index 00000000..a8224aa4 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml @@ -0,0 +1,23 @@ +object_relationships: +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +- name: pokemon_v2_moveeffect + using: + foreign_key_constraint_on: move_effect_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: type_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movechange + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml new file mode 100644 index 00000000..a212561e --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml @@ -0,0 +1,46 @@ +array_relationships: +- name: pokemon_v2_movedamageclassdescriptions + using: + foreign_key_constraint_on: + column: move_damage_class_id + table: + name: pokemon_v2_movedamageclassdescription + schema: public +- name: pokemon_v2_movedamageclassnames + using: + foreign_key_constraint_on: + column: move_damage_class_id + table: + name: pokemon_v2_movedamageclassname + schema: public +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: move_damage_class_id + table: + name: pokemon_v2_move + schema: public +- name: pokemon_v2_stats + using: + foreign_key_constraint_on: + column: move_damage_class_id + table: + name: pokemon_v2_stat + schema: public +- name: pokemon_v2_types + using: + foreign_key_constraint_on: + column: move_damage_class_id + table: + name: pokemon_v2_type + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movedamageclass + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml new file mode 100644 index 00000000..ffb2ebe2 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movedamageclass + using: + foreign_key_constraint_on: move_damage_class_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movedamageclassdescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml new file mode 100644 index 00000000..6ee29698 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movedamageclass + using: + foreign_key_constraint_on: move_damage_class_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movedamageclassname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml new file mode 100644 index 00000000..b5b1e318 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml @@ -0,0 +1,39 @@ +array_relationships: +- name: pokemon_v2_movechanges + using: + foreign_key_constraint_on: + column: move_effect_id + table: + name: pokemon_v2_movechange + schema: public +- name: pokemon_v2_moveeffectchanges + using: + foreign_key_constraint_on: + column: move_effect_id + table: + name: pokemon_v2_moveeffectchange + schema: public +- name: pokemon_v2_moveeffecteffecttexts + using: + foreign_key_constraint_on: + column: move_effect_id + table: + name: pokemon_v2_moveeffecteffecttext + schema: public +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: move_effect_id + table: + name: pokemon_v2_move + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveeffect + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml new file mode 100644 index 00000000..b8e1a75b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_moveeffectchangeeffecttexts + using: + foreign_key_constraint_on: + column: move_effect_change_id + table: + name: pokemon_v2_moveeffectchangeeffecttext + schema: public +object_relationships: +- name: pokemon_v2_moveeffect + using: + foreign_key_constraint_on: move_effect_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveeffectchange + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml new file mode 100644 index 00000000..8087d115 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_moveeffectchange + using: + foreign_key_constraint_on: move_effect_change_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveeffectchangeeffecttext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml new file mode 100644 index 00000000..b7e0b0ed --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_moveeffect + using: + foreign_key_constraint_on: move_effect_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveeffecteffecttext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml new file mode 100644 index 00000000..fb89e49f --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_moveflavortext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml new file mode 100644 index 00000000..27329aa9 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml @@ -0,0 +1,39 @@ +array_relationships: +- name: pokemon_v2_movelearnmethoddescriptions + using: + foreign_key_constraint_on: + column: move_learn_method_id + table: + name: pokemon_v2_movelearnmethoddescription + schema: public +- name: pokemon_v2_movelearnmethodnames + using: + foreign_key_constraint_on: + column: move_learn_method_id + table: + name: pokemon_v2_movelearnmethodname + schema: public +- name: pokemon_v2_pokemonmoves + using: + foreign_key_constraint_on: + column: move_learn_method_id + table: + name: pokemon_v2_pokemonmove + schema: public +- name: pokemon_v2_versiongroupmovelearnmethods + using: + foreign_key_constraint_on: + column: move_learn_method_id + table: + name: pokemon_v2_versiongroupmovelearnmethod + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movelearnmethod + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml new file mode 100644 index 00000000..4b70486b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movelearnmethod + using: + foreign_key_constraint_on: move_learn_method_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movelearnmethoddescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml new file mode 100644 index 00000000..a7b15985 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movelearnmethod + using: + foreign_key_constraint_on: move_learn_method_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movelearnmethodname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml new file mode 100644 index 00000000..ef54bf00 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +- name: pokemon_v2_movemetaailment + using: + foreign_key_constraint_on: move_meta_ailment_id +- name: pokemon_v2_movemetacategory + using: + foreign_key_constraint_on: move_meta_category_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movemeta + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml new file mode 100644 index 00000000..1cd342e9 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_movemeta + using: + foreign_key_constraint_on: + column: move_meta_ailment_id + table: + name: pokemon_v2_movemeta + schema: public +- name: pokemon_v2_movemetaailmentnames + using: + foreign_key_constraint_on: + column: move_meta_ailment_id + table: + name: pokemon_v2_movemetaailmentname + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movemetaailment + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml new file mode 100644 index 00000000..8f7e55af --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movemetaailment + using: + foreign_key_constraint_on: move_meta_ailment_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movemetaailmentname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml new file mode 100644 index 00000000..7746a462 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_movemeta + using: + foreign_key_constraint_on: + column: move_meta_category_id + table: + name: pokemon_v2_movemeta + schema: public +- name: pokemon_v2_movemetacategorydescriptions + using: + foreign_key_constraint_on: + column: move_meta_category_id + table: + name: pokemon_v2_movemetacategorydescription + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movemetacategory + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml new file mode 100644 index 00000000..df29bd13 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movemetacategory + using: + foreign_key_constraint_on: move_meta_category_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movemetacategorydescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml new file mode 100644 index 00000000..781e45c9 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +- name: pokemon_v2_stat + using: + foreign_key_constraint_on: stat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movemetastatchange + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml new file mode 100644 index 00000000..9aafc140 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml new file mode 100644 index 00000000..4828dffc --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml @@ -0,0 +1,32 @@ +array_relationships: +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: move_target_id + table: + name: pokemon_v2_move + schema: public +- name: pokemon_v2_movetargetdescriptions + using: + foreign_key_constraint_on: + column: move_target_id + table: + name: pokemon_v2_movetargetdescription + schema: public +- name: pokemon_v2_movetargetnames + using: + foreign_key_constraint_on: + column: move_target_id + table: + name: pokemon_v2_movetargetname + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movetarget + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml new file mode 100644 index 00000000..162fd713 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movetarget + using: + foreign_key_constraint_on: move_target_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movetargetdescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml new file mode 100644 index 00000000..4919df57 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_movetarget + using: + foreign_key_constraint_on: move_target_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_movetargetname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml new file mode 100644 index 00000000..b6c72577 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml @@ -0,0 +1,45 @@ +array_relationships: +- name: pokemon_v2_naturebattlestylepreferences + using: + foreign_key_constraint_on: + column: nature_id + table: + name: pokemon_v2_naturebattlestylepreference + schema: public +- name: pokemon_v2_naturenames + using: + foreign_key_constraint_on: + column: nature_id + table: + name: pokemon_v2_naturename + schema: public +- name: pokemon_v2_naturepokeathlonstats + using: + foreign_key_constraint_on: + column: nature_id + table: + name: pokemon_v2_naturepokeathlonstat + schema: public +object_relationships: +- name: pokemonV2BerryflavorByLikesFlavorId + using: + foreign_key_constraint_on: likes_flavor_id +- name: pokemonV2StatByIncreasedStatId + using: + foreign_key_constraint_on: increased_stat_id +- name: pokemon_v2_berryflavor + using: + foreign_key_constraint_on: hates_flavor_id +- name: pokemon_v2_stat + using: + foreign_key_constraint_on: decreased_stat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_nature + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml new file mode 100644 index 00000000..d6c9c792 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_movebattlestyle + using: + foreign_key_constraint_on: move_battle_style_id +- name: pokemon_v2_nature + using: + foreign_key_constraint_on: nature_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_naturebattlestylepreference + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml new file mode 100644 index 00000000..8840374d --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_nature + using: + foreign_key_constraint_on: nature_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_naturename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml new file mode 100644 index 00000000..b5ccc6a3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_nature + using: + foreign_key_constraint_on: nature_id +- name: pokemon_v2_pokeathlonstat + using: + foreign_key_constraint_on: pokeathlon_stat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_naturepokeathlonstat + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml new file mode 100644 index 00000000..4fbcb513 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_palparkarea + using: + foreign_key_constraint_on: pal_park_area_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: pokemon_species_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_palpark + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml new file mode 100644 index 00000000..a4c9e254 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_palparkareanames + using: + foreign_key_constraint_on: + column: pal_park_area_id + table: + name: pokemon_v2_palparkareaname + schema: public +- name: pokemon_v2_palparks + using: + foreign_key_constraint_on: + column: pal_park_area_id + table: + name: pokemon_v2_palpark + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_palparkarea + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml new file mode 100644 index 00000000..1b7dc18a --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_palparkarea + using: + foreign_key_constraint_on: pal_park_area_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_palparkareaname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml new file mode 100644 index 00000000..d3f95190 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_naturepokeathlonstats + using: + foreign_key_constraint_on: + column: pokeathlon_stat_id + table: + name: pokemon_v2_naturepokeathlonstat + schema: public +- name: pokemon_v2_pokeathlonstatnames + using: + foreign_key_constraint_on: + column: pokeathlon_stat_id + table: + name: pokemon_v2_pokeathlonstatname + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokeathlonstat + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml new file mode 100644 index 00000000..a9381616 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokeathlonstat + using: + foreign_key_constraint_on: pokeathlon_stat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokeathlonstatname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml new file mode 100644 index 00000000..9d3a2741 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml @@ -0,0 +1,43 @@ +array_relationships: +- name: pokemon_v2_pokedexdescriptions + using: + foreign_key_constraint_on: + column: pokedex_id + table: + name: pokemon_v2_pokedexdescription + schema: public +- name: pokemon_v2_pokedexnames + using: + foreign_key_constraint_on: + column: pokedex_id + table: + name: pokemon_v2_pokedexname + schema: public +- name: pokemon_v2_pokedexversiongroups + using: + foreign_key_constraint_on: + column: pokedex_id + table: + name: pokemon_v2_pokedexversiongroup + schema: public +- name: pokemon_v2_pokemondexnumbers + using: + foreign_key_constraint_on: + column: pokedex_id + table: + name: pokemon_v2_pokemondexnumber + schema: public +object_relationships: +- name: pokemon_v2_region + using: + foreign_key_constraint_on: region_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokedex + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml new file mode 100644 index 00000000..e1850165 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokedex + using: + foreign_key_constraint_on: pokedex_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokedexdescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml new file mode 100644 index 00000000..625d68c6 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokedex + using: + foreign_key_constraint_on: pokedex_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokedexname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml new file mode 100644 index 00000000..89022c64 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_pokedex + using: + foreign_key_constraint_on: pokedex_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokedexversiongroup + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml new file mode 100644 index 00000000..420f3587 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml @@ -0,0 +1,85 @@ +array_relationships: +- name: pokemon_v2_encounters + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_encounter + schema: public +- name: pokemon_v2_pokemonabilities + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemonability + schema: public +- name: pokemon_v2_pokemonforms + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemonform + schema: public +- name: pokemon_v2_pokemongameindices + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemongameindex + schema: public +- name: pokemon_v2_pokemonitems + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemonitem + schema: public +- name: pokemon_v2_pokemonmoves + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemonmove + schema: public +- name: pokemon_v2_pokemonsprites + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemonsprites + schema: public +- name: pokemon_v2_pokemonstats + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemonstat + schema: public +- name: pokemon_v2_pokemontypepasts + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemontypepast + schema: public +- name: pokemon_v2_pokemontypes + using: + foreign_key_constraint_on: + column: pokemon_id + table: + name: pokemon_v2_pokemontype + schema: public +object_relationships: +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: pokemon_species_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemon + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml new file mode 100644 index 00000000..be2295c8 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_ability + using: + foreign_key_constraint_on: ability_id +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonability + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml new file mode 100644 index 00000000..6425788c --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_pokemoncolornames + using: + foreign_key_constraint_on: + column: pokemon_color_id + table: + name: pokemon_v2_pokemoncolorname + schema: public +- name: pokemon_v2_pokemonspecies + using: + foreign_key_constraint_on: + column: pokemon_color_id + table: + name: pokemon_v2_pokemonspecies + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemoncolor + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml new file mode 100644 index 00000000..f80a0c47 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokemoncolor + using: + foreign_key_constraint_on: pokemon_color_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemoncolorname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml new file mode 100644 index 00000000..edb746b7 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_pokedex + using: + foreign_key_constraint_on: pokedex_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: pokemon_species_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemondexnumber + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml new file mode 100644 index 00000000..e03ec218 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_egggroup + using: + foreign_key_constraint_on: egg_group_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: pokemon_species_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonegggroup + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml new file mode 100644 index 00000000..7517612f --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml @@ -0,0 +1,44 @@ +object_relationships: +- name: pokemonV2ItemByHeldItemId + using: + foreign_key_constraint_on: held_item_id +- name: pokemonV2PokemonspecyByPartySpeciesId + using: + foreign_key_constraint_on: party_species_id +- name: pokemonV2PokemonspecyByTradeSpeciesId + using: + foreign_key_constraint_on: trade_species_id +- name: pokemonV2TypeByPartyTypeId + using: + foreign_key_constraint_on: party_type_id +- name: pokemon_v2_evolutiontrigger + using: + foreign_key_constraint_on: evolution_trigger_id +- name: pokemon_v2_gender + using: + foreign_key_constraint_on: gender_id +- name: pokemon_v2_item + using: + foreign_key_constraint_on: evolution_item_id +- name: pokemon_v2_location + using: + foreign_key_constraint_on: location_id +- name: pokemon_v2_move + using: + foreign_key_constraint_on: known_move_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: evolved_species_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: known_move_type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonevolution + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml new file mode 100644 index 00000000..950ead19 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml @@ -0,0 +1,46 @@ +array_relationships: +- name: pokemon_v2_pokemonformgenerations + using: + foreign_key_constraint_on: + column: pokemon_form_id + table: + name: pokemon_v2_pokemonformgeneration + schema: public +- name: pokemon_v2_pokemonformnames + using: + foreign_key_constraint_on: + column: pokemon_form_id + table: + name: pokemon_v2_pokemonformname + schema: public +- name: pokemon_v2_pokemonformsprites + using: + foreign_key_constraint_on: + column: pokemon_form_id + table: + name: pokemon_v2_pokemonformsprites + schema: public +- name: pokemon_v2_pokemonformtypes + using: + foreign_key_constraint_on: + column: pokemon_form_id + table: + name: pokemon_v2_pokemonformtype + schema: public +object_relationships: +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonform + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml new file mode 100644 index 00000000..302c86e3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_pokemonform + using: + foreign_key_constraint_on: pokemon_form_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonformgeneration + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml new file mode 100644 index 00000000..5d0a4507 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokemonform + using: + foreign_key_constraint_on: pokemon_form_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonformname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml new file mode 100644 index 00000000..ff27f347 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml @@ -0,0 +1,14 @@ +object_relationships: +- name: pokemon_v2_pokemonform + using: + foreign_key_constraint_on: pokemon_form_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonformsprites + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml new file mode 100644 index 00000000..ca1b67f0 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_pokemonform + using: + foreign_key_constraint_on: pokemon_form_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonformtype + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml new file mode 100644 index 00000000..0c08dfb9 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_version + using: + foreign_key_constraint_on: version_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemongameindex + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml new file mode 100644 index 00000000..a9a32392 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_pokemonhabitatnames + using: + foreign_key_constraint_on: + column: pokemon_habitat_id + table: + name: pokemon_v2_pokemonhabitatname + schema: public +- name: pokemon_v2_pokemonspecies + using: + foreign_key_constraint_on: + column: pokemon_habitat_id + table: + name: pokemon_v2_pokemonspecies + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonhabitat + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml new file mode 100644 index 00000000..86e146e6 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokemonhabitat + using: + foreign_key_constraint_on: pokemon_habitat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonhabitatname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml new file mode 100644 index 00000000..d7efb85f --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_item + using: + foreign_key_constraint_on: item_id +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_version + using: + foreign_key_constraint_on: version_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonitem + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml new file mode 100644 index 00000000..9ddc19c3 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml @@ -0,0 +1,23 @@ +object_relationships: +- name: pokemon_v2_move + using: + foreign_key_constraint_on: move_id +- name: pokemon_v2_movelearnmethod + using: + foreign_key_constraint_on: move_learn_method_id +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonmove + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml new file mode 100644 index 00000000..bbf6d1c8 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_pokemonshapenames + using: + foreign_key_constraint_on: + column: pokemon_shape_id + table: + name: pokemon_v2_pokemonshapename + schema: public +- name: pokemon_v2_pokemonspecies + using: + foreign_key_constraint_on: + column: pokemon_shape_id + table: + name: pokemon_v2_pokemonspecies + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonshape + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml new file mode 100644 index 00000000..72cdf1bd --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokemonshape + using: + foreign_key_constraint_on: pokemon_shape_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonshapename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml new file mode 100644 index 00000000..f8954280 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml @@ -0,0 +1,110 @@ +array_relationships: +- name: pokemonV2PokemonevolutionsByPartySpeciesId + using: + foreign_key_constraint_on: + column: party_species_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemonV2PokemonevolutionsByTradeSpeciesId + using: + foreign_key_constraint_on: + column: trade_species_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemon_v2_palparks + using: + foreign_key_constraint_on: + column: pokemon_species_id + table: + name: pokemon_v2_palpark + schema: public +- name: pokemon_v2_pokemondexnumbers + using: + foreign_key_constraint_on: + column: pokemon_species_id + table: + name: pokemon_v2_pokemondexnumber + schema: public +- name: pokemon_v2_pokemonegggroups + using: + foreign_key_constraint_on: + column: pokemon_species_id + table: + name: pokemon_v2_pokemonegggroup + schema: public +- name: pokemon_v2_pokemonevolutions + using: + foreign_key_constraint_on: + column: evolved_species_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemon_v2_pokemons + using: + foreign_key_constraint_on: + column: pokemon_species_id + table: + name: pokemon_v2_pokemon + schema: public +- name: pokemon_v2_pokemonspecies + using: + foreign_key_constraint_on: + column: evolves_from_species_id + table: + name: pokemon_v2_pokemonspecies + schema: public +- name: pokemon_v2_pokemonspeciesdescriptions + using: + foreign_key_constraint_on: + column: pokemon_species_id + table: + name: pokemon_v2_pokemonspeciesdescription + schema: public +- name: pokemon_v2_pokemonspeciesflavortexts + using: + foreign_key_constraint_on: + column: pokemon_species_id + table: + name: pokemon_v2_pokemonspeciesflavortext + schema: public +- name: pokemon_v2_pokemonspeciesnames + using: + foreign_key_constraint_on: + column: pokemon_species_id + table: + name: pokemon_v2_pokemonspeciesname + schema: public +object_relationships: +- name: pokemon_v2_evolutionchain + using: + foreign_key_constraint_on: evolution_chain_id +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_growthrate + using: + foreign_key_constraint_on: growth_rate_id +- name: pokemon_v2_pokemoncolor + using: + foreign_key_constraint_on: pokemon_color_id +- name: pokemon_v2_pokemonhabitat + using: + foreign_key_constraint_on: pokemon_habitat_id +- name: pokemon_v2_pokemonshape + using: + foreign_key_constraint_on: pokemon_shape_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: evolves_from_species_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonspecies + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml new file mode 100644 index 00000000..e4e4fe36 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: pokemon_species_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonspeciesdescription + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml new file mode 100644 index 00000000..b36a7ea2 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: pokemon_species_id +- name: pokemon_v2_version + using: + foreign_key_constraint_on: version_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonspeciesflavortext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml new file mode 100644 index 00000000..0b6e8f96 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_pokemonspecy + using: + foreign_key_constraint_on: pokemon_species_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonspeciesname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml new file mode 100644 index 00000000..3e0d83ae --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml @@ -0,0 +1,14 @@ +object_relationships: +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonsprites + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml new file mode 100644 index 00000000..923a7800 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_stat + using: + foreign_key_constraint_on: stat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemonstat + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml new file mode 100644 index 00000000..042f9278 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemontype + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml new file mode 100644 index 00000000..9b792195 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml @@ -0,0 +1,20 @@ +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_pokemon + using: + foreign_key_constraint_on: pokemon_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_pokemontypepast + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml new file mode 100644 index 00000000..1d8c917e --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml @@ -0,0 +1,46 @@ +array_relationships: +- name: pokemon_v2_generations + using: + foreign_key_constraint_on: + column: region_id + table: + name: pokemon_v2_generation + schema: public +- name: pokemon_v2_locations + using: + foreign_key_constraint_on: + column: region_id + table: + name: pokemon_v2_location + schema: public +- name: pokemon_v2_pokedexes + using: + foreign_key_constraint_on: + column: region_id + table: + name: pokemon_v2_pokedex + schema: public +- name: pokemon_v2_regionnames + using: + foreign_key_constraint_on: + column: region_id + table: + name: pokemon_v2_regionname + schema: public +- name: pokemon_v2_versiongroupregions + using: + foreign_key_constraint_on: + column: region_id + table: + name: pokemon_v2_versiongroupregion + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_region + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml new file mode 100644 index 00000000..6bfde712 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_region + using: + foreign_key_constraint_on: region_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_regionname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml new file mode 100644 index 00000000..a4fbbbee --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml @@ -0,0 +1,57 @@ +array_relationships: +- name: pokemonV2NaturesByIncreasedStatId + using: + foreign_key_constraint_on: + column: increased_stat_id + table: + name: pokemon_v2_nature + schema: public +- name: pokemon_v2_characteristics + using: + foreign_key_constraint_on: + column: stat_id + table: + name: pokemon_v2_characteristic + schema: public +- name: pokemon_v2_movemetastatchanges + using: + foreign_key_constraint_on: + column: stat_id + table: + name: pokemon_v2_movemetastatchange + schema: public +- name: pokemon_v2_natures + using: + foreign_key_constraint_on: + column: decreased_stat_id + table: + name: pokemon_v2_nature + schema: public +- name: pokemon_v2_pokemonstats + using: + foreign_key_constraint_on: + column: stat_id + table: + name: pokemon_v2_pokemonstat + schema: public +- name: pokemon_v2_statnames + using: + foreign_key_constraint_on: + column: stat_id + table: + name: pokemon_v2_statname + schema: public +object_relationships: +- name: pokemon_v2_movedamageclass + using: + foreign_key_constraint_on: move_damage_class_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_stat + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml new file mode 100644 index 00000000..c9ddb45c --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_stat + using: + foreign_key_constraint_on: stat_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_statname + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml new file mode 100644 index 00000000..99a091c6 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemonV2MoveBySecondMoveId + using: + foreign_key_constraint_on: second_move_id +- name: pokemon_v2_move + using: + foreign_key_constraint_on: first_move_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_supercontestcombo + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml new file mode 100644 index 00000000..78c79bce --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml @@ -0,0 +1,25 @@ +array_relationships: +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: super_contest_effect_id + table: + name: pokemon_v2_move + schema: public +- name: pokemon_v2_supercontesteffectflavortexts + using: + foreign_key_constraint_on: + column: super_contest_effect_id + table: + name: pokemon_v2_supercontesteffectflavortext + schema: public +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_supercontesteffect + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml new file mode 100644 index 00000000..793434a8 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_supercontesteffect + using: + foreign_key_constraint_on: super_contest_effect_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_supercontesteffectflavortext + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml new file mode 100644 index 00000000..022c8abf --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml @@ -0,0 +1,102 @@ +array_relationships: +- name: pokemonV2PokemonevolutionsByPartyTypeId + using: + foreign_key_constraint_on: + column: party_type_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemonV2TypeefficaciesByTargetTypeId + using: + foreign_key_constraint_on: + column: target_type_id + table: + name: pokemon_v2_typeefficacy + schema: public +- name: pokemon_v2_berries + using: + foreign_key_constraint_on: + column: natural_gift_type_id + table: + name: pokemon_v2_berry + schema: public +- name: pokemon_v2_movechanges + using: + foreign_key_constraint_on: + column: type_id + table: + name: pokemon_v2_movechange + schema: public +- name: pokemon_v2_moves + using: + foreign_key_constraint_on: + column: type_id + table: + name: pokemon_v2_move + schema: public +- name: pokemon_v2_pokemonevolutions + using: + foreign_key_constraint_on: + column: known_move_type_id + table: + name: pokemon_v2_pokemonevolution + schema: public +- name: pokemon_v2_pokemonformtypes + using: + foreign_key_constraint_on: + column: type_id + table: + name: pokemon_v2_pokemonformtype + schema: public +- name: pokemon_v2_pokemontypepasts + using: + foreign_key_constraint_on: + column: type_id + table: + name: pokemon_v2_pokemontypepast + schema: public +- name: pokemon_v2_pokemontypes + using: + foreign_key_constraint_on: + column: type_id + table: + name: pokemon_v2_pokemontype + schema: public +- name: pokemon_v2_typeefficacies + using: + foreign_key_constraint_on: + column: damage_type_id + table: + name: pokemon_v2_typeefficacy + schema: public +- name: pokemon_v2_typegameindices + using: + foreign_key_constraint_on: + column: type_id + table: + name: pokemon_v2_typegameindex + schema: public +- name: pokemon_v2_typenames + using: + foreign_key_constraint_on: + column: type_id + table: + name: pokemon_v2_typename + schema: public +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_movedamageclass + using: + foreign_key_constraint_on: move_damage_class_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_type + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml new file mode 100644 index 00000000..a3066985 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemonV2TypeByTargetTypeId + using: + foreign_key_constraint_on: target_type_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: damage_type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_typeefficacy + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml new file mode 100644 index 00000000..0be06f48 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_typegameindex + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml new file mode 100644 index 00000000..da225420 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_type + using: + foreign_key_constraint_on: type_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_typename + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml new file mode 100644 index 00000000..d1f5777e --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml @@ -0,0 +1,57 @@ +array_relationships: +- name: pokemon_v2_encounters + using: + foreign_key_constraint_on: + column: version_id + table: + name: pokemon_v2_encounter + schema: public +- name: pokemon_v2_locationareaencounterrates + using: + foreign_key_constraint_on: + column: version_id + table: + name: pokemon_v2_locationareaencounterrate + schema: public +- name: pokemon_v2_pokemongameindices + using: + foreign_key_constraint_on: + column: version_id + table: + name: pokemon_v2_pokemongameindex + schema: public +- name: pokemon_v2_pokemonitems + using: + foreign_key_constraint_on: + column: version_id + table: + name: pokemon_v2_pokemonitem + schema: public +- name: pokemon_v2_pokemonspeciesflavortexts + using: + foreign_key_constraint_on: + column: version_id + table: + name: pokemon_v2_pokemonspeciesflavortext + schema: public +- name: pokemon_v2_versionnames + using: + foreign_key_constraint_on: + column: version_id + table: + name: pokemon_v2_versionname + schema: public +object_relationships: +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_version + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml new file mode 100644 index 00000000..7c583a0a --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml @@ -0,0 +1,113 @@ +array_relationships: +- name: pokemon_v2_abilitychanges + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_abilitychange + schema: public +- name: pokemon_v2_abilityflavortexts + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_abilityflavortext + schema: public +- name: pokemon_v2_encounterslots + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_encounterslot + schema: public +- name: pokemon_v2_itemflavortexts + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_itemflavortext + schema: public +- name: pokemon_v2_machines + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_machine + schema: public +- name: pokemon_v2_movechanges + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_movechange + schema: public +- name: pokemon_v2_moveeffectchanges + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_moveeffectchange + schema: public +- name: pokemon_v2_moveflavortexts + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_moveflavortext + schema: public +- name: pokemon_v2_pokedexversiongroups + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_pokedexversiongroup + schema: public +- name: pokemon_v2_pokemonforms + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_pokemonform + schema: public +- name: pokemon_v2_pokemonmoves + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_pokemonmove + schema: public +- name: pokemon_v2_versiongroupmovelearnmethods + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_versiongroupmovelearnmethod + schema: public +- name: pokemon_v2_versiongroupregions + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_versiongroupregion + schema: public +- name: pokemon_v2_versions + using: + foreign_key_constraint_on: + column: version_group_id + table: + name: pokemon_v2_version + schema: public +object_relationships: +- name: pokemon_v2_generation + using: + foreign_key_constraint_on: generation_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_versiongroup + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml new file mode 100644 index 00000000..7da4c73b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_movelearnmethod + using: + foreign_key_constraint_on: move_learn_method_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_versiongroupmovelearnmethod + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml new file mode 100644 index 00000000..180f1462 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_region + using: + foreign_key_constraint_on: region_id +- name: pokemon_v2_versiongroup + using: + foreign_key_constraint_on: version_group_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_versiongroupregion + schema: public diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml new file mode 100644 index 00000000..c980452b --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml @@ -0,0 +1,17 @@ +object_relationships: +- name: pokemon_v2_language + using: + foreign_key_constraint_on: language_id +- name: pokemon_v2_version + using: + foreign_key_constraint_on: version_id +select_permissions: +- permission: + allow_aggregations: true + columns: '*' + filter: {} + limit: 100000 + role: anon +table: + name: pokemon_v2_versionname + schema: public diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/metadata/query_collections.yaml @@ -0,0 +1 @@ +[] diff --git a/hasura/metadata/remote_schemas.yaml b/hasura/metadata/remote_schemas.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/metadata/remote_schemas.yaml @@ -0,0 +1 @@ +[] diff --git a/hasura/metadata/version.yaml b/hasura/metadata/version.yaml new file mode 100644 index 00000000..0a70affa --- /dev/null +++ b/hasura/metadata/version.yaml @@ -0,0 +1 @@ +version: 3 From 13c0712178601721935916c873365b0866becc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 8 Mar 2021 22:50:19 +0100 Subject: [PATCH 012/113] chore: add hasura make commands --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index b36ea57a..9ce7cbc8 100755 --- a/Makefile +++ b/Makefile @@ -86,3 +86,9 @@ sync-from-veekun: pull pull-veekun # Copy data from ../pokedex to this repositor sync-to-veekun: pull pull-veekun # Copy data from this repository to ../pokedex cp -a ./data/v2/csv/. ${veekun_pokedex_repository}/pokedex/data/csv + +hasura-export: # Export Hasura configuration + hasura md export --admin-secret pokemon + +hasura-apply: # Apply local Hasura configuration + hasura md apply --admin-secret pokemon From f5f3d508a5635e52b8f1fd81e7953a695286f25d Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Tue, 9 Mar 2021 17:49:41 +0000 Subject: [PATCH 013/113] Encounter corrections Due to an error the headbutt importer script used the wrong tables for gold and silver, this commit re-run this tool with the correct data and solved the inconsistencies that were present in the previous commits. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replaced all headbutt encounters with their correct counterparts - Relocated some encounter's IDs - Created location area Bell Tower 1f - Moved Pokémon Crystal's Suicune encounter from Bell Tower Roof to Bell Tower 1f (it's correct position) --- data/v2/csv/encounter_condition_value_map.csv | 4 +- data/v2/csv/encounters.csv | 2847 +++++++---------- data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 1 + 4 files changed, 1153 insertions(+), 1700 deletions(-) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 138da3ed..795fd74a 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -16971,5 +16971,5 @@ encounter_id,encounter_condition_value_id 58140,35 58138,28 58140,27 -59829,39 -59830,39 +59280,39 +59281,39 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 85f36a29..a7f8fecb 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -54393,7 +54393,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58103,4,793,563,250,40,40 58104,5,793,563,250,70,70 58105,6,793,564,250,60,60 -58106,6,793,564,245,40,40 +58106,6,805,564,245,40,40 58107,15,793,570,250,45,45 58108,16,793,570,250,70,70 58109,15,232,570,249,70,70 @@ -54428,1700 +54428,1151 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58138,9,796,566,380,40,40 58139,7,796,565,381,40,40 58140,9,796,566,381,40,40 -58141,6,287,593,163,10,10 -58142,6,287,594,23,10,10 -58143,6,287,595,163,10,10 -58144,6,287,596,102,10,10 -58145,6,287,597,102,10,10 -58146,6,287,598,102,10,10 -58147,6,288,593,163,10,10 -58148,6,288,594,23,10,10 -58149,6,288,595,163,10,10 -58150,6,288,596,102,10,10 -58151,6,288,597,102,10,10 -58152,6,288,598,102,10,10 -58153,6,185,593,163,10,10 -58154,6,185,594,167,10,10 -58155,6,185,595,165,10,10 -58156,6,185,596,102,10,10 -58157,6,185,597,102,10,10 -58158,6,185,598,102,10,10 -58159,6,187,593,163,10,10 -58160,6,187,594,167,10,10 -58161,6,187,595,165,10,10 -58162,6,187,596,102,10,10 -58163,6,187,597,102,10,10 -58164,6,187,598,102,10,10 -58165,6,188,593,163,10,10 -58166,6,188,594,167,10,10 -58167,6,188,595,165,10,10 -58168,6,188,596,102,10,10 -58169,6,188,597,102,10,10 -58170,6,188,598,102,10,10 -58171,6,192,593,163,10,10 -58172,6,192,594,23,10,10 -58173,6,192,595,163,10,10 -58174,6,192,596,102,10,10 -58175,6,192,597,102,10,10 -58176,6,192,598,102,10,10 -58177,6,201,593,21,10,10 -58178,6,201,594,23,10,10 -58179,6,201,595,21,10,10 -58180,6,201,596,190,10,10 -58181,6,201,597,190,10,10 -58182,6,201,598,190,10,10 -58183,6,205,593,163,10,10 -58184,6,205,594,167,10,10 -58185,6,205,595,165,10,10 -58186,6,205,596,102,10,10 -58187,6,205,597,102,10,10 -58188,6,205,598,102,10,10 -58189,6,206,593,163,10,10 -58190,6,206,594,167,10,10 -58191,6,206,595,165,10,10 -58192,6,206,596,102,10,10 -58193,6,206,597,102,10,10 -58194,6,206,598,102,10,10 -58195,6,209,593,163,10,10 -58196,6,209,594,167,10,10 -58197,6,209,595,165,10,10 -58198,6,209,596,102,10,10 -58199,6,209,597,102,10,10 -58200,6,209,598,102,10,10 -58201,6,210,593,163,10,10 -58202,6,210,594,167,10,10 -58203,6,210,595,165,10,10 -58204,6,210,596,102,10,10 -58205,6,210,597,102,10,10 -58206,6,210,598,102,10,10 -58207,6,222,593,163,10,10 -58208,6,222,594,167,10,10 -58209,6,222,595,165,10,10 -58210,6,222,596,102,10,10 -58211,6,222,597,102,10,10 -58212,6,222,598,102,10,10 -58213,6,223,593,163,10,10 -58214,6,223,594,167,10,10 -58215,6,223,595,165,10,10 -58216,6,223,596,102,10,10 -58217,6,223,597,102,10,10 -58218,6,223,598,102,10,10 -58219,6,236,593,21,10,10 -58220,6,236,594,23,10,10 -58221,6,236,595,21,10,10 -58222,6,236,596,190,10,10 -58223,6,236,597,190,10,10 -58224,6,236,598,190,10,10 -58225,6,241,593,163,10,10 -58226,6,241,594,48,10,10 -58227,6,241,595,163,10,10 -58228,6,241,596,102,10,10 -58229,6,241,597,102,10,10 -58230,6,241,598,102,10,10 -58231,6,243,593,21,10,10 -58232,6,243,594,21,10,10 -58233,6,243,595,21,10,10 -58234,6,243,596,190,10,10 -58235,6,243,597,190,10,10 -58236,6,243,598,190,10,10 -58237,6,251,593,21,10,10 -58238,6,251,594,21,10,10 -58239,6,251,595,21,10,10 -58240,6,251,596,190,10,10 -58241,6,251,597,190,10,10 -58242,6,251,598,190,10,10 -58243,6,252,593,21,10,10 -58244,6,252,594,21,10,10 -58245,6,252,595,21,10,10 -58246,6,252,596,190,10,10 -58247,6,252,597,190,10,10 -58248,6,252,598,190,10,10 -58249,6,798,593,21,10,10 -58250,6,798,594,23,10,10 -58251,6,798,595,21,10,10 -58252,6,798,596,190,10,10 -58253,6,798,597,190,10,10 -58254,6,798,598,190,10,10 -58255,6,242,593,163,10,10 -58256,6,242,594,48,10,10 -58257,6,242,595,163,10,10 -58258,6,242,596,102,10,10 -58259,6,242,597,102,10,10 -58260,6,242,598,102,10,10 -58261,6,204,593,163,10,10 -58262,6,204,594,204,10,10 -58263,6,204,595,204,10,10 -58264,6,204,596,164,10,10 -58265,6,204,597,12,10,10 -58266,6,204,598,15,10,10 -58267,6,287,610,163,10,10 -58268,6,287,611,23,10,10 -58269,6,287,612,163,10,10 -58270,6,287,613,102,10,10 -58271,6,287,614,102,10,10 -58272,6,287,615,102,10,10 -58273,6,288,610,163,10,10 -58274,6,288,611,23,10,10 -58275,6,288,612,163,10,10 -58276,6,288,613,102,10,10 -58277,6,288,614,102,10,10 -58278,6,288,615,102,10,10 -58279,6,185,610,163,10,10 -58280,6,185,611,167,10,10 -58281,6,185,612,165,10,10 -58282,6,185,613,102,10,10 -58283,6,185,614,102,10,10 -58284,6,185,615,102,10,10 -58285,6,187,610,163,10,10 -58286,6,187,611,167,10,10 -58287,6,187,612,165,10,10 -58288,6,187,613,102,10,10 -58289,6,187,614,102,10,10 -58290,6,187,615,102,10,10 -58291,6,188,610,163,10,10 -58292,6,188,611,167,10,10 -58293,6,188,612,165,10,10 -58294,6,188,613,102,10,10 -58295,6,188,614,102,10,10 -58296,6,188,615,102,10,10 -58297,6,192,610,163,10,10 -58298,6,192,611,23,10,10 -58299,6,192,612,163,10,10 -58300,6,192,613,102,10,10 -58301,6,192,614,102,10,10 -58302,6,192,615,102,10,10 -58303,6,201,610,21,10,10 -58304,6,201,611,23,10,10 -58305,6,201,612,21,10,10 -58306,6,201,613,190,10,10 -58307,6,201,614,190,10,10 -58308,6,201,615,190,10,10 -58309,6,205,610,163,10,10 -58310,6,205,611,167,10,10 -58311,6,205,612,165,10,10 -58312,6,205,613,102,10,10 -58313,6,205,614,102,10,10 -58314,6,205,615,102,10,10 -58315,6,206,610,163,10,10 -58316,6,206,611,167,10,10 -58317,6,206,612,165,10,10 -58318,6,206,613,102,10,10 -58319,6,206,614,102,10,10 -58320,6,206,615,102,10,10 -58321,6,209,610,163,10,10 -58322,6,209,611,167,10,10 -58323,6,209,612,165,10,10 -58324,6,209,613,102,10,10 -58325,6,209,614,102,10,10 -58326,6,209,615,102,10,10 -58327,6,210,610,163,10,10 -58328,6,210,611,167,10,10 -58329,6,210,612,165,10,10 -58330,6,210,613,102,10,10 -58331,6,210,614,102,10,10 -58332,6,210,615,102,10,10 -58333,6,222,610,163,10,10 -58334,6,222,611,167,10,10 -58335,6,222,612,165,10,10 -58336,6,222,613,102,10,10 -58337,6,222,614,102,10,10 -58338,6,222,615,102,10,10 -58339,6,223,610,163,10,10 -58340,6,223,611,167,10,10 -58341,6,223,612,165,10,10 -58342,6,223,613,102,10,10 -58343,6,223,614,102,10,10 -58344,6,223,615,102,10,10 -58345,6,236,610,21,10,10 -58346,6,236,611,23,10,10 -58347,6,236,612,21,10,10 -58348,6,236,613,190,10,10 -58349,6,236,614,190,10,10 -58350,6,236,615,190,10,10 -58351,6,241,610,163,10,10 -58352,6,241,611,48,10,10 -58353,6,241,612,163,10,10 -58354,6,241,613,102,10,10 -58355,6,241,614,102,10,10 -58356,6,241,615,102,10,10 -58357,6,243,610,21,10,10 -58358,6,243,611,21,10,10 -58359,6,243,612,21,10,10 -58360,6,243,613,190,10,10 -58361,6,243,614,190,10,10 -58362,6,243,615,190,10,10 -58363,6,251,610,21,10,10 -58364,6,251,611,21,10,10 -58365,6,251,612,21,10,10 -58366,6,251,613,190,10,10 -58367,6,251,614,190,10,10 -58368,6,251,615,190,10,10 -58369,6,252,610,21,10,10 -58370,6,252,611,21,10,10 -58371,6,252,612,21,10,10 -58372,6,252,613,190,10,10 -58373,6,252,614,190,10,10 -58374,6,252,615,190,10,10 -58375,6,798,610,21,10,10 -58376,6,798,611,23,10,10 -58377,6,798,612,21,10,10 -58378,6,798,613,190,10,10 -58379,6,798,614,190,10,10 -58380,6,798,615,190,10,10 -58381,6,242,610,163,10,10 -58382,6,242,611,48,10,10 -58383,6,242,612,163,10,10 -58384,6,242,613,102,10,10 -58385,6,242,614,102,10,10 -58386,6,242,615,102,10,10 -58387,6,204,610,163,10,10 -58388,6,204,611,204,10,10 -58389,6,204,612,204,10,10 -58390,6,204,613,164,10,10 -58391,6,204,614,12,10,10 -58392,6,204,615,15,10,10 -58393,6,287,610,163,10,10 -58394,6,287,611,204,10,10 -58395,6,287,612,204,10,10 -58396,6,287,613,102,10,10 -58397,6,287,614,102,10,10 -58398,6,287,615,102,10,10 -58399,6,288,610,163,10,10 -58400,6,288,611,204,10,10 -58401,6,288,612,204,10,10 -58402,6,288,613,102,10,10 -58403,6,288,614,102,10,10 -58404,6,288,615,102,10,10 -58405,6,185,610,163,10,10 -58406,6,185,611,204,10,10 -58407,6,185,612,204,10,10 -58408,6,185,613,102,10,10 -58409,6,185,614,102,10,10 -58410,6,185,615,102,10,10 -58411,6,187,610,163,10,10 -58412,6,187,611,204,10,10 -58413,6,187,612,204,10,10 -58414,6,187,613,102,10,10 -58415,6,187,614,102,10,10 -58416,6,187,615,102,10,10 -58417,6,188,610,163,10,10 -58418,6,188,611,204,10,10 -58419,6,188,612,204,10,10 -58420,6,188,613,102,10,10 -58421,6,188,614,102,10,10 -58422,6,188,615,102,10,10 -58423,6,192,610,163,10,10 -58424,6,192,611,204,10,10 -58425,6,192,612,204,10,10 -58426,6,192,613,102,10,10 -58427,6,192,614,102,10,10 -58428,6,192,615,102,10,10 -58429,6,201,610,21,10,10 -58430,6,201,611,214,10,10 -58431,6,201,612,214,10,10 -58432,6,201,613,190,10,10 -58433,6,201,614,190,10,10 -58434,6,201,615,190,10,10 -58435,6,205,610,163,10,10 -58436,6,205,611,204,10,10 -58437,6,205,612,204,10,10 -58438,6,205,613,102,10,10 -58439,6,205,614,102,10,10 -58440,6,205,615,102,10,10 -58441,6,206,610,163,10,10 -58442,6,206,611,204,10,10 -58443,6,206,612,204,10,10 -58444,6,206,613,102,10,10 -58445,6,206,614,102,10,10 -58446,6,206,615,102,10,10 -58447,6,209,610,163,10,10 -58448,6,209,611,204,10,10 -58449,6,209,612,204,10,10 -58450,6,209,613,102,10,10 -58451,6,209,614,102,10,10 -58452,6,209,615,102,10,10 -58453,6,210,610,163,10,10 -58454,6,210,611,204,10,10 -58455,6,210,612,204,10,10 -58456,6,210,613,102,10,10 -58457,6,210,614,102,10,10 -58458,6,210,615,102,10,10 -58459,6,222,610,163,10,10 -58460,6,222,611,204,10,10 -58461,6,222,612,204,10,10 -58462,6,222,613,102,10,10 -58463,6,222,614,102,10,10 -58464,6,222,615,102,10,10 -58465,6,223,610,163,10,10 -58466,6,223,611,204,10,10 -58467,6,223,612,204,10,10 -58468,6,223,613,102,10,10 -58469,6,223,614,102,10,10 -58470,6,223,615,102,10,10 -58471,6,236,610,21,10,10 -58472,6,236,611,214,10,10 -58473,6,236,612,214,10,10 -58474,6,236,613,190,10,10 -58475,6,236,614,190,10,10 -58476,6,236,615,190,10,10 -58477,6,241,610,163,10,10 -58478,6,241,611,204,10,10 -58479,6,241,612,204,10,10 -58480,6,241,613,102,10,10 -58481,6,241,614,102,10,10 -58482,6,241,615,102,10,10 -58483,6,243,610,21,10,10 -58484,6,243,611,214,10,10 -58485,6,243,612,214,10,10 -58486,6,243,613,190,10,10 -58487,6,243,614,190,10,10 -58488,6,243,615,190,10,10 -58489,6,251,610,21,10,10 -58490,6,251,611,214,10,10 -58491,6,251,612,214,10,10 -58492,6,251,613,190,10,10 -58493,6,251,614,190,10,10 -58494,6,251,615,190,10,10 -58495,6,252,610,21,10,10 -58496,6,252,611,214,10,10 -58497,6,252,612,214,10,10 -58498,6,252,613,190,10,10 -58499,6,252,614,190,10,10 -58500,6,252,615,190,10,10 -58501,6,798,610,21,10,10 -58502,6,798,611,214,10,10 -58503,6,798,612,214,10,10 -58504,6,798,613,190,10,10 -58505,6,798,614,190,10,10 -58506,6,798,615,190,10,10 -58507,6,242,610,163,10,10 -58508,6,242,611,204,10,10 -58509,6,242,612,204,10,10 -58510,6,242,613,102,10,10 -58511,6,242,614,102,10,10 -58512,6,242,615,102,10,10 -58513,6,204,610,163,10,10 -58514,6,204,611,10,10,10 -58515,6,204,612,13,10,10 -58516,6,204,613,163,10,10 -58517,6,204,614,11,10,10 -58518,6,204,615,14,10,10 -58519,5,287,587,48,15,15 -58520,5,287,588,48,15,15 -58521,5,287,589,63,15,15 -58522,5,287,590,63,15,15 -58523,5,287,591,49,15,15 -58524,5,288,587,48,15,15 -58525,5,288,588,48,15,15 -58526,5,288,589,63,15,15 -58527,5,288,590,63,15,15 -58528,5,288,591,49,15,15 -58529,5,185,587,13,10,10 -58530,5,185,588,13,10,10 -58531,5,185,589,14,10,10 -58532,5,185,590,102,10,10 -58533,5,185,591,102,10,10 -58534,5,185,592,15,10,10 -58535,5,187,587,13,10,10 -58536,5,187,588,13,10,10 -58537,5,187,589,14,10,10 -58538,5,187,590,102,10,10 -58539,5,187,591,102,10,10 -58540,5,187,592,15,10,10 -58541,5,188,587,13,10,10 -58542,5,188,588,13,10,10 -58543,5,188,589,14,10,10 -58544,5,188,590,102,10,10 -58545,5,188,591,102,10,10 -58546,5,188,592,15,10,10 -58547,5,192,587,13,10,10 -58548,5,192,588,13,10,10 -58549,5,192,589,14,10,10 -58550,5,192,590,102,10,10 -58551,5,192,591,102,10,10 -58552,5,192,592,15,10,10 -58553,5,201,587,13,10,10 -58554,5,201,588,13,10,10 -58555,5,201,589,14,10,10 -58556,5,201,590,102,10,10 -58557,5,201,591,102,10,10 -58558,5,201,592,15,10,10 -58559,5,205,587,48,15,15 -58560,5,205,588,48,15,15 -58561,5,205,589,63,15,15 -58562,5,205,590,63,15,15 -58563,5,205,591,49,15,15 -58564,5,206,587,48,15,15 -58565,5,206,588,48,15,15 -58566,5,206,589,63,15,15 -58567,5,206,590,63,15,15 -58568,5,206,591,49,15,15 -58569,5,209,587,48,15,15 -58570,5,209,588,48,15,15 -58571,5,209,589,63,15,15 -58572,5,209,590,63,15,15 -58573,5,209,591,49,15,15 -58574,5,210,587,48,15,15 -58575,5,210,588,48,15,15 -58576,5,210,589,63,15,15 -58577,5,210,590,63,15,15 -58578,5,210,591,49,15,15 -58579,5,222,587,48,15,15 -58580,5,222,588,48,15,15 -58581,5,222,589,63,15,15 -58582,5,222,590,63,15,15 -58583,5,222,591,49,15,15 -58584,5,223,587,48,15,15 -58585,5,223,588,48,15,15 -58586,5,223,589,63,15,15 -58587,5,223,590,63,15,15 -58588,5,223,591,49,15,15 -58589,5,236,587,13,10,10 -58590,5,236,588,13,10,10 -58591,5,236,589,14,10,10 -58592,5,236,590,102,10,10 -58593,5,236,591,102,10,10 -58594,5,236,592,15,10,10 -58595,5,241,587,13,10,10 -58596,5,241,588,13,10,10 -58597,5,241,589,14,10,10 -58598,5,241,590,102,10,10 -58599,5,241,591,102,10,10 -58600,5,241,592,15,10,10 -58601,5,243,587,13,10,10 -58602,5,243,588,13,10,10 -58603,5,243,589,14,10,10 -58604,5,243,590,102,10,10 -58605,5,243,591,102,10,10 -58606,5,243,592,15,10,10 -58607,5,251,587,13,10,10 -58608,5,251,588,13,10,10 -58609,5,251,589,14,10,10 -58610,5,251,590,102,10,10 -58611,5,251,591,102,10,10 -58612,5,251,592,15,10,10 -58613,5,252,587,13,10,10 -58614,5,252,588,13,10,10 -58615,5,252,589,14,10,10 -58616,5,252,590,102,10,10 -58617,5,252,591,102,10,10 -58618,5,252,592,15,10,10 -58619,5,184,587,21,10,10 -58620,5,184,588,21,10,10 -58621,5,184,589,21,10,10 -58622,5,184,590,190,10,10 -58623,5,184,591,190,10,10 -58624,5,184,592,190,10,10 -58625,5,189,587,21,10,10 -58626,5,189,588,21,10,10 -58627,5,189,589,21,10,10 -58628,5,189,590,190,10,10 -58629,5,189,591,190,10,10 -58630,5,189,592,190,10,10 -58631,5,798,587,48,15,15 -58632,5,798,588,48,15,15 -58633,5,798,589,63,15,15 -58634,5,798,590,63,15,15 -58635,5,798,591,49,15,15 -58636,5,211,587,21,10,10 -58637,5,211,588,21,10,10 -58638,5,211,589,21,10,10 -58639,5,211,590,190,10,10 -58640,5,211,591,190,10,10 -58641,5,211,592,190,10,10 -58642,5,800,587,21,10,10 -58643,5,800,588,21,10,10 -58644,5,800,589,21,10,10 -58645,5,800,590,190,10,10 -58646,5,800,591,190,10,10 -58647,5,800,592,190,10,10 -58648,5,242,587,48,15,15 -58649,5,242,588,48,15,15 -58650,5,242,589,63,15,15 -58651,5,242,590,63,15,15 -58652,5,242,591,49,15,15 -58653,5,249,587,21,10,10 -58654,5,249,588,21,10,10 -58655,5,249,589,21,10,10 -58656,5,249,590,190,10,10 -58657,5,249,591,190,10,10 -58658,5,249,592,190,10,10 -58659,5,204,587,48,15,15 -58660,5,204,588,48,15,15 -58661,5,204,589,63,15,15 -58662,5,204,590,63,15,15 -58663,5,204,591,49,15,15 -58664,5,287,593,48,15,15 -58665,5,287,594,48,15,15 -58666,5,287,595,63,15,15 -58667,5,287,596,63,15,15 -58668,5,287,597,49,15,15 -58669,5,288,593,48,15,15 -58670,5,288,594,48,15,15 -58671,5,288,595,63,15,15 -58672,5,288,596,63,15,15 -58673,5,288,597,49,15,15 -58674,5,185,593,13,10,10 -58675,5,185,594,13,10,10 -58676,5,185,595,14,10,10 -58677,5,185,596,102,10,10 -58678,5,185,597,102,10,10 -58679,5,185,598,15,10,10 -58680,5,187,593,13,10,10 -58681,5,187,594,13,10,10 -58682,5,187,595,14,10,10 -58683,5,187,596,102,10,10 -58684,5,187,597,102,10,10 -58685,5,187,598,15,10,10 -58686,5,188,593,13,10,10 -58687,5,188,594,13,10,10 -58688,5,188,595,14,10,10 -58689,5,188,596,102,10,10 -58690,5,188,597,102,10,10 -58691,5,188,598,15,10,10 -58692,5,192,593,13,10,10 -58693,5,192,594,13,10,10 -58694,5,192,595,14,10,10 -58695,5,192,596,102,10,10 -58696,5,192,597,102,10,10 -58697,5,192,598,15,10,10 -58698,5,201,593,13,10,10 -58699,5,201,594,13,10,10 -58700,5,201,595,14,10,10 -58701,5,201,596,102,10,10 -58702,5,201,597,102,10,10 -58703,5,201,598,15,10,10 -58704,5,205,593,48,15,15 -58705,5,205,594,48,15,15 -58706,5,205,595,63,15,15 -58707,5,205,596,63,15,15 -58708,5,205,597,49,15,15 -58709,5,206,593,48,15,15 -58710,5,206,594,48,15,15 -58711,5,206,595,63,15,15 -58712,5,206,596,63,15,15 -58713,5,206,597,49,15,15 -58714,5,209,593,48,15,15 -58715,5,209,594,48,15,15 -58716,5,209,595,63,15,15 -58717,5,209,596,63,15,15 -58718,5,209,597,49,15,15 -58719,5,210,593,48,15,15 -58720,5,210,594,48,15,15 -58721,5,210,595,63,15,15 -58722,5,210,596,63,15,15 -58723,5,210,597,49,15,15 -58724,5,222,593,48,15,15 -58725,5,222,594,48,15,15 -58726,5,222,595,63,15,15 -58727,5,222,596,63,15,15 -58728,5,222,597,49,15,15 -58729,5,223,593,48,15,15 -58730,5,223,594,48,15,15 -58731,5,223,595,63,15,15 -58732,5,223,596,63,15,15 -58733,5,223,597,49,15,15 -58734,5,236,593,13,10,10 -58735,5,236,594,13,10,10 -58736,5,236,595,14,10,10 -58737,5,236,596,102,10,10 -58738,5,236,597,102,10,10 -58739,5,236,598,15,10,10 -58740,5,241,593,13,10,10 -58741,5,241,594,13,10,10 -58742,5,241,595,14,10,10 -58743,5,241,596,102,10,10 -58744,5,241,597,102,10,10 -58745,5,241,598,15,10,10 -58746,5,243,593,13,10,10 -58747,5,243,594,13,10,10 -58748,5,243,595,14,10,10 -58749,5,243,596,102,10,10 -58750,5,243,597,102,10,10 -58751,5,243,598,15,10,10 -58752,5,251,593,13,10,10 -58753,5,251,594,13,10,10 -58754,5,251,595,14,10,10 -58755,5,251,596,102,10,10 -58756,5,251,597,102,10,10 -58757,5,251,598,15,10,10 -58758,5,252,593,13,10,10 -58759,5,252,594,13,10,10 -58760,5,252,595,14,10,10 -58761,5,252,596,102,10,10 -58762,5,252,597,102,10,10 -58763,5,252,598,15,10,10 -58764,5,184,593,21,10,10 -58765,5,184,594,21,10,10 -58766,5,184,595,21,10,10 -58767,5,184,596,190,10,10 -58768,5,184,597,190,10,10 -58769,5,184,598,190,10,10 -58770,5,189,593,21,10,10 -58771,5,189,594,21,10,10 -58772,5,189,595,21,10,10 -58773,5,189,596,190,10,10 -58774,5,189,597,190,10,10 -58775,5,189,598,190,10,10 -58776,5,798,593,48,15,15 -58777,5,798,594,48,15,15 -58778,5,798,595,63,15,15 -58779,5,798,596,63,15,15 -58780,5,798,597,49,15,15 -58781,5,211,593,21,10,10 -58782,5,211,594,21,10,10 -58783,5,211,595,21,10,10 -58784,5,211,596,190,10,10 -58785,5,211,597,190,10,10 -58786,5,211,598,190,10,10 -58787,5,800,593,21,10,10 -58788,5,800,594,21,10,10 -58789,5,800,595,21,10,10 -58790,5,800,596,190,10,10 -58791,5,800,597,190,10,10 -58792,5,800,598,190,10,10 -58793,5,242,593,48,15,15 -58794,5,242,594,48,15,15 -58795,5,242,595,63,15,15 -58796,5,242,596,63,15,15 -58797,5,242,597,49,15,15 -58798,5,249,593,21,10,10 -58799,5,249,594,21,10,10 -58800,5,249,595,21,10,10 -58801,5,249,596,190,10,10 -58802,5,249,597,190,10,10 -58803,5,249,598,190,10,10 -58804,5,204,593,48,15,15 -58805,5,204,594,48,15,15 -58806,5,204,595,63,15,15 -58807,5,204,596,63,15,15 -58808,5,204,597,49,15,15 -58809,5,287,609,48,15,15 -58810,5,287,610,81,15,15 -58811,5,287,611,63,15,15 -58812,5,287,612,63,15,15 -58813,5,287,613,49,15,15 -58814,5,288,609,48,15,15 -58815,5,288,610,81,15,15 -58816,5,288,611,63,15,15 -58817,5,288,612,63,15,15 -58818,5,288,613,49,15,15 -58819,5,185,609,13,10,10 -58820,5,185,610,204,10,10 -58821,5,185,611,204,10,10 -58822,5,185,612,102,10,10 -58823,5,185,613,102,10,10 -58824,5,185,614,15,10,10 -58825,5,187,609,13,10,10 -58826,5,187,610,204,10,10 -58827,5,187,611,204,10,10 -58828,5,187,612,102,10,10 -58829,5,187,613,102,10,10 -58830,5,187,614,15,10,10 -58831,5,188,609,13,10,10 -58832,5,188,610,204,10,10 -58833,5,188,611,204,10,10 -58834,5,188,612,102,10,10 -58835,5,188,613,102,10,10 -58836,5,188,614,15,10,10 -58837,5,192,609,13,10,10 -58838,5,192,610,204,10,10 -58839,5,192,611,204,10,10 -58840,5,192,612,102,10,10 -58841,5,192,613,102,10,10 -58842,5,192,614,15,10,10 -58843,5,201,609,13,10,10 -58844,5,201,610,204,10,10 -58845,5,201,611,204,10,10 -58846,5,201,612,102,10,10 -58847,5,201,613,102,10,10 -58848,5,201,614,15,10,10 -58849,5,205,609,48,15,15 -58850,5,205,610,81,15,15 -58851,5,205,611,63,15,15 -58852,5,205,612,63,15,15 -58853,5,205,613,49,15,15 -58854,5,206,609,48,15,15 -58855,5,206,610,81,15,15 -58856,5,206,611,63,15,15 -58857,5,206,612,63,15,15 -58858,5,206,613,49,15,15 -58859,5,209,609,48,15,15 -58860,5,209,610,81,15,15 -58861,5,209,611,63,15,15 -58862,5,209,612,63,15,15 -58863,5,209,613,49,15,15 -58864,5,210,609,48,15,15 -58865,5,210,610,81,15,15 -58866,5,210,611,63,15,15 -58867,5,210,612,63,15,15 -58868,5,210,613,49,15,15 -58869,5,222,609,48,15,15 -58870,5,222,610,81,15,15 -58871,5,222,611,63,15,15 -58872,5,222,612,63,15,15 -58873,5,222,613,49,15,15 -58874,5,223,609,48,15,15 -58875,5,223,610,81,15,15 -58876,5,223,611,63,15,15 -58877,5,223,612,63,15,15 -58878,5,223,613,49,15,15 -58879,5,236,609,13,10,10 -58880,5,236,610,204,10,10 -58881,5,236,611,204,10,10 -58882,5,236,612,102,10,10 -58883,5,236,613,102,10,10 -58884,5,236,614,15,10,10 -58885,5,241,609,13,10,10 -58886,5,241,610,204,10,10 -58887,5,241,611,204,10,10 -58888,5,241,612,102,10,10 -58889,5,241,613,102,10,10 -58890,5,241,614,15,10,10 -58891,5,243,609,13,10,10 -58892,5,243,610,204,10,10 -58893,5,243,611,204,10,10 -58894,5,243,612,102,10,10 -58895,5,243,613,102,10,10 -58896,5,243,614,15,10,10 -58897,5,251,609,13,10,10 -58898,5,251,610,204,10,10 -58899,5,251,611,204,10,10 -58900,5,251,612,102,10,10 -58901,5,251,613,102,10,10 -58902,5,251,614,15,10,10 -58903,5,252,609,13,10,10 -58904,5,252,610,204,10,10 -58905,5,252,611,204,10,10 -58906,5,252,612,102,10,10 -58907,5,252,613,102,10,10 -58908,5,252,614,15,10,10 -58909,5,184,609,21,10,10 -58910,5,184,610,214,10,10 -58911,5,184,611,214,10,10 -58912,5,184,612,190,10,10 -58913,5,184,613,190,10,10 -58914,5,184,614,190,10,10 -58915,5,189,609,21,10,10 -58916,5,189,610,214,10,10 -58917,5,189,611,214,10,10 -58918,5,189,612,190,10,10 -58919,5,189,613,190,10,10 -58920,5,189,614,190,10,10 -58921,5,798,609,48,15,15 -58922,5,798,610,81,15,15 -58923,5,798,611,63,15,15 -58924,5,798,612,63,15,15 -58925,5,798,613,49,15,15 -58926,5,211,609,21,10,10 -58927,5,211,610,214,10,10 -58928,5,211,611,214,10,10 -58929,5,211,612,190,10,10 -58930,5,211,613,190,10,10 -58931,5,211,614,190,10,10 -58932,5,800,609,21,10,10 -58933,5,800,610,214,10,10 -58934,5,800,611,214,10,10 -58935,5,800,612,190,10,10 -58936,5,800,613,190,10,10 -58937,5,800,614,190,10,10 -58938,5,242,609,48,15,15 -58939,5,242,610,81,15,15 -58940,5,242,611,63,15,15 -58941,5,242,612,63,15,15 -58942,5,242,613,49,15,15 -58943,5,249,609,21,10,10 -58944,5,249,610,214,10,10 -58945,5,249,611,214,10,10 -58946,5,249,612,190,10,10 -58947,5,249,613,190,10,10 -58948,5,249,614,190,10,10 -58949,5,204,609,48,15,15 -58950,5,204,610,81,15,15 -58951,5,204,611,63,15,15 -58952,5,204,612,63,15,15 -58953,5,204,613,49,15,15 -58954,5,287,599,48,15,15 -58955,5,287,600,48,15,15 -58956,5,287,601,63,15,15 -58957,5,287,602,63,15,15 -58958,5,287,603,49,15,15 -58959,5,288,599,48,15,15 -58960,5,288,600,48,15,15 -58961,5,288,601,63,15,15 -58962,5,288,602,63,15,15 -58963,5,288,603,49,15,15 -58964,5,185,587,13,10,10 -58965,5,185,588,13,10,10 -58966,5,185,589,14,10,10 -58967,5,185,590,102,10,10 -58968,5,185,591,102,10,10 -58969,5,185,592,15,10,10 -58970,5,187,587,13,10,10 -58971,5,187,588,13,10,10 -58972,5,187,589,14,10,10 -58973,5,187,590,102,10,10 -58974,5,187,591,102,10,10 -58975,5,187,592,15,10,10 -58976,5,188,587,13,10,10 -58977,5,188,588,13,10,10 -58978,5,188,589,14,10,10 -58979,5,188,590,102,10,10 -58980,5,188,591,102,10,10 -58981,5,188,592,15,10,10 -58982,5,192,587,13,10,10 -58983,5,192,588,13,10,10 -58984,5,192,589,14,10,10 -58985,5,192,590,102,10,10 -58986,5,192,591,102,10,10 -58987,5,192,592,15,10,10 -58988,5,201,587,13,10,10 -58989,5,201,588,13,10,10 -58990,5,201,589,14,10,10 -58991,5,201,590,102,10,10 -58992,5,201,591,102,10,10 -58993,5,201,592,15,10,10 -58994,5,205,599,48,15,15 -58995,5,205,600,48,15,15 -58996,5,205,601,63,15,15 -58997,5,205,602,63,15,15 -58998,5,205,603,49,15,15 -58999,5,206,599,48,15,15 -59000,5,206,600,48,15,15 -59001,5,206,601,63,15,15 -59002,5,206,602,63,15,15 -59003,5,206,603,49,15,15 -59004,5,209,599,48,15,15 -59005,5,209,600,48,15,15 -59006,5,209,601,63,15,15 -59007,5,209,602,63,15,15 -59008,5,209,603,49,15,15 -59009,5,210,599,48,15,15 -59010,5,210,600,48,15,15 -59011,5,210,601,63,15,15 -59012,5,210,602,63,15,15 -59013,5,210,603,49,15,15 -59014,5,222,599,48,15,15 -59015,5,222,600,48,15,15 -59016,5,222,601,63,15,15 -59017,5,222,602,63,15,15 -59018,5,222,603,49,15,15 -59019,5,223,599,48,15,15 -59020,5,223,600,48,15,15 -59021,5,223,601,63,15,15 -59022,5,223,602,63,15,15 -59023,5,223,603,49,15,15 -59024,5,236,587,13,10,10 -59025,5,236,588,13,10,10 -59026,5,236,589,14,10,10 -59027,5,236,590,102,10,10 -59028,5,236,591,102,10,10 -59029,5,236,592,15,10,10 -59030,5,241,587,13,10,10 -59031,5,241,588,13,10,10 -59032,5,241,589,14,10,10 -59033,5,241,590,102,10,10 -59034,5,241,591,102,10,10 -59035,5,241,592,15,10,10 -59036,5,243,587,13,10,10 -59037,5,243,588,13,10,10 -59038,5,243,589,14,10,10 -59039,5,243,590,102,10,10 -59040,5,243,591,102,10,10 -59041,5,243,592,15,10,10 -59042,5,251,587,13,10,10 -59043,5,251,588,13,10,10 -59044,5,251,589,14,10,10 -59045,5,251,590,102,10,10 -59046,5,251,591,102,10,10 -59047,5,251,592,15,10,10 -59048,5,252,587,13,10,10 -59049,5,252,588,13,10,10 -59050,5,252,589,14,10,10 -59051,5,252,590,102,10,10 -59052,5,252,591,102,10,10 -59053,5,252,592,15,10,10 -59054,5,184,587,21,10,10 -59055,5,184,588,21,10,10 -59056,5,184,589,21,10,10 -59057,5,184,590,190,10,10 -59058,5,184,591,190,10,10 -59059,5,184,592,190,10,10 -59060,5,189,587,21,10,10 -59061,5,189,588,21,10,10 -59062,5,189,589,21,10,10 -59063,5,189,590,190,10,10 -59064,5,189,591,190,10,10 -59065,5,189,592,190,10,10 -59066,5,798,599,48,15,15 -59067,5,798,600,48,15,15 -59068,5,798,601,63,15,15 -59069,5,798,602,63,15,15 -59070,5,798,603,49,15,15 -59071,5,211,587,21,10,10 -59072,5,211,588,21,10,10 -59073,5,211,589,21,10,10 -59074,5,211,590,190,10,10 -59075,5,211,591,190,10,10 -59076,5,211,592,190,10,10 -59077,5,800,587,21,10,10 -59078,5,800,588,21,10,10 -59079,5,800,589,21,10,10 -59080,5,800,590,190,10,10 -59081,5,800,591,190,10,10 -59082,5,800,592,190,10,10 -59083,5,242,599,48,15,15 -59084,5,242,600,48,15,15 -59085,5,242,601,63,15,15 -59086,5,242,602,63,15,15 -59087,5,242,603,49,15,15 -59088,5,249,587,21,10,10 -59089,5,249,588,21,10,10 -59090,5,249,589,21,10,10 -59091,5,249,590,190,10,10 -59092,5,249,591,190,10,10 -59093,5,249,592,190,10,10 -59094,5,204,599,48,15,15 -59095,5,204,600,48,15,15 -59096,5,204,601,63,15,15 -59097,5,204,602,63,15,15 -59098,5,204,603,49,15,15 -59099,5,287,604,48,15,15 -59100,5,287,605,48,15,15 -59101,5,287,606,63,15,15 -59102,5,287,607,63,15,15 -59103,5,287,608,49,15,15 -59104,5,288,604,48,15,15 -59105,5,288,605,48,15,15 -59106,5,288,606,63,15,15 -59107,5,288,607,63,15,15 -59108,5,288,608,49,15,15 -59109,5,185,593,13,10,10 -59110,5,185,594,13,10,10 -59111,5,185,595,14,10,10 -59112,5,185,596,102,10,10 -59113,5,185,597,102,10,10 -59114,5,185,598,15,10,10 -59115,5,187,593,13,10,10 -59116,5,187,594,13,10,10 -59117,5,187,595,14,10,10 -59118,5,187,596,102,10,10 -59119,5,187,597,102,10,10 -59120,5,187,598,15,10,10 -59121,5,188,593,13,10,10 -59122,5,188,594,13,10,10 -59123,5,188,595,14,10,10 -59124,5,188,596,102,10,10 -59125,5,188,597,102,10,10 -59126,5,188,598,15,10,10 -59127,5,192,593,13,10,10 -59128,5,192,594,13,10,10 -59129,5,192,595,14,10,10 -59130,5,192,596,102,10,10 -59131,5,192,597,102,10,10 -59132,5,192,598,15,10,10 -59133,5,201,593,13,10,10 -59134,5,201,594,13,10,10 -59135,5,201,595,14,10,10 -59136,5,201,596,102,10,10 -59137,5,201,597,102,10,10 -59138,5,201,598,15,10,10 -59139,5,205,604,48,15,15 -59140,5,205,605,48,15,15 -59141,5,205,606,63,15,15 -59142,5,205,607,63,15,15 -59143,5,205,608,49,15,15 -59144,5,206,604,48,15,15 -59145,5,206,605,48,15,15 -59146,5,206,606,63,15,15 -59147,5,206,607,63,15,15 -59148,5,206,608,49,15,15 -59149,5,209,604,48,15,15 -59150,5,209,605,48,15,15 -59151,5,209,606,63,15,15 -59152,5,209,607,63,15,15 -59153,5,209,608,49,15,15 -59154,5,210,604,48,15,15 -59155,5,210,605,48,15,15 -59156,5,210,606,63,15,15 -59157,5,210,607,63,15,15 -59158,5,210,608,49,15,15 -59159,5,222,604,48,15,15 -59160,5,222,605,48,15,15 -59161,5,222,606,63,15,15 -59162,5,222,607,63,15,15 -59163,5,222,608,49,15,15 -59164,5,223,604,48,15,15 -59165,5,223,605,48,15,15 -59166,5,223,606,63,15,15 -59167,5,223,607,63,15,15 -59168,5,223,608,49,15,15 -59169,5,236,593,13,10,10 -59170,5,236,594,13,10,10 -59171,5,236,595,14,10,10 -59172,5,236,596,102,10,10 -59173,5,236,597,102,10,10 -59174,5,236,598,15,10,10 -59175,5,241,593,13,10,10 -59176,5,241,594,13,10,10 -59177,5,241,595,14,10,10 -59178,5,241,596,102,10,10 -59179,5,241,597,102,10,10 -59180,5,241,598,15,10,10 -59181,5,243,593,13,10,10 -59182,5,243,594,13,10,10 -59183,5,243,595,14,10,10 -59184,5,243,596,102,10,10 -59185,5,243,597,102,10,10 -59186,5,243,598,15,10,10 -59187,5,251,593,13,10,10 -59188,5,251,594,13,10,10 -59189,5,251,595,14,10,10 -59190,5,251,596,102,10,10 -59191,5,251,597,102,10,10 -59192,5,251,598,15,10,10 -59193,5,252,593,13,10,10 -59194,5,252,594,13,10,10 -59195,5,252,595,14,10,10 -59196,5,252,596,102,10,10 -59197,5,252,597,102,10,10 -59198,5,252,598,15,10,10 -59199,5,184,593,21,10,10 -59200,5,184,594,21,10,10 -59201,5,184,595,21,10,10 -59202,5,184,596,190,10,10 -59203,5,184,597,190,10,10 -59204,5,184,598,190,10,10 -59205,5,189,593,21,10,10 -59206,5,189,594,21,10,10 -59207,5,189,595,21,10,10 -59208,5,189,596,190,10,10 -59209,5,189,597,190,10,10 -59210,5,189,598,190,10,10 -59211,5,798,604,48,15,15 -59212,5,798,605,48,15,15 -59213,5,798,606,63,15,15 -59214,5,798,607,63,15,15 -59215,5,798,608,49,15,15 -59216,5,211,593,21,10,10 -59217,5,211,594,21,10,10 -59218,5,211,595,21,10,10 -59219,5,211,596,190,10,10 -59220,5,211,597,190,10,10 -59221,5,211,598,190,10,10 -59222,5,800,593,21,10,10 -59223,5,800,594,21,10,10 -59224,5,800,595,21,10,10 -59225,5,800,596,190,10,10 -59226,5,800,597,190,10,10 -59227,5,800,598,190,10,10 -59228,5,242,604,48,15,15 -59229,5,242,605,48,15,15 -59230,5,242,606,63,15,15 -59231,5,242,607,63,15,15 -59232,5,242,608,49,15,15 -59233,5,249,593,21,10,10 -59234,5,249,594,21,10,10 -59235,5,249,595,21,10,10 -59236,5,249,596,190,10,10 -59237,5,249,597,190,10,10 -59238,5,249,598,190,10,10 -59239,5,204,604,48,15,15 -59240,5,204,605,48,15,15 -59241,5,204,606,63,15,15 -59242,5,204,607,63,15,15 -59243,5,204,608,49,15,15 -59244,5,287,609,48,15,15 -59245,5,287,610,81,15,15 -59246,5,287,611,63,15,15 -59247,5,287,612,63,15,15 -59248,5,287,613,49,15,15 -59249,5,288,609,48,15,15 -59250,5,288,610,81,15,15 -59251,5,288,611,63,15,15 -59252,5,288,612,63,15,15 -59253,5,288,613,49,15,15 -59254,5,185,609,13,10,10 -59255,5,185,610,204,10,10 -59256,5,185,611,204,10,10 -59257,5,185,612,102,10,10 -59258,5,185,613,102,10,10 -59259,5,185,614,15,10,10 -59260,5,187,609,13,10,10 -59261,5,187,610,204,10,10 -59262,5,187,611,204,10,10 -59263,5,187,612,102,10,10 -59264,5,187,613,102,10,10 -59265,5,187,614,15,10,10 -59266,5,188,609,13,10,10 -59267,5,188,610,204,10,10 -59268,5,188,611,204,10,10 -59269,5,188,612,102,10,10 -59270,5,188,613,102,10,10 -59271,5,188,614,15,10,10 -59272,5,192,609,13,10,10 -59273,5,192,610,204,10,10 -59274,5,192,611,204,10,10 -59275,5,192,612,102,10,10 -59276,5,192,613,102,10,10 -59277,5,192,614,15,10,10 -59278,5,201,609,13,10,10 -59279,5,201,610,204,10,10 -59280,5,201,611,204,10,10 -59281,5,201,612,102,10,10 -59282,5,201,613,102,10,10 -59283,5,201,614,15,10,10 -59284,5,205,609,48,15,15 -59285,5,205,610,81,15,15 -59286,5,205,611,63,15,15 -59287,5,205,612,63,15,15 -59288,5,205,613,49,15,15 -59289,5,206,609,48,15,15 -59290,5,206,610,81,15,15 -59291,5,206,611,63,15,15 -59292,5,206,612,63,15,15 -59293,5,206,613,49,15,15 -59294,5,209,609,48,15,15 -59295,5,209,610,81,15,15 -59296,5,209,611,63,15,15 -59297,5,209,612,63,15,15 -59298,5,209,613,49,15,15 -59299,5,210,609,48,15,15 -59300,5,210,610,81,15,15 -59301,5,210,611,63,15,15 -59302,5,210,612,63,15,15 -59303,5,210,613,49,15,15 -59304,5,222,609,48,15,15 -59305,5,222,610,81,15,15 -59306,5,222,611,63,15,15 -59307,5,222,612,63,15,15 -59308,5,222,613,49,15,15 -59309,5,223,609,48,15,15 -59310,5,223,610,81,15,15 -59311,5,223,611,63,15,15 -59312,5,223,612,63,15,15 -59313,5,223,613,49,15,15 -59314,5,236,609,13,10,10 -59315,5,236,610,204,10,10 -59316,5,236,611,204,10,10 -59317,5,236,612,102,10,10 -59318,5,236,613,102,10,10 -59319,5,236,614,15,10,10 -59320,5,241,609,13,10,10 -59321,5,241,610,204,10,10 -59322,5,241,611,204,10,10 -59323,5,241,612,102,10,10 -59324,5,241,613,102,10,10 -59325,5,241,614,15,10,10 -59326,5,243,609,13,10,10 -59327,5,243,610,204,10,10 -59328,5,243,611,204,10,10 -59329,5,243,612,102,10,10 -59330,5,243,613,102,10,10 -59331,5,243,614,15,10,10 -59332,5,251,609,13,10,10 -59333,5,251,610,204,10,10 -59334,5,251,611,204,10,10 -59335,5,251,612,102,10,10 -59336,5,251,613,102,10,10 -59337,5,251,614,15,10,10 -59338,5,252,609,13,10,10 -59339,5,252,610,204,10,10 -59340,5,252,611,204,10,10 -59341,5,252,612,102,10,10 -59342,5,252,613,102,10,10 -59343,5,252,614,15,10,10 -59344,5,184,609,21,10,10 -59345,5,184,610,214,10,10 -59346,5,184,611,214,10,10 -59347,5,184,612,190,10,10 -59348,5,184,613,190,10,10 -59349,5,184,614,190,10,10 -59350,5,189,609,21,10,10 -59351,5,189,610,214,10,10 -59352,5,189,611,214,10,10 -59353,5,189,612,190,10,10 -59354,5,189,613,190,10,10 -59355,5,189,614,190,10,10 -59356,5,798,609,48,15,15 -59357,5,798,610,81,15,15 -59358,5,798,611,63,15,15 -59359,5,798,612,63,15,15 -59360,5,798,613,49,15,15 -59361,5,211,609,21,10,10 -59362,5,211,610,214,10,10 -59363,5,211,611,214,10,10 -59364,5,211,612,190,10,10 -59365,5,211,613,190,10,10 -59366,5,211,614,190,10,10 -59367,5,800,609,21,10,10 -59368,5,800,610,214,10,10 -59369,5,800,611,214,10,10 -59370,5,800,612,190,10,10 -59371,5,800,613,190,10,10 -59372,5,800,614,190,10,10 -59373,5,242,609,48,15,15 -59374,5,242,610,81,15,15 -59375,5,242,611,63,15,15 -59376,5,242,612,63,15,15 -59377,5,242,613,49,15,15 -59378,5,249,609,21,10,10 -59379,5,249,610,214,10,10 -59380,5,249,611,214,10,10 -59381,5,249,612,190,10,10 -59382,5,249,613,190,10,10 -59383,5,249,614,190,10,10 -59384,5,204,609,48,15,15 -59385,5,204,610,81,15,15 -59386,5,204,611,63,15,15 -59387,5,204,612,63,15,15 -59388,5,204,613,49,15,15 -59389,4,287,599,48,15,15 -59390,4,287,600,48,15,15 -59391,4,287,601,63,15,15 -59392,4,287,602,63,15,15 -59393,4,287,603,49,15,15 -59394,4,288,599,48,15,15 -59395,4,288,600,48,15,15 -59396,4,288,601,63,15,15 -59397,4,288,602,63,15,15 -59398,4,288,603,49,15,15 -59399,4,185,587,10,10,10 -59400,4,185,588,10,10,10 -59401,4,185,589,11,10,10 -59402,4,185,590,102,10,10 -59403,4,185,591,102,10,10 -59404,4,185,592,12,10,10 -59405,4,187,587,10,10,10 -59406,4,187,588,10,10,10 -59407,4,187,589,11,10,10 -59408,4,187,590,102,10,10 -59409,4,187,591,102,10,10 -59410,4,187,592,12,10,10 -59411,4,188,587,10,10,10 -59412,4,188,588,10,10,10 -59413,4,188,589,11,10,10 -59414,4,188,590,102,10,10 -59415,4,188,591,102,10,10 -59416,4,188,592,12,10,10 -59417,4,192,587,10,10,10 -59418,4,192,588,10,10,10 -59419,4,192,589,11,10,10 -59420,4,192,590,102,10,10 -59421,4,192,591,102,10,10 -59422,4,192,592,12,10,10 -59423,4,201,587,10,10,10 -59424,4,201,588,10,10,10 -59425,4,201,589,11,10,10 -59426,4,201,590,102,10,10 -59427,4,201,591,102,10,10 -59428,4,201,592,12,10,10 -59429,4,205,599,48,15,15 -59430,4,205,600,48,15,15 -59431,4,205,601,63,15,15 -59432,4,205,602,63,15,15 -59433,4,205,603,49,15,15 -59434,4,206,599,48,15,15 -59435,4,206,600,48,15,15 -59436,4,206,601,63,15,15 -59437,4,206,602,63,15,15 -59438,4,206,603,49,15,15 -59439,4,209,599,48,15,15 -59440,4,209,600,48,15,15 -59441,4,209,601,63,15,15 -59442,4,209,602,63,15,15 -59443,4,209,603,49,15,15 -59444,4,210,599,48,15,15 -59445,4,210,600,48,15,15 -59446,4,210,601,63,15,15 -59447,4,210,602,63,15,15 -59448,4,210,603,49,15,15 -59449,4,222,599,48,15,15 -59450,4,222,600,48,15,15 -59451,4,222,601,63,15,15 -59452,4,222,602,63,15,15 -59453,4,222,603,49,15,15 -59454,4,223,599,48,15,15 -59455,4,223,600,48,15,15 -59456,4,223,601,63,15,15 -59457,4,223,602,63,15,15 -59458,4,223,603,49,15,15 -59459,4,236,587,10,10,10 -59460,4,236,588,10,10,10 -59461,4,236,589,11,10,10 -59462,4,236,590,102,10,10 -59463,4,236,591,102,10,10 -59464,4,236,592,12,10,10 -59465,4,241,587,10,10,10 -59466,4,241,588,10,10,10 -59467,4,241,589,11,10,10 -59468,4,241,590,102,10,10 -59469,4,241,591,102,10,10 -59470,4,241,592,12,10,10 -59471,4,243,587,10,10,10 -59472,4,243,588,10,10,10 -59473,4,243,589,11,10,10 -59474,4,243,590,102,10,10 -59475,4,243,591,102,10,10 -59476,4,243,592,12,10,10 -59477,4,251,587,10,10,10 -59478,4,251,588,10,10,10 -59479,4,251,589,11,10,10 -59480,4,251,590,102,10,10 -59481,4,251,591,102,10,10 -59482,4,251,592,12,10,10 -59483,4,252,587,10,10,10 -59484,4,252,588,10,10,10 -59485,4,252,589,11,10,10 -59486,4,252,590,102,10,10 -59487,4,252,591,102,10,10 -59488,4,252,592,12,10,10 -59489,4,184,587,21,10,10 -59490,4,184,588,21,10,10 -59491,4,184,589,21,10,10 -59492,4,184,590,190,10,10 -59493,4,184,591,190,10,10 -59494,4,184,592,190,10,10 -59495,4,189,587,21,10,10 -59496,4,189,588,21,10,10 -59497,4,189,589,21,10,10 -59498,4,189,590,190,10,10 -59499,4,189,591,190,10,10 -59500,4,189,592,190,10,10 -59501,4,798,599,48,15,15 -59502,4,798,600,48,15,15 -59503,4,798,601,63,15,15 -59504,4,798,602,63,15,15 -59505,4,798,603,49,15,15 -59506,4,211,587,21,10,10 -59507,4,211,588,21,10,10 -59508,4,211,589,21,10,10 -59509,4,211,590,190,10,10 -59510,4,211,591,190,10,10 -59511,4,211,592,190,10,10 -59512,4,800,587,21,10,10 -59513,4,800,588,21,10,10 -59514,4,800,589,21,10,10 -59515,4,800,590,190,10,10 -59516,4,800,591,190,10,10 -59517,4,800,592,190,10,10 -59518,4,242,599,48,15,15 -59519,4,242,600,48,15,15 -59520,4,242,601,63,15,15 -59521,4,242,602,63,15,15 -59522,4,242,603,49,15,15 -59523,4,249,587,21,10,10 -59524,4,249,588,21,10,10 -59525,4,249,589,21,10,10 -59526,4,249,590,190,10,10 -59527,4,249,591,190,10,10 -59528,4,249,592,190,10,10 -59529,4,204,599,48,15,15 -59530,4,204,600,48,15,15 -59531,4,204,601,63,15,15 -59532,4,204,602,63,15,15 -59533,4,204,603,49,15,15 -59534,4,287,604,48,15,15 -59535,4,287,605,48,15,15 -59536,4,287,606,63,15,15 -59537,4,287,607,63,15,15 -59538,4,287,608,49,15,15 -59539,4,288,604,48,15,15 -59540,4,288,605,48,15,15 -59541,4,288,606,63,15,15 -59542,4,288,607,63,15,15 -59543,4,288,608,49,15,15 -59544,4,185,593,10,10,10 -59545,4,185,594,10,10,10 -59546,4,185,595,11,10,10 -59547,4,185,596,102,10,10 -59548,4,185,597,102,10,10 -59549,4,185,598,12,10,10 -59550,4,187,593,10,10,10 -59551,4,187,594,10,10,10 -59552,4,187,595,11,10,10 -59553,4,187,596,102,10,10 -59554,4,187,597,102,10,10 -59555,4,187,598,12,10,10 -59556,4,188,593,10,10,10 -59557,4,188,594,10,10,10 -59558,4,188,595,11,10,10 -59559,4,188,596,102,10,10 -59560,4,188,597,102,10,10 -59561,4,188,598,12,10,10 -59562,4,192,593,10,10,10 -59563,4,192,594,10,10,10 -59564,4,192,595,11,10,10 -59565,4,192,596,102,10,10 -59566,4,192,597,102,10,10 -59567,4,192,598,12,10,10 -59568,4,201,593,10,10,10 -59569,4,201,594,10,10,10 -59570,4,201,595,11,10,10 -59571,4,201,596,102,10,10 -59572,4,201,597,102,10,10 -59573,4,201,598,12,10,10 -59574,4,205,604,48,15,15 -59575,4,205,605,48,15,15 -59576,4,205,606,63,15,15 -59577,4,205,607,63,15,15 -59578,4,205,608,49,15,15 -59579,4,206,604,48,15,15 -59580,4,206,605,48,15,15 -59581,4,206,606,63,15,15 -59582,4,206,607,63,15,15 -59583,4,206,608,49,15,15 -59584,4,209,604,48,15,15 -59585,4,209,605,48,15,15 -59586,4,209,606,63,15,15 -59587,4,209,607,63,15,15 -59588,4,209,608,49,15,15 -59589,4,210,604,48,15,15 -59590,4,210,605,48,15,15 -59591,4,210,606,63,15,15 -59592,4,210,607,63,15,15 -59593,4,210,608,49,15,15 -59594,4,222,604,48,15,15 -59595,4,222,605,48,15,15 -59596,4,222,606,63,15,15 -59597,4,222,607,63,15,15 -59598,4,222,608,49,15,15 -59599,4,223,604,48,15,15 -59600,4,223,605,48,15,15 -59601,4,223,606,63,15,15 -59602,4,223,607,63,15,15 -59603,4,223,608,49,15,15 -59604,4,236,593,10,10,10 -59605,4,236,594,10,10,10 -59606,4,236,595,11,10,10 -59607,4,236,596,102,10,10 -59608,4,236,597,102,10,10 -59609,4,236,598,12,10,10 -59610,4,241,593,10,10,10 -59611,4,241,594,10,10,10 -59612,4,241,595,11,10,10 -59613,4,241,596,102,10,10 -59614,4,241,597,102,10,10 -59615,4,241,598,12,10,10 -59616,4,243,593,10,10,10 -59617,4,243,594,10,10,10 -59618,4,243,595,11,10,10 -59619,4,243,596,102,10,10 -59620,4,243,597,102,10,10 -59621,4,243,598,12,10,10 -59622,4,251,593,10,10,10 -59623,4,251,594,10,10,10 -59624,4,251,595,11,10,10 -59625,4,251,596,102,10,10 -59626,4,251,597,102,10,10 -59627,4,251,598,12,10,10 -59628,4,252,593,10,10,10 -59629,4,252,594,10,10,10 -59630,4,252,595,11,10,10 -59631,4,252,596,102,10,10 -59632,4,252,597,102,10,10 -59633,4,252,598,12,10,10 -59634,4,184,593,21,10,10 -59635,4,184,594,21,10,10 -59636,4,184,595,21,10,10 -59637,4,184,596,190,10,10 -59638,4,184,597,190,10,10 -59639,4,184,598,190,10,10 -59640,4,189,593,21,10,10 -59641,4,189,594,21,10,10 -59642,4,189,595,21,10,10 -59643,4,189,596,190,10,10 -59644,4,189,597,190,10,10 -59645,4,189,598,190,10,10 -59646,4,798,604,48,15,15 -59647,4,798,605,48,15,15 -59648,4,798,606,63,15,15 -59649,4,798,607,63,15,15 -59650,4,798,608,49,15,15 -59651,4,211,593,21,10,10 -59652,4,211,594,21,10,10 -59653,4,211,595,21,10,10 -59654,4,211,596,190,10,10 -59655,4,211,597,190,10,10 -59656,4,211,598,190,10,10 -59657,4,800,593,21,10,10 -59658,4,800,594,21,10,10 -59659,4,800,595,21,10,10 -59660,4,800,596,190,10,10 -59661,4,800,597,190,10,10 -59662,4,800,598,190,10,10 -59663,4,242,604,48,15,15 -59664,4,242,605,48,15,15 -59665,4,242,606,63,15,15 -59666,4,242,607,63,15,15 -59667,4,242,608,49,15,15 -59668,4,249,593,21,10,10 -59669,4,249,594,21,10,10 -59670,4,249,595,21,10,10 -59671,4,249,596,190,10,10 -59672,4,249,597,190,10,10 -59673,4,249,598,190,10,10 -59674,4,204,604,48,15,15 -59675,4,204,605,48,15,15 -59676,4,204,606,63,15,15 -59677,4,204,607,63,15,15 -59678,4,204,608,49,15,15 -59679,4,287,609,48,15,15 -59680,4,287,610,81,15,15 -59681,4,287,611,63,15,15 -59682,4,287,612,63,15,15 -59683,4,287,613,49,15,15 -59684,4,288,609,48,15,15 -59685,4,288,610,81,15,15 -59686,4,288,611,63,15,15 -59687,4,288,612,63,15,15 -59688,4,288,613,49,15,15 -59689,4,185,609,10,10,10 -59690,4,185,610,204,10,10 -59691,4,185,611,204,10,10 -59692,4,185,612,102,10,10 -59693,4,185,613,102,10,10 -59694,4,185,614,12,10,10 -59695,4,187,609,10,10,10 -59696,4,187,610,204,10,10 -59697,4,187,611,204,10,10 -59698,4,187,612,102,10,10 -59699,4,187,613,102,10,10 -59700,4,187,614,12,10,10 -59701,4,188,609,10,10,10 -59702,4,188,610,204,10,10 -59703,4,188,611,204,10,10 -59704,4,188,612,102,10,10 -59705,4,188,613,102,10,10 -59706,4,188,614,12,10,10 -59707,4,192,609,10,10,10 -59708,4,192,610,204,10,10 -59709,4,192,611,204,10,10 -59710,4,192,612,102,10,10 -59711,4,192,613,102,10,10 -59712,4,192,614,12,10,10 -59713,4,201,609,10,10,10 -59714,4,201,610,204,10,10 -59715,4,201,611,204,10,10 -59716,4,201,612,102,10,10 -59717,4,201,613,102,10,10 -59718,4,201,614,12,10,10 -59719,4,205,609,48,15,15 -59720,4,205,610,81,15,15 -59721,4,205,611,63,15,15 -59722,4,205,612,63,15,15 -59723,4,205,613,49,15,15 -59724,4,206,609,48,15,15 -59725,4,206,610,81,15,15 -59726,4,206,611,63,15,15 -59727,4,206,612,63,15,15 -59728,4,206,613,49,15,15 -59729,4,209,609,48,15,15 -59730,4,209,610,81,15,15 -59731,4,209,611,63,15,15 -59732,4,209,612,63,15,15 -59733,4,209,613,49,15,15 -59734,4,210,609,48,15,15 -59735,4,210,610,81,15,15 -59736,4,210,611,63,15,15 -59737,4,210,612,63,15,15 -59738,4,210,613,49,15,15 -59739,4,222,609,48,15,15 -59740,4,222,610,81,15,15 -59741,4,222,611,63,15,15 -59742,4,222,612,63,15,15 -59743,4,222,613,49,15,15 -59744,4,223,609,48,15,15 -59745,4,223,610,81,15,15 -59746,4,223,611,63,15,15 -59747,4,223,612,63,15,15 -59748,4,223,613,49,15,15 -59749,4,236,609,10,10,10 -59750,4,236,610,204,10,10 -59751,4,236,611,204,10,10 -59752,4,236,612,102,10,10 -59753,4,236,613,102,10,10 -59754,4,236,614,12,10,10 -59755,4,241,609,10,10,10 -59756,4,241,610,204,10,10 -59757,4,241,611,204,10,10 -59758,4,241,612,102,10,10 -59759,4,241,613,102,10,10 -59760,4,241,614,12,10,10 -59761,4,243,609,10,10,10 -59762,4,243,610,204,10,10 -59763,4,243,611,204,10,10 -59764,4,243,612,102,10,10 -59765,4,243,613,102,10,10 -59766,4,243,614,12,10,10 -59767,4,251,609,10,10,10 -59768,4,251,610,204,10,10 -59769,4,251,611,204,10,10 -59770,4,251,612,102,10,10 -59771,4,251,613,102,10,10 -59772,4,251,614,12,10,10 -59773,4,252,609,10,10,10 -59774,4,252,610,204,10,10 -59775,4,252,611,204,10,10 -59776,4,252,612,102,10,10 -59777,4,252,613,102,10,10 -59778,4,252,614,12,10,10 -59779,4,184,609,21,10,10 -59780,4,184,610,214,10,10 -59781,4,184,611,214,10,10 -59782,4,184,612,190,10,10 -59783,4,184,613,190,10,10 -59784,4,184,614,190,10,10 -59785,4,189,609,21,10,10 -59786,4,189,610,214,10,10 -59787,4,189,611,214,10,10 -59788,4,189,612,190,10,10 -59789,4,189,613,190,10,10 -59790,4,189,614,190,10,10 -59791,4,798,609,48,15,15 -59792,4,798,610,81,15,15 -59793,4,798,611,63,15,15 -59794,4,798,612,63,15,15 -59795,4,798,613,49,15,15 -59796,4,211,609,21,10,10 -59797,4,211,610,214,10,10 -59798,4,211,611,214,10,10 -59799,4,211,612,190,10,10 -59800,4,211,613,190,10,10 -59801,4,211,614,190,10,10 -59802,4,800,609,21,10,10 -59803,4,800,610,214,10,10 -59804,4,800,611,214,10,10 -59805,4,800,612,190,10,10 -59806,4,800,613,190,10,10 -59807,4,800,614,190,10,10 -59808,4,242,609,48,15,15 -59809,4,242,610,81,15,15 -59810,4,242,611,63,15,15 -59811,4,242,612,63,15,15 -59812,4,242,613,49,15,15 -59813,4,249,609,21,10,10 -59814,4,249,610,214,10,10 -59815,4,249,611,214,10,10 -59816,4,249,612,190,10,10 -59817,4,249,613,190,10,10 -59818,4,249,614,190,10,10 -59819,4,204,609,48,15,15 -59820,4,204,610,81,15,15 -59821,4,204,611,63,15,15 -59822,4,204,612,63,15,15 -59823,4,204,613,49,15,15 -59824,4,282,581,143,50,50 -59825,5,282,581,143,50,50 -59826,6,282,582,143,50,50 -59827,15,305,584,143,50,50 -59828,16,305,584,143,50,50 -59829,15,276,584,143,50,50 -59830,16,276,584,143,50,50 -59831,7,801,565,383,45,45 -59832,8,801,565,382,45,45 -59833,9,802,566,383,70,70 -59834,9,803,566,382,70,70 -59835,7,804,565,384,70,70 -59836,8,804,565,384,70,70 -59837,9,804,566,384,70,70 +58141,4,287,587,10,10,10 +58142,4,287,588,10,10,10 +58143,4,287,589,11,10,10 +58144,4,287,590,102,10,10 +58145,4,287,591,102,10,10 +58146,4,287,592,12,10,10 +58147,4,288,587,10,10,10 +58148,4,288,588,10,10,10 +58149,4,288,589,11,10,10 +58150,4,288,590,102,10,10 +58151,4,288,591,102,10,10 +58152,4,288,592,12,10,10 +58153,4,185,587,21,10,10 +58154,4,185,588,21,10,10 +58155,4,185,589,21,10,10 +58156,4,185,590,190,10,10 +58157,4,185,591,190,10,10 +58158,4,185,592,190,10,10 +58159,4,187,587,21,10,10 +58160,4,187,588,21,10,10 +58161,4,187,589,21,10,10 +58162,4,187,590,190,10,10 +58163,4,187,591,190,10,10 +58164,4,187,592,190,10,10 +58165,4,188,587,21,10,10 +58166,4,188,588,21,10,10 +58167,4,188,589,21,10,10 +58168,4,188,590,190,10,10 +58169,4,188,591,190,10,10 +58170,4,188,592,190,10,10 +58171,4,192,587,21,10,10 +58172,4,192,588,21,10,10 +58173,4,192,589,21,10,10 +58174,4,192,590,190,10,10 +58175,4,192,591,190,10,10 +58176,4,192,592,190,10,10 +58177,4,201,587,21,10,10 +58178,4,201,588,21,10,10 +58179,4,201,589,21,10,10 +58180,4,201,590,190,10,10 +58181,4,201,591,190,10,10 +58182,4,201,592,190,10,10 +58183,4,205,587,10,10,10 +58184,4,205,588,10,10,10 +58185,4,205,589,11,10,10 +58186,4,205,590,102,10,10 +58187,4,205,591,102,10,10 +58188,4,205,592,12,10,10 +58189,4,206,587,10,10,10 +58190,4,206,588,10,10,10 +58191,4,206,589,11,10,10 +58192,4,206,590,102,10,10 +58193,4,206,591,102,10,10 +58194,4,206,592,12,10,10 +58195,4,209,587,10,10,10 +58196,4,209,588,10,10,10 +58197,4,209,589,11,10,10 +58198,4,209,590,102,10,10 +58199,4,209,591,102,10,10 +58200,4,209,592,12,10,10 +58201,4,210,587,10,10,10 +58202,4,210,588,10,10,10 +58203,4,210,589,11,10,10 +58204,4,210,590,102,10,10 +58205,4,210,591,102,10,10 +58206,4,210,592,12,10,10 +58207,4,222,587,10,10,10 +58208,4,222,588,10,10,10 +58209,4,222,589,11,10,10 +58210,4,222,590,102,10,10 +58211,4,222,591,102,10,10 +58212,4,222,592,12,10,10 +58213,4,223,587,10,10,10 +58214,4,223,588,10,10,10 +58215,4,223,589,11,10,10 +58216,4,223,590,102,10,10 +58217,4,223,591,102,10,10 +58218,4,223,592,12,10,10 +58219,4,236,587,21,10,10 +58220,4,236,588,21,10,10 +58221,4,236,589,21,10,10 +58222,4,236,590,190,10,10 +58223,4,236,591,190,10,10 +58224,4,236,592,190,10,10 +58225,4,241,587,21,10,10 +58226,4,241,588,21,10,10 +58227,4,241,589,21,10,10 +58228,4,241,590,190,10,10 +58229,4,241,591,190,10,10 +58230,4,241,592,190,10,10 +58231,4,243,587,21,10,10 +58232,4,243,588,21,10,10 +58233,4,243,589,21,10,10 +58234,4,243,590,190,10,10 +58235,4,243,591,190,10,10 +58236,4,243,592,190,10,10 +58237,4,251,587,21,10,10 +58238,4,251,588,21,10,10 +58239,4,251,589,21,10,10 +58240,4,251,590,190,10,10 +58241,4,251,591,190,10,10 +58242,4,251,592,190,10,10 +58243,4,252,587,21,10,10 +58244,4,252,588,21,10,10 +58245,4,252,589,21,10,10 +58246,4,252,590,190,10,10 +58247,4,252,591,190,10,10 +58248,4,252,592,190,10,10 +58249,4,798,587,10,10,10 +58250,4,798,588,10,10,10 +58251,4,798,589,11,10,10 +58252,4,798,590,102,10,10 +58253,4,798,591,102,10,10 +58254,4,798,592,12,10,10 +58255,4,242,587,10,10,10 +58256,4,242,588,10,10,10 +58257,4,242,589,11,10,10 +58258,4,242,590,102,10,10 +58259,4,242,591,102,10,10 +58260,4,242,592,12,10,10 +58261,4,204,587,10,10,10 +58262,4,204,588,10,10,10 +58263,4,204,589,11,10,10 +58264,4,204,590,102,10,10 +58265,4,204,591,102,10,10 +58266,4,204,592,12,10,10 +58267,4,287,593,10,10,10 +58268,4,287,594,10,10,10 +58269,4,287,595,11,10,10 +58270,4,287,596,102,10,10 +58271,4,287,597,102,10,10 +58272,4,287,598,12,10,10 +58273,4,288,593,10,10,10 +58274,4,288,594,10,10,10 +58275,4,288,595,11,10,10 +58276,4,288,596,102,10,10 +58277,4,288,597,102,10,10 +58278,4,288,598,12,10,10 +58279,4,185,593,21,10,10 +58280,4,185,594,21,10,10 +58281,4,185,595,21,10,10 +58282,4,185,596,190,10,10 +58283,4,185,597,190,10,10 +58284,4,185,598,190,10,10 +58285,4,187,593,21,10,10 +58286,4,187,594,21,10,10 +58287,4,187,595,21,10,10 +58288,4,187,596,190,10,10 +58289,4,187,597,190,10,10 +58290,4,187,598,190,10,10 +58291,4,188,593,21,10,10 +58292,4,188,594,21,10,10 +58293,4,188,595,21,10,10 +58294,4,188,596,190,10,10 +58295,4,188,597,190,10,10 +58296,4,188,598,190,10,10 +58297,4,192,593,21,10,10 +58298,4,192,594,21,10,10 +58299,4,192,595,21,10,10 +58300,4,192,596,190,10,10 +58301,4,192,597,190,10,10 +58302,4,192,598,190,10,10 +58303,4,201,593,21,10,10 +58304,4,201,594,21,10,10 +58305,4,201,595,21,10,10 +58306,4,201,596,190,10,10 +58307,4,201,597,190,10,10 +58308,4,201,598,190,10,10 +58309,4,205,593,10,10,10 +58310,4,205,594,10,10,10 +58311,4,205,595,11,10,10 +58312,4,205,596,102,10,10 +58313,4,205,597,102,10,10 +58314,4,205,598,12,10,10 +58315,4,206,593,10,10,10 +58316,4,206,594,10,10,10 +58317,4,206,595,11,10,10 +58318,4,206,596,102,10,10 +58319,4,206,597,102,10,10 +58320,4,206,598,12,10,10 +58321,4,209,593,10,10,10 +58322,4,209,594,10,10,10 +58323,4,209,595,11,10,10 +58324,4,209,596,102,10,10 +58325,4,209,597,102,10,10 +58326,4,209,598,12,10,10 +58327,4,210,593,10,10,10 +58328,4,210,594,10,10,10 +58329,4,210,595,11,10,10 +58330,4,210,596,102,10,10 +58331,4,210,597,102,10,10 +58332,4,210,598,12,10,10 +58333,4,222,593,10,10,10 +58334,4,222,594,10,10,10 +58335,4,222,595,11,10,10 +58336,4,222,596,102,10,10 +58337,4,222,597,102,10,10 +58338,4,222,598,12,10,10 +58339,4,223,593,10,10,10 +58340,4,223,594,10,10,10 +58341,4,223,595,11,10,10 +58342,4,223,596,102,10,10 +58343,4,223,597,102,10,10 +58344,4,223,598,12,10,10 +58345,4,236,593,21,10,10 +58346,4,236,594,21,10,10 +58347,4,236,595,21,10,10 +58348,4,236,596,190,10,10 +58349,4,236,597,190,10,10 +58350,4,236,598,190,10,10 +58351,4,241,593,21,10,10 +58352,4,241,594,21,10,10 +58353,4,241,595,21,10,10 +58354,4,241,596,190,10,10 +58355,4,241,597,190,10,10 +58356,4,241,598,190,10,10 +58357,4,243,593,21,10,10 +58358,4,243,594,21,10,10 +58359,4,243,595,21,10,10 +58360,4,243,596,190,10,10 +58361,4,243,597,190,10,10 +58362,4,243,598,190,10,10 +58363,4,251,593,21,10,10 +58364,4,251,594,21,10,10 +58365,4,251,595,21,10,10 +58366,4,251,596,190,10,10 +58367,4,251,597,190,10,10 +58368,4,251,598,190,10,10 +58369,4,252,593,21,10,10 +58370,4,252,594,21,10,10 +58371,4,252,595,21,10,10 +58372,4,252,596,190,10,10 +58373,4,252,597,190,10,10 +58374,4,252,598,190,10,10 +58375,4,798,593,10,10,10 +58376,4,798,594,10,10,10 +58377,4,798,595,11,10,10 +58378,4,798,596,102,10,10 +58379,4,798,597,102,10,10 +58380,4,798,598,12,10,10 +58381,4,242,593,10,10,10 +58382,4,242,594,10,10,10 +58383,4,242,595,11,10,10 +58384,4,242,596,102,10,10 +58385,4,242,597,102,10,10 +58386,4,242,598,12,10,10 +58387,4,204,593,10,10,10 +58388,4,204,594,10,10,10 +58389,4,204,595,11,10,10 +58390,4,204,596,102,10,10 +58391,4,204,597,102,10,10 +58392,4,204,598,12,10,10 +58393,4,287,609,10,10,10 +58394,4,287,610,204,10,10 +58395,4,287,611,204,10,10 +58396,4,287,612,102,10,10 +58397,4,287,613,102,10,10 +58398,4,287,614,12,10,10 +58399,4,288,609,10,10,10 +58400,4,288,610,204,10,10 +58401,4,288,611,204,10,10 +58402,4,288,612,102,10,10 +58403,4,288,613,102,10,10 +58404,4,288,614,12,10,10 +58405,4,185,609,21,10,10 +58406,4,185,610,214,10,10 +58407,4,185,611,214,10,10 +58408,4,185,612,190,10,10 +58409,4,185,613,190,10,10 +58410,4,185,614,190,10,10 +58411,4,187,609,21,10,10 +58412,4,187,610,214,10,10 +58413,4,187,611,214,10,10 +58414,4,187,612,190,10,10 +58415,4,187,613,190,10,10 +58416,4,187,614,190,10,10 +58417,4,188,609,21,10,10 +58418,4,188,610,214,10,10 +58419,4,188,611,214,10,10 +58420,4,188,612,190,10,10 +58421,4,188,613,190,10,10 +58422,4,188,614,190,10,10 +58423,4,192,609,21,10,10 +58424,4,192,610,214,10,10 +58425,4,192,611,214,10,10 +58426,4,192,612,190,10,10 +58427,4,192,613,190,10,10 +58428,4,192,614,190,10,10 +58429,4,201,609,21,10,10 +58430,4,201,610,214,10,10 +58431,4,201,611,214,10,10 +58432,4,201,612,190,10,10 +58433,4,201,613,190,10,10 +58434,4,201,614,190,10,10 +58435,4,205,609,10,10,10 +58436,4,205,610,204,10,10 +58437,4,205,611,204,10,10 +58438,4,205,612,102,10,10 +58439,4,205,613,102,10,10 +58440,4,205,614,12,10,10 +58441,4,206,609,10,10,10 +58442,4,206,610,204,10,10 +58443,4,206,611,204,10,10 +58444,4,206,612,102,10,10 +58445,4,206,613,102,10,10 +58446,4,206,614,12,10,10 +58447,4,209,609,10,10,10 +58448,4,209,610,204,10,10 +58449,4,209,611,204,10,10 +58450,4,209,612,102,10,10 +58451,4,209,613,102,10,10 +58452,4,209,614,12,10,10 +58453,4,210,609,10,10,10 +58454,4,210,610,204,10,10 +58455,4,210,611,204,10,10 +58456,4,210,612,102,10,10 +58457,4,210,613,102,10,10 +58458,4,210,614,12,10,10 +58459,4,222,609,10,10,10 +58460,4,222,610,204,10,10 +58461,4,222,611,204,10,10 +58462,4,222,612,102,10,10 +58463,4,222,613,102,10,10 +58464,4,222,614,12,10,10 +58465,4,223,609,10,10,10 +58466,4,223,610,204,10,10 +58467,4,223,611,204,10,10 +58468,4,223,612,102,10,10 +58469,4,223,613,102,10,10 +58470,4,223,614,12,10,10 +58471,4,236,609,21,10,10 +58472,4,236,610,214,10,10 +58473,4,236,611,214,10,10 +58474,4,236,612,190,10,10 +58475,4,236,613,190,10,10 +58476,4,236,614,190,10,10 +58477,4,241,609,21,10,10 +58478,4,241,610,214,10,10 +58479,4,241,611,214,10,10 +58480,4,241,612,190,10,10 +58481,4,241,613,190,10,10 +58482,4,241,614,190,10,10 +58483,4,243,609,21,10,10 +58484,4,243,610,214,10,10 +58485,4,243,611,214,10,10 +58486,4,243,612,190,10,10 +58487,4,243,613,190,10,10 +58488,4,243,614,190,10,10 +58489,4,251,609,21,10,10 +58490,4,251,610,214,10,10 +58491,4,251,611,214,10,10 +58492,4,251,612,190,10,10 +58493,4,251,613,190,10,10 +58494,4,251,614,190,10,10 +58495,4,252,609,21,10,10 +58496,4,252,610,214,10,10 +58497,4,252,611,214,10,10 +58498,4,252,612,190,10,10 +58499,4,252,613,190,10,10 +58500,4,252,614,190,10,10 +58501,4,798,609,10,10,10 +58502,4,798,610,204,10,10 +58503,4,798,611,204,10,10 +58504,4,798,612,102,10,10 +58505,4,798,613,102,10,10 +58506,4,798,614,12,10,10 +58507,4,242,609,10,10,10 +58508,4,242,610,204,10,10 +58509,4,242,611,204,10,10 +58510,4,242,612,102,10,10 +58511,4,242,613,102,10,10 +58512,4,242,614,12,10,10 +58513,4,204,609,10,10,10 +58514,4,204,610,204,10,10 +58515,4,204,611,204,10,10 +58516,4,204,612,102,10,10 +58517,4,204,613,102,10,10 +58518,4,204,614,12,10,10 +58519,5,287,587,13,10,10 +58520,5,287,588,13,10,10 +58521,5,287,589,14,10,10 +58522,5,287,590,102,10,10 +58523,5,287,591,102,10,10 +58524,5,287,592,15,10,10 +58525,5,288,587,13,10,10 +58526,5,288,588,13,10,10 +58527,5,288,589,14,10,10 +58528,5,288,590,102,10,10 +58529,5,288,591,102,10,10 +58530,5,288,592,15,10,10 +58531,5,185,587,21,10,10 +58532,5,185,588,21,10,10 +58533,5,185,589,21,10,10 +58534,5,185,590,190,10,10 +58535,5,185,591,190,10,10 +58536,5,185,592,190,10,10 +58537,5,187,587,21,10,10 +58538,5,187,588,21,10,10 +58539,5,187,589,21,10,10 +58540,5,187,590,190,10,10 +58541,5,187,591,190,10,10 +58542,5,187,592,190,10,10 +58543,5,188,587,21,10,10 +58544,5,188,588,21,10,10 +58545,5,188,589,21,10,10 +58546,5,188,590,190,10,10 +58547,5,188,591,190,10,10 +58548,5,188,592,190,10,10 +58549,5,192,587,21,10,10 +58550,5,192,588,21,10,10 +58551,5,192,589,21,10,10 +58552,5,192,590,190,10,10 +58553,5,192,591,190,10,10 +58554,5,192,592,190,10,10 +58555,5,201,587,21,10,10 +58556,5,201,588,21,10,10 +58557,5,201,589,21,10,10 +58558,5,201,590,190,10,10 +58559,5,201,591,190,10,10 +58560,5,201,592,190,10,10 +58561,5,205,587,13,10,10 +58562,5,205,588,13,10,10 +58563,5,205,589,14,10,10 +58564,5,205,590,102,10,10 +58565,5,205,591,102,10,10 +58566,5,205,592,15,10,10 +58567,5,206,587,13,10,10 +58568,5,206,588,13,10,10 +58569,5,206,589,14,10,10 +58570,5,206,590,102,10,10 +58571,5,206,591,102,10,10 +58572,5,206,592,15,10,10 +58573,5,209,587,13,10,10 +58574,5,209,588,13,10,10 +58575,5,209,589,14,10,10 +58576,5,209,590,102,10,10 +58577,5,209,591,102,10,10 +58578,5,209,592,15,10,10 +58579,5,210,587,13,10,10 +58580,5,210,588,13,10,10 +58581,5,210,589,14,10,10 +58582,5,210,590,102,10,10 +58583,5,210,591,102,10,10 +58584,5,210,592,15,10,10 +58585,5,222,587,13,10,10 +58586,5,222,588,13,10,10 +58587,5,222,589,14,10,10 +58588,5,222,590,102,10,10 +58589,5,222,591,102,10,10 +58590,5,222,592,15,10,10 +58591,5,223,587,13,10,10 +58592,5,223,588,13,10,10 +58593,5,223,589,14,10,10 +58594,5,223,590,102,10,10 +58595,5,223,591,102,10,10 +58596,5,223,592,15,10,10 +58597,5,236,587,21,10,10 +58598,5,236,588,21,10,10 +58599,5,236,589,21,10,10 +58600,5,236,590,190,10,10 +58601,5,236,591,190,10,10 +58602,5,236,592,190,10,10 +58603,5,241,587,21,10,10 +58604,5,241,588,21,10,10 +58605,5,241,589,21,10,10 +58606,5,241,590,190,10,10 +58607,5,241,591,190,10,10 +58608,5,241,592,190,10,10 +58609,5,243,587,21,10,10 +58610,5,243,588,21,10,10 +58611,5,243,589,21,10,10 +58612,5,243,590,190,10,10 +58613,5,243,591,190,10,10 +58614,5,243,592,190,10,10 +58615,5,251,587,21,10,10 +58616,5,251,588,21,10,10 +58617,5,251,589,21,10,10 +58618,5,251,590,190,10,10 +58619,5,251,591,190,10,10 +58620,5,251,592,190,10,10 +58621,5,252,587,21,10,10 +58622,5,252,588,21,10,10 +58623,5,252,589,21,10,10 +58624,5,252,590,190,10,10 +58625,5,252,591,190,10,10 +58626,5,252,592,190,10,10 +58627,5,798,587,13,10,10 +58628,5,798,588,13,10,10 +58629,5,798,589,14,10,10 +58630,5,798,590,102,10,10 +58631,5,798,591,102,10,10 +58632,5,798,592,15,10,10 +58633,5,242,587,13,10,10 +58634,5,242,588,13,10,10 +58635,5,242,589,14,10,10 +58636,5,242,590,102,10,10 +58637,5,242,591,102,10,10 +58638,5,242,592,15,10,10 +58639,5,204,587,13,10,10 +58640,5,204,588,13,10,10 +58641,5,204,589,14,10,10 +58642,5,204,590,102,10,10 +58643,5,204,591,102,10,10 +58644,5,204,592,15,10,10 +58645,5,287,593,13,10,10 +58646,5,287,594,13,10,10 +58647,5,287,595,14,10,10 +58648,5,287,596,102,10,10 +58649,5,287,597,102,10,10 +58650,5,287,598,15,10,10 +58651,5,288,593,13,10,10 +58652,5,288,594,13,10,10 +58653,5,288,595,14,10,10 +58654,5,288,596,102,10,10 +58655,5,288,597,102,10,10 +58656,5,288,598,15,10,10 +58657,5,185,593,21,10,10 +58658,5,185,594,21,10,10 +58659,5,185,595,21,10,10 +58660,5,185,596,190,10,10 +58661,5,185,597,190,10,10 +58662,5,185,598,190,10,10 +58663,5,187,593,21,10,10 +58664,5,187,594,21,10,10 +58665,5,187,595,21,10,10 +58666,5,187,596,190,10,10 +58667,5,187,597,190,10,10 +58668,5,187,598,190,10,10 +58669,5,188,593,21,10,10 +58670,5,188,594,21,10,10 +58671,5,188,595,21,10,10 +58672,5,188,596,190,10,10 +58673,5,188,597,190,10,10 +58674,5,188,598,190,10,10 +58675,5,192,593,21,10,10 +58676,5,192,594,21,10,10 +58677,5,192,595,21,10,10 +58678,5,192,596,190,10,10 +58679,5,192,597,190,10,10 +58680,5,192,598,190,10,10 +58681,5,201,593,21,10,10 +58682,5,201,594,21,10,10 +58683,5,201,595,21,10,10 +58684,5,201,596,190,10,10 +58685,5,201,597,190,10,10 +58686,5,201,598,190,10,10 +58687,5,205,593,13,10,10 +58688,5,205,594,13,10,10 +58689,5,205,595,14,10,10 +58690,5,205,596,102,10,10 +58691,5,205,597,102,10,10 +58692,5,205,598,15,10,10 +58693,5,206,593,13,10,10 +58694,5,206,594,13,10,10 +58695,5,206,595,14,10,10 +58696,5,206,596,102,10,10 +58697,5,206,597,102,10,10 +58698,5,206,598,15,10,10 +58699,5,209,593,13,10,10 +58700,5,209,594,13,10,10 +58701,5,209,595,14,10,10 +58702,5,209,596,102,10,10 +58703,5,209,597,102,10,10 +58704,5,209,598,15,10,10 +58705,5,210,593,13,10,10 +58706,5,210,594,13,10,10 +58707,5,210,595,14,10,10 +58708,5,210,596,102,10,10 +58709,5,210,597,102,10,10 +58710,5,210,598,15,10,10 +58711,5,222,593,13,10,10 +58712,5,222,594,13,10,10 +58713,5,222,595,14,10,10 +58714,5,222,596,102,10,10 +58715,5,222,597,102,10,10 +58716,5,222,598,15,10,10 +58717,5,223,593,13,10,10 +58718,5,223,594,13,10,10 +58719,5,223,595,14,10,10 +58720,5,223,596,102,10,10 +58721,5,223,597,102,10,10 +58722,5,223,598,15,10,10 +58723,5,236,593,21,10,10 +58724,5,236,594,21,10,10 +58725,5,236,595,21,10,10 +58726,5,236,596,190,10,10 +58727,5,236,597,190,10,10 +58728,5,236,598,190,10,10 +58729,5,241,593,21,10,10 +58730,5,241,594,21,10,10 +58731,5,241,595,21,10,10 +58732,5,241,596,190,10,10 +58733,5,241,597,190,10,10 +58734,5,241,598,190,10,10 +58735,5,243,593,21,10,10 +58736,5,243,594,21,10,10 +58737,5,243,595,21,10,10 +58738,5,243,596,190,10,10 +58739,5,243,597,190,10,10 +58740,5,243,598,190,10,10 +58741,5,251,593,21,10,10 +58742,5,251,594,21,10,10 +58743,5,251,595,21,10,10 +58744,5,251,596,190,10,10 +58745,5,251,597,190,10,10 +58746,5,251,598,190,10,10 +58747,5,252,593,21,10,10 +58748,5,252,594,21,10,10 +58749,5,252,595,21,10,10 +58750,5,252,596,190,10,10 +58751,5,252,597,190,10,10 +58752,5,252,598,190,10,10 +58753,5,798,593,13,10,10 +58754,5,798,594,13,10,10 +58755,5,798,595,14,10,10 +58756,5,798,596,102,10,10 +58757,5,798,597,102,10,10 +58758,5,798,598,15,10,10 +58759,5,242,593,13,10,10 +58760,5,242,594,13,10,10 +58761,5,242,595,14,10,10 +58762,5,242,596,102,10,10 +58763,5,242,597,102,10,10 +58764,5,242,598,15,10,10 +58765,5,204,593,13,10,10 +58766,5,204,594,13,10,10 +58767,5,204,595,14,10,10 +58768,5,204,596,102,10,10 +58769,5,204,597,102,10,10 +58770,5,204,598,15,10,10 +58771,5,287,609,13,10,10 +58772,5,287,610,204,10,10 +58773,5,287,611,204,10,10 +58774,5,287,612,102,10,10 +58775,5,287,613,102,10,10 +58776,5,287,614,15,10,10 +58777,5,288,609,13,10,10 +58778,5,288,610,204,10,10 +58779,5,288,611,204,10,10 +58780,5,288,612,102,10,10 +58781,5,288,613,102,10,10 +58782,5,288,614,15,10,10 +58783,5,185,609,21,10,10 +58784,5,185,610,214,10,10 +58785,5,185,611,214,10,10 +58786,5,185,612,190,10,10 +58787,5,185,613,190,10,10 +58788,5,185,614,190,10,10 +58789,5,187,609,21,10,10 +58790,5,187,610,214,10,10 +58791,5,187,611,214,10,10 +58792,5,187,612,190,10,10 +58793,5,187,613,190,10,10 +58794,5,187,614,190,10,10 +58795,5,188,609,21,10,10 +58796,5,188,610,214,10,10 +58797,5,188,611,214,10,10 +58798,5,188,612,190,10,10 +58799,5,188,613,190,10,10 +58800,5,188,614,190,10,10 +58801,5,192,609,21,10,10 +58802,5,192,610,214,10,10 +58803,5,192,611,214,10,10 +58804,5,192,612,190,10,10 +58805,5,192,613,190,10,10 +58806,5,192,614,190,10,10 +58807,5,201,609,21,10,10 +58808,5,201,610,214,10,10 +58809,5,201,611,214,10,10 +58810,5,201,612,190,10,10 +58811,5,201,613,190,10,10 +58812,5,201,614,190,10,10 +58813,5,205,609,13,10,10 +58814,5,205,610,204,10,10 +58815,5,205,611,204,10,10 +58816,5,205,612,102,10,10 +58817,5,205,613,102,10,10 +58818,5,205,614,15,10,10 +58819,5,206,609,13,10,10 +58820,5,206,610,204,10,10 +58821,5,206,611,204,10,10 +58822,5,206,612,102,10,10 +58823,5,206,613,102,10,10 +58824,5,206,614,15,10,10 +58825,5,209,609,13,10,10 +58826,5,209,610,204,10,10 +58827,5,209,611,204,10,10 +58828,5,209,612,102,10,10 +58829,5,209,613,102,10,10 +58830,5,209,614,15,10,10 +58831,5,210,609,13,10,10 +58832,5,210,610,204,10,10 +58833,5,210,611,204,10,10 +58834,5,210,612,102,10,10 +58835,5,210,613,102,10,10 +58836,5,210,614,15,10,10 +58837,5,222,609,13,10,10 +58838,5,222,610,204,10,10 +58839,5,222,611,204,10,10 +58840,5,222,612,102,10,10 +58841,5,222,613,102,10,10 +58842,5,222,614,15,10,10 +58843,5,223,609,13,10,10 +58844,5,223,610,204,10,10 +58845,5,223,611,204,10,10 +58846,5,223,612,102,10,10 +58847,5,223,613,102,10,10 +58848,5,223,614,15,10,10 +58849,5,236,609,21,10,10 +58850,5,236,610,214,10,10 +58851,5,236,611,214,10,10 +58852,5,236,612,190,10,10 +58853,5,236,613,190,10,10 +58854,5,236,614,190,10,10 +58855,5,241,609,21,10,10 +58856,5,241,610,214,10,10 +58857,5,241,611,214,10,10 +58858,5,241,612,190,10,10 +58859,5,241,613,190,10,10 +58860,5,241,614,190,10,10 +58861,5,243,609,21,10,10 +58862,5,243,610,214,10,10 +58863,5,243,611,214,10,10 +58864,5,243,612,190,10,10 +58865,5,243,613,190,10,10 +58866,5,243,614,190,10,10 +58867,5,251,609,21,10,10 +58868,5,251,610,214,10,10 +58869,5,251,611,214,10,10 +58870,5,251,612,190,10,10 +58871,5,251,613,190,10,10 +58872,5,251,614,190,10,10 +58873,5,252,609,21,10,10 +58874,5,252,610,214,10,10 +58875,5,252,611,214,10,10 +58876,5,252,612,190,10,10 +58877,5,252,613,190,10,10 +58878,5,252,614,190,10,10 +58879,5,798,609,13,10,10 +58880,5,798,610,204,10,10 +58881,5,798,611,204,10,10 +58882,5,798,612,102,10,10 +58883,5,798,613,102,10,10 +58884,5,798,614,15,10,10 +58885,5,242,609,13,10,10 +58886,5,242,610,204,10,10 +58887,5,242,611,204,10,10 +58888,5,242,612,102,10,10 +58889,5,242,613,102,10,10 +58890,5,242,614,15,10,10 +58891,5,204,609,13,10,10 +58892,5,204,610,204,10,10 +58893,5,204,611,204,10,10 +58894,5,204,612,102,10,10 +58895,5,204,613,102,10,10 +58896,5,204,614,15,10,10 +58897,6,287,593,163,10,10 +58898,6,287,594,23,10,10 +58899,6,287,595,163,10,10 +58900,6,287,596,102,10,10 +58901,6,287,597,102,10,10 +58902,6,287,598,102,10,10 +58903,6,288,593,163,10,10 +58904,6,288,594,23,10,10 +58905,6,288,595,163,10,10 +58906,6,288,596,102,10,10 +58907,6,288,597,102,10,10 +58908,6,288,598,102,10,10 +58909,6,185,593,163,10,10 +58910,6,185,594,167,10,10 +58911,6,185,595,165,10,10 +58912,6,185,596,102,10,10 +58913,6,185,597,102,10,10 +58914,6,185,598,102,10,10 +58915,6,187,593,163,10,10 +58916,6,187,594,167,10,10 +58917,6,187,595,165,10,10 +58918,6,187,596,102,10,10 +58919,6,187,597,102,10,10 +58920,6,187,598,102,10,10 +58921,6,188,593,163,10,10 +58922,6,188,594,167,10,10 +58923,6,188,595,165,10,10 +58924,6,188,596,102,10,10 +58925,6,188,597,102,10,10 +58926,6,188,598,102,10,10 +58927,6,192,593,163,10,10 +58928,6,192,594,23,10,10 +58929,6,192,595,163,10,10 +58930,6,192,596,102,10,10 +58931,6,192,597,102,10,10 +58932,6,192,598,102,10,10 +58933,6,201,593,21,10,10 +58934,6,201,594,23,10,10 +58935,6,201,595,21,10,10 +58936,6,201,596,190,10,10 +58937,6,201,597,190,10,10 +58938,6,201,598,190,10,10 +58939,6,205,593,163,10,10 +58940,6,205,594,167,10,10 +58941,6,205,595,165,10,10 +58942,6,205,596,102,10,10 +58943,6,205,597,102,10,10 +58944,6,205,598,102,10,10 +58945,6,206,593,163,10,10 +58946,6,206,594,167,10,10 +58947,6,206,595,165,10,10 +58948,6,206,596,102,10,10 +58949,6,206,597,102,10,10 +58950,6,206,598,102,10,10 +58951,6,209,593,163,10,10 +58952,6,209,594,167,10,10 +58953,6,209,595,165,10,10 +58954,6,209,596,102,10,10 +58955,6,209,597,102,10,10 +58956,6,209,598,102,10,10 +58957,6,210,593,163,10,10 +58958,6,210,594,167,10,10 +58959,6,210,595,165,10,10 +58960,6,210,596,102,10,10 +58961,6,210,597,102,10,10 +58962,6,210,598,102,10,10 +58963,6,222,593,163,10,10 +58964,6,222,594,167,10,10 +58965,6,222,595,165,10,10 +58966,6,222,596,102,10,10 +58967,6,222,597,102,10,10 +58968,6,222,598,102,10,10 +58969,6,223,593,163,10,10 +58970,6,223,594,167,10,10 +58971,6,223,595,165,10,10 +58972,6,223,596,102,10,10 +58973,6,223,597,102,10,10 +58974,6,223,598,102,10,10 +58975,6,236,593,21,10,10 +58976,6,236,594,23,10,10 +58977,6,236,595,21,10,10 +58978,6,236,596,190,10,10 +58979,6,236,597,190,10,10 +58980,6,236,598,190,10,10 +58981,6,241,593,163,10,10 +58982,6,241,594,48,10,10 +58983,6,241,595,163,10,10 +58984,6,241,596,102,10,10 +58985,6,241,597,102,10,10 +58986,6,241,598,102,10,10 +58987,6,243,593,21,10,10 +58988,6,243,594,21,10,10 +58989,6,243,595,21,10,10 +58990,6,243,596,190,10,10 +58991,6,243,597,190,10,10 +58992,6,243,598,190,10,10 +58993,6,251,593,21,10,10 +58994,6,251,594,21,10,10 +58995,6,251,595,21,10,10 +58996,6,251,596,190,10,10 +58997,6,251,597,190,10,10 +58998,6,251,598,190,10,10 +58999,6,252,593,21,10,10 +59000,6,252,594,21,10,10 +59001,6,252,595,21,10,10 +59002,6,252,596,190,10,10 +59003,6,252,597,190,10,10 +59004,6,252,598,190,10,10 +59005,6,798,593,21,10,10 +59006,6,798,594,23,10,10 +59007,6,798,595,21,10,10 +59008,6,798,596,190,10,10 +59009,6,798,597,190,10,10 +59010,6,798,598,190,10,10 +59011,6,242,593,163,10,10 +59012,6,242,594,48,10,10 +59013,6,242,595,163,10,10 +59014,6,242,596,102,10,10 +59015,6,242,597,102,10,10 +59016,6,242,598,102,10,10 +59017,6,204,593,163,10,10 +59018,6,204,594,204,10,10 +59019,6,204,595,204,10,10 +59020,6,204,596,164,10,10 +59021,6,204,597,12,10,10 +59022,6,204,598,15,10,10 +59023,6,287,610,163,10,10 +59024,6,287,611,23,10,10 +59025,6,287,612,163,10,10 +59026,6,287,613,102,10,10 +59027,6,287,614,102,10,10 +59028,6,287,615,102,10,10 +59029,6,288,610,163,10,10 +59030,6,288,611,23,10,10 +59031,6,288,612,163,10,10 +59032,6,288,613,102,10,10 +59033,6,288,614,102,10,10 +59034,6,288,615,102,10,10 +59035,6,185,610,163,10,10 +59036,6,185,611,167,10,10 +59037,6,185,612,165,10,10 +59038,6,185,613,102,10,10 +59039,6,185,614,102,10,10 +59040,6,185,615,102,10,10 +59041,6,187,610,163,10,10 +59042,6,187,611,167,10,10 +59043,6,187,612,165,10,10 +59044,6,187,613,102,10,10 +59045,6,187,614,102,10,10 +59046,6,187,615,102,10,10 +59047,6,188,610,163,10,10 +59048,6,188,611,167,10,10 +59049,6,188,612,165,10,10 +59050,6,188,613,102,10,10 +59051,6,188,614,102,10,10 +59052,6,188,615,102,10,10 +59053,6,192,610,163,10,10 +59054,6,192,611,23,10,10 +59055,6,192,612,163,10,10 +59056,6,192,613,102,10,10 +59057,6,192,614,102,10,10 +59058,6,192,615,102,10,10 +59059,6,201,610,21,10,10 +59060,6,201,611,23,10,10 +59061,6,201,612,21,10,10 +59062,6,201,613,190,10,10 +59063,6,201,614,190,10,10 +59064,6,201,615,190,10,10 +59065,6,205,610,163,10,10 +59066,6,205,611,167,10,10 +59067,6,205,612,165,10,10 +59068,6,205,613,102,10,10 +59069,6,205,614,102,10,10 +59070,6,205,615,102,10,10 +59071,6,206,610,163,10,10 +59072,6,206,611,167,10,10 +59073,6,206,612,165,10,10 +59074,6,206,613,102,10,10 +59075,6,206,614,102,10,10 +59076,6,206,615,102,10,10 +59077,6,209,610,163,10,10 +59078,6,209,611,167,10,10 +59079,6,209,612,165,10,10 +59080,6,209,613,102,10,10 +59081,6,209,614,102,10,10 +59082,6,209,615,102,10,10 +59083,6,210,610,163,10,10 +59084,6,210,611,167,10,10 +59085,6,210,612,165,10,10 +59086,6,210,613,102,10,10 +59087,6,210,614,102,10,10 +59088,6,210,615,102,10,10 +59089,6,222,610,163,10,10 +59090,6,222,611,167,10,10 +59091,6,222,612,165,10,10 +59092,6,222,613,102,10,10 +59093,6,222,614,102,10,10 +59094,6,222,615,102,10,10 +59095,6,223,610,163,10,10 +59096,6,223,611,167,10,10 +59097,6,223,612,165,10,10 +59098,6,223,613,102,10,10 +59099,6,223,614,102,10,10 +59100,6,223,615,102,10,10 +59101,6,236,610,21,10,10 +59102,6,236,611,23,10,10 +59103,6,236,612,21,10,10 +59104,6,236,613,190,10,10 +59105,6,236,614,190,10,10 +59106,6,236,615,190,10,10 +59107,6,241,610,163,10,10 +59108,6,241,611,48,10,10 +59109,6,241,612,163,10,10 +59110,6,241,613,102,10,10 +59111,6,241,614,102,10,10 +59112,6,241,615,102,10,10 +59113,6,243,610,21,10,10 +59114,6,243,611,21,10,10 +59115,6,243,612,21,10,10 +59116,6,243,613,190,10,10 +59117,6,243,614,190,10,10 +59118,6,243,615,190,10,10 +59119,6,251,610,21,10,10 +59120,6,251,611,21,10,10 +59121,6,251,612,21,10,10 +59122,6,251,613,190,10,10 +59123,6,251,614,190,10,10 +59124,6,251,615,190,10,10 +59125,6,252,610,21,10,10 +59126,6,252,611,21,10,10 +59127,6,252,612,21,10,10 +59128,6,252,613,190,10,10 +59129,6,252,614,190,10,10 +59130,6,252,615,190,10,10 +59131,6,798,610,21,10,10 +59132,6,798,611,23,10,10 +59133,6,798,612,21,10,10 +59134,6,798,613,190,10,10 +59135,6,798,614,190,10,10 +59136,6,798,615,190,10,10 +59137,6,242,610,163,10,10 +59138,6,242,611,48,10,10 +59139,6,242,612,163,10,10 +59140,6,242,613,102,10,10 +59141,6,242,614,102,10,10 +59142,6,242,615,102,10,10 +59143,6,204,610,163,10,10 +59144,6,204,611,204,10,10 +59145,6,204,612,204,10,10 +59146,6,204,613,164,10,10 +59147,6,204,614,12,10,10 +59148,6,204,615,15,10,10 +59149,6,287,610,163,10,10 +59150,6,287,611,204,10,10 +59151,6,287,612,204,10,10 +59152,6,287,613,102,10,10 +59153,6,287,614,102,10,10 +59154,6,287,615,102,10,10 +59155,6,288,610,163,10,10 +59156,6,288,611,204,10,10 +59157,6,288,612,204,10,10 +59158,6,288,613,102,10,10 +59159,6,288,614,102,10,10 +59160,6,288,615,102,10,10 +59161,6,185,610,163,10,10 +59162,6,185,611,204,10,10 +59163,6,185,612,204,10,10 +59164,6,185,613,102,10,10 +59165,6,185,614,102,10,10 +59166,6,185,615,102,10,10 +59167,6,187,610,163,10,10 +59168,6,187,611,204,10,10 +59169,6,187,612,204,10,10 +59170,6,187,613,102,10,10 +59171,6,187,614,102,10,10 +59172,6,187,615,102,10,10 +59173,6,188,610,163,10,10 +59174,6,188,611,204,10,10 +59175,6,188,612,204,10,10 +59176,6,188,613,102,10,10 +59177,6,188,614,102,10,10 +59178,6,188,615,102,10,10 +59179,6,192,610,163,10,10 +59180,6,192,611,204,10,10 +59181,6,192,612,204,10,10 +59182,6,192,613,102,10,10 +59183,6,192,614,102,10,10 +59184,6,192,615,102,10,10 +59185,6,201,610,21,10,10 +59186,6,201,611,214,10,10 +59187,6,201,612,214,10,10 +59188,6,201,613,190,10,10 +59189,6,201,614,190,10,10 +59190,6,201,615,190,10,10 +59191,6,205,610,163,10,10 +59192,6,205,611,204,10,10 +59193,6,205,612,204,10,10 +59194,6,205,613,102,10,10 +59195,6,205,614,102,10,10 +59196,6,205,615,102,10,10 +59197,6,206,610,163,10,10 +59198,6,206,611,204,10,10 +59199,6,206,612,204,10,10 +59200,6,206,613,102,10,10 +59201,6,206,614,102,10,10 +59202,6,206,615,102,10,10 +59203,6,209,610,163,10,10 +59204,6,209,611,204,10,10 +59205,6,209,612,204,10,10 +59206,6,209,613,102,10,10 +59207,6,209,614,102,10,10 +59208,6,209,615,102,10,10 +59209,6,210,610,163,10,10 +59210,6,210,611,204,10,10 +59211,6,210,612,204,10,10 +59212,6,210,613,102,10,10 +59213,6,210,614,102,10,10 +59214,6,210,615,102,10,10 +59215,6,222,610,163,10,10 +59216,6,222,611,204,10,10 +59217,6,222,612,204,10,10 +59218,6,222,613,102,10,10 +59219,6,222,614,102,10,10 +59220,6,222,615,102,10,10 +59221,6,223,610,163,10,10 +59222,6,223,611,204,10,10 +59223,6,223,612,204,10,10 +59224,6,223,613,102,10,10 +59225,6,223,614,102,10,10 +59226,6,223,615,102,10,10 +59227,6,236,610,21,10,10 +59228,6,236,611,214,10,10 +59229,6,236,612,214,10,10 +59230,6,236,613,190,10,10 +59231,6,236,614,190,10,10 +59232,6,236,615,190,10,10 +59233,6,241,610,163,10,10 +59234,6,241,611,204,10,10 +59235,6,241,612,204,10,10 +59236,6,241,613,102,10,10 +59237,6,241,614,102,10,10 +59238,6,241,615,102,10,10 +59239,6,243,610,21,10,10 +59240,6,243,611,214,10,10 +59241,6,243,612,214,10,10 +59242,6,243,613,190,10,10 +59243,6,243,614,190,10,10 +59244,6,243,615,190,10,10 +59245,6,251,610,21,10,10 +59246,6,251,611,214,10,10 +59247,6,251,612,214,10,10 +59248,6,251,613,190,10,10 +59249,6,251,614,190,10,10 +59250,6,251,615,190,10,10 +59251,6,252,610,21,10,10 +59252,6,252,611,214,10,10 +59253,6,252,612,214,10,10 +59254,6,252,613,190,10,10 +59255,6,252,614,190,10,10 +59256,6,252,615,190,10,10 +59257,6,798,610,21,10,10 +59258,6,798,611,214,10,10 +59259,6,798,612,214,10,10 +59260,6,798,613,190,10,10 +59261,6,798,614,190,10,10 +59262,6,798,615,190,10,10 +59263,6,242,610,163,10,10 +59264,6,242,611,204,10,10 +59265,6,242,612,204,10,10 +59266,6,242,613,102,10,10 +59267,6,242,614,102,10,10 +59268,6,242,615,102,10,10 +59269,6,204,610,163,10,10 +59270,6,204,611,10,10,10 +59271,6,204,612,13,10,10 +59272,6,204,613,163,10,10 +59273,6,204,614,11,10,10 +59274,6,204,615,14,10,10 +59275,4,282,581,143,50,50 +59276,5,282,581,143,50,50 +59277,6,282,582,143,50,50 +59278,15,305,584,143,50,50 +59279,16,305,584,143,50,50 +59280,15,276,584,143,50,50 +59281,16,276,584,143,50,50 +59282,7,801,565,383,45,45 +59283,8,801,565,382,45,45 +59284,9,802,566,383,70,70 +59285,9,803,566,382,70,70 +59286,7,804,565,384,70,70 +59287,8,804,565,384,70,70 +59288,9,804,566,384,70,70 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index aeed77ca..832039ba 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -661,3 +661,4 @@ location_area_id,local_language_id,name 802,9,Terra Cave 803,9,Marine Cave 804,9,Sky Pillar Apex +805,9,Bell Tower 1F diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index a70d40a1..855778c0 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -693,3 +693,4 @@ id,location_id,game_index,identifier 802,803,0,area 803,804,0,area 804,448,0,apex +805,139,0,1f From 2102fa319fb2835cce54607d63af5f1b8d1996cb Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Tue, 9 Mar 2021 18:28:21 +0000 Subject: [PATCH 014/113] =?UTF-8?q?Fix=20encounter=20slots=20for=20crystal?= =?UTF-8?q?'s=20Pok=C3=A9mon=20encounters=20Some=20wrong=20encoutner=20slo?= =?UTF-8?q?ts=20ID=20were=20being=20used=20bby=20Pok=C3=A9mon=20crystal's?= =?UTF-8?q?=20headbutt=20encounters,=20this=20resulted=20in=20erroneous=20?= =?UTF-8?q?chances=20which=20didn't=20add=20up=20to=20100%=20in=20an=20are?= =?UTF-8?q?a.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/v2/csv/encounters.csv | 756 ++++++++++++++++++------------------- 1 file changed, 378 insertions(+), 378 deletions(-) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index a7f8fecb..5c6abea0 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -55184,384 +55184,384 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 58894,5,204,612,102,10,10 58895,5,204,613,102,10,10 58896,5,204,614,15,10,10 -58897,6,287,593,163,10,10 -58898,6,287,594,23,10,10 -58899,6,287,595,163,10,10 -58900,6,287,596,102,10,10 -58901,6,287,597,102,10,10 -58902,6,287,598,102,10,10 -58903,6,288,593,163,10,10 -58904,6,288,594,23,10,10 -58905,6,288,595,163,10,10 -58906,6,288,596,102,10,10 -58907,6,288,597,102,10,10 -58908,6,288,598,102,10,10 -58909,6,185,593,163,10,10 -58910,6,185,594,167,10,10 -58911,6,185,595,165,10,10 -58912,6,185,596,102,10,10 -58913,6,185,597,102,10,10 -58914,6,185,598,102,10,10 -58915,6,187,593,163,10,10 -58916,6,187,594,167,10,10 -58917,6,187,595,165,10,10 -58918,6,187,596,102,10,10 -58919,6,187,597,102,10,10 -58920,6,187,598,102,10,10 -58921,6,188,593,163,10,10 -58922,6,188,594,167,10,10 -58923,6,188,595,165,10,10 -58924,6,188,596,102,10,10 -58925,6,188,597,102,10,10 -58926,6,188,598,102,10,10 -58927,6,192,593,163,10,10 -58928,6,192,594,23,10,10 -58929,6,192,595,163,10,10 -58930,6,192,596,102,10,10 -58931,6,192,597,102,10,10 -58932,6,192,598,102,10,10 -58933,6,201,593,21,10,10 -58934,6,201,594,23,10,10 -58935,6,201,595,21,10,10 -58936,6,201,596,190,10,10 -58937,6,201,597,190,10,10 -58938,6,201,598,190,10,10 -58939,6,205,593,163,10,10 -58940,6,205,594,167,10,10 -58941,6,205,595,165,10,10 -58942,6,205,596,102,10,10 -58943,6,205,597,102,10,10 -58944,6,205,598,102,10,10 -58945,6,206,593,163,10,10 -58946,6,206,594,167,10,10 -58947,6,206,595,165,10,10 -58948,6,206,596,102,10,10 -58949,6,206,597,102,10,10 -58950,6,206,598,102,10,10 -58951,6,209,593,163,10,10 -58952,6,209,594,167,10,10 -58953,6,209,595,165,10,10 -58954,6,209,596,102,10,10 -58955,6,209,597,102,10,10 -58956,6,209,598,102,10,10 -58957,6,210,593,163,10,10 -58958,6,210,594,167,10,10 -58959,6,210,595,165,10,10 -58960,6,210,596,102,10,10 -58961,6,210,597,102,10,10 -58962,6,210,598,102,10,10 -58963,6,222,593,163,10,10 -58964,6,222,594,167,10,10 -58965,6,222,595,165,10,10 -58966,6,222,596,102,10,10 -58967,6,222,597,102,10,10 -58968,6,222,598,102,10,10 -58969,6,223,593,163,10,10 -58970,6,223,594,167,10,10 -58971,6,223,595,165,10,10 -58972,6,223,596,102,10,10 -58973,6,223,597,102,10,10 -58974,6,223,598,102,10,10 -58975,6,236,593,21,10,10 -58976,6,236,594,23,10,10 -58977,6,236,595,21,10,10 -58978,6,236,596,190,10,10 -58979,6,236,597,190,10,10 -58980,6,236,598,190,10,10 -58981,6,241,593,163,10,10 -58982,6,241,594,48,10,10 -58983,6,241,595,163,10,10 -58984,6,241,596,102,10,10 -58985,6,241,597,102,10,10 -58986,6,241,598,102,10,10 -58987,6,243,593,21,10,10 -58988,6,243,594,21,10,10 -58989,6,243,595,21,10,10 -58990,6,243,596,190,10,10 -58991,6,243,597,190,10,10 -58992,6,243,598,190,10,10 -58993,6,251,593,21,10,10 -58994,6,251,594,21,10,10 -58995,6,251,595,21,10,10 -58996,6,251,596,190,10,10 -58997,6,251,597,190,10,10 -58998,6,251,598,190,10,10 -58999,6,252,593,21,10,10 -59000,6,252,594,21,10,10 -59001,6,252,595,21,10,10 -59002,6,252,596,190,10,10 -59003,6,252,597,190,10,10 -59004,6,252,598,190,10,10 -59005,6,798,593,21,10,10 -59006,6,798,594,23,10,10 -59007,6,798,595,21,10,10 -59008,6,798,596,190,10,10 -59009,6,798,597,190,10,10 -59010,6,798,598,190,10,10 -59011,6,242,593,163,10,10 -59012,6,242,594,48,10,10 -59013,6,242,595,163,10,10 -59014,6,242,596,102,10,10 -59015,6,242,597,102,10,10 -59016,6,242,598,102,10,10 -59017,6,204,593,163,10,10 -59018,6,204,594,204,10,10 -59019,6,204,595,204,10,10 -59020,6,204,596,164,10,10 -59021,6,204,597,12,10,10 -59022,6,204,598,15,10,10 -59023,6,287,610,163,10,10 -59024,6,287,611,23,10,10 -59025,6,287,612,163,10,10 -59026,6,287,613,102,10,10 -59027,6,287,614,102,10,10 -59028,6,287,615,102,10,10 -59029,6,288,610,163,10,10 -59030,6,288,611,23,10,10 -59031,6,288,612,163,10,10 -59032,6,288,613,102,10,10 -59033,6,288,614,102,10,10 -59034,6,288,615,102,10,10 -59035,6,185,610,163,10,10 -59036,6,185,611,167,10,10 -59037,6,185,612,165,10,10 -59038,6,185,613,102,10,10 -59039,6,185,614,102,10,10 -59040,6,185,615,102,10,10 -59041,6,187,610,163,10,10 -59042,6,187,611,167,10,10 -59043,6,187,612,165,10,10 -59044,6,187,613,102,10,10 -59045,6,187,614,102,10,10 -59046,6,187,615,102,10,10 -59047,6,188,610,163,10,10 -59048,6,188,611,167,10,10 -59049,6,188,612,165,10,10 -59050,6,188,613,102,10,10 -59051,6,188,614,102,10,10 -59052,6,188,615,102,10,10 -59053,6,192,610,163,10,10 -59054,6,192,611,23,10,10 -59055,6,192,612,163,10,10 -59056,6,192,613,102,10,10 -59057,6,192,614,102,10,10 -59058,6,192,615,102,10,10 -59059,6,201,610,21,10,10 -59060,6,201,611,23,10,10 -59061,6,201,612,21,10,10 -59062,6,201,613,190,10,10 -59063,6,201,614,190,10,10 -59064,6,201,615,190,10,10 -59065,6,205,610,163,10,10 -59066,6,205,611,167,10,10 -59067,6,205,612,165,10,10 -59068,6,205,613,102,10,10 -59069,6,205,614,102,10,10 -59070,6,205,615,102,10,10 -59071,6,206,610,163,10,10 -59072,6,206,611,167,10,10 -59073,6,206,612,165,10,10 -59074,6,206,613,102,10,10 -59075,6,206,614,102,10,10 -59076,6,206,615,102,10,10 -59077,6,209,610,163,10,10 -59078,6,209,611,167,10,10 -59079,6,209,612,165,10,10 -59080,6,209,613,102,10,10 -59081,6,209,614,102,10,10 -59082,6,209,615,102,10,10 -59083,6,210,610,163,10,10 -59084,6,210,611,167,10,10 -59085,6,210,612,165,10,10 -59086,6,210,613,102,10,10 -59087,6,210,614,102,10,10 -59088,6,210,615,102,10,10 -59089,6,222,610,163,10,10 -59090,6,222,611,167,10,10 -59091,6,222,612,165,10,10 -59092,6,222,613,102,10,10 -59093,6,222,614,102,10,10 -59094,6,222,615,102,10,10 -59095,6,223,610,163,10,10 -59096,6,223,611,167,10,10 -59097,6,223,612,165,10,10 -59098,6,223,613,102,10,10 -59099,6,223,614,102,10,10 -59100,6,223,615,102,10,10 -59101,6,236,610,21,10,10 -59102,6,236,611,23,10,10 -59103,6,236,612,21,10,10 -59104,6,236,613,190,10,10 -59105,6,236,614,190,10,10 -59106,6,236,615,190,10,10 -59107,6,241,610,163,10,10 -59108,6,241,611,48,10,10 -59109,6,241,612,163,10,10 -59110,6,241,613,102,10,10 -59111,6,241,614,102,10,10 -59112,6,241,615,102,10,10 -59113,6,243,610,21,10,10 -59114,6,243,611,21,10,10 -59115,6,243,612,21,10,10 -59116,6,243,613,190,10,10 -59117,6,243,614,190,10,10 -59118,6,243,615,190,10,10 -59119,6,251,610,21,10,10 -59120,6,251,611,21,10,10 -59121,6,251,612,21,10,10 -59122,6,251,613,190,10,10 -59123,6,251,614,190,10,10 -59124,6,251,615,190,10,10 -59125,6,252,610,21,10,10 -59126,6,252,611,21,10,10 -59127,6,252,612,21,10,10 -59128,6,252,613,190,10,10 -59129,6,252,614,190,10,10 -59130,6,252,615,190,10,10 -59131,6,798,610,21,10,10 -59132,6,798,611,23,10,10 -59133,6,798,612,21,10,10 -59134,6,798,613,190,10,10 -59135,6,798,614,190,10,10 -59136,6,798,615,190,10,10 -59137,6,242,610,163,10,10 -59138,6,242,611,48,10,10 -59139,6,242,612,163,10,10 -59140,6,242,613,102,10,10 -59141,6,242,614,102,10,10 -59142,6,242,615,102,10,10 -59143,6,204,610,163,10,10 -59144,6,204,611,204,10,10 -59145,6,204,612,204,10,10 -59146,6,204,613,164,10,10 -59147,6,204,614,12,10,10 -59148,6,204,615,15,10,10 -59149,6,287,610,163,10,10 -59150,6,287,611,204,10,10 -59151,6,287,612,204,10,10 -59152,6,287,613,102,10,10 -59153,6,287,614,102,10,10 -59154,6,287,615,102,10,10 -59155,6,288,610,163,10,10 -59156,6,288,611,204,10,10 -59157,6,288,612,204,10,10 -59158,6,288,613,102,10,10 -59159,6,288,614,102,10,10 -59160,6,288,615,102,10,10 -59161,6,185,610,163,10,10 -59162,6,185,611,204,10,10 -59163,6,185,612,204,10,10 -59164,6,185,613,102,10,10 -59165,6,185,614,102,10,10 -59166,6,185,615,102,10,10 -59167,6,187,610,163,10,10 -59168,6,187,611,204,10,10 -59169,6,187,612,204,10,10 -59170,6,187,613,102,10,10 -59171,6,187,614,102,10,10 -59172,6,187,615,102,10,10 -59173,6,188,610,163,10,10 -59174,6,188,611,204,10,10 -59175,6,188,612,204,10,10 -59176,6,188,613,102,10,10 -59177,6,188,614,102,10,10 -59178,6,188,615,102,10,10 -59179,6,192,610,163,10,10 -59180,6,192,611,204,10,10 -59181,6,192,612,204,10,10 -59182,6,192,613,102,10,10 -59183,6,192,614,102,10,10 -59184,6,192,615,102,10,10 -59185,6,201,610,21,10,10 -59186,6,201,611,214,10,10 -59187,6,201,612,214,10,10 -59188,6,201,613,190,10,10 -59189,6,201,614,190,10,10 -59190,6,201,615,190,10,10 -59191,6,205,610,163,10,10 -59192,6,205,611,204,10,10 -59193,6,205,612,204,10,10 -59194,6,205,613,102,10,10 -59195,6,205,614,102,10,10 -59196,6,205,615,102,10,10 -59197,6,206,610,163,10,10 -59198,6,206,611,204,10,10 -59199,6,206,612,204,10,10 -59200,6,206,613,102,10,10 -59201,6,206,614,102,10,10 -59202,6,206,615,102,10,10 -59203,6,209,610,163,10,10 -59204,6,209,611,204,10,10 -59205,6,209,612,204,10,10 -59206,6,209,613,102,10,10 -59207,6,209,614,102,10,10 -59208,6,209,615,102,10,10 -59209,6,210,610,163,10,10 -59210,6,210,611,204,10,10 -59211,6,210,612,204,10,10 -59212,6,210,613,102,10,10 -59213,6,210,614,102,10,10 -59214,6,210,615,102,10,10 -59215,6,222,610,163,10,10 -59216,6,222,611,204,10,10 -59217,6,222,612,204,10,10 -59218,6,222,613,102,10,10 -59219,6,222,614,102,10,10 -59220,6,222,615,102,10,10 -59221,6,223,610,163,10,10 -59222,6,223,611,204,10,10 -59223,6,223,612,204,10,10 -59224,6,223,613,102,10,10 -59225,6,223,614,102,10,10 -59226,6,223,615,102,10,10 -59227,6,236,610,21,10,10 -59228,6,236,611,214,10,10 -59229,6,236,612,214,10,10 -59230,6,236,613,190,10,10 -59231,6,236,614,190,10,10 -59232,6,236,615,190,10,10 -59233,6,241,610,163,10,10 -59234,6,241,611,204,10,10 -59235,6,241,612,204,10,10 -59236,6,241,613,102,10,10 -59237,6,241,614,102,10,10 -59238,6,241,615,102,10,10 -59239,6,243,610,21,10,10 -59240,6,243,611,214,10,10 -59241,6,243,612,214,10,10 -59242,6,243,613,190,10,10 -59243,6,243,614,190,10,10 -59244,6,243,615,190,10,10 -59245,6,251,610,21,10,10 -59246,6,251,611,214,10,10 -59247,6,251,612,214,10,10 -59248,6,251,613,190,10,10 -59249,6,251,614,190,10,10 -59250,6,251,615,190,10,10 -59251,6,252,610,21,10,10 -59252,6,252,611,214,10,10 -59253,6,252,612,214,10,10 -59254,6,252,613,190,10,10 -59255,6,252,614,190,10,10 -59256,6,252,615,190,10,10 -59257,6,798,610,21,10,10 -59258,6,798,611,214,10,10 -59259,6,798,612,214,10,10 -59260,6,798,613,190,10,10 -59261,6,798,614,190,10,10 -59262,6,798,615,190,10,10 -59263,6,242,610,163,10,10 -59264,6,242,611,204,10,10 -59265,6,242,612,204,10,10 -59266,6,242,613,102,10,10 -59267,6,242,614,102,10,10 -59268,6,242,615,102,10,10 -59269,6,204,610,163,10,10 -59270,6,204,611,10,10,10 -59271,6,204,612,13,10,10 -59272,6,204,613,163,10,10 -59273,6,204,614,11,10,10 -59274,6,204,615,14,10,10 +58897,6,287,615,163,10,10 +58898,6,287,616,23,10,10 +58899,6,287,617,163,10,10 +58900,6,287,618,102,10,10 +58901,6,287,619,102,10,10 +58902,6,287,620,102,10,10 +58903,6,288,615,163,10,10 +58904,6,288,616,23,10,10 +58905,6,288,617,163,10,10 +58906,6,288,618,102,10,10 +58907,6,288,619,102,10,10 +58908,6,288,620,102,10,10 +58909,6,185,615,163,10,10 +58910,6,185,616,167,10,10 +58911,6,185,617,165,10,10 +58912,6,185,618,102,10,10 +58913,6,185,619,102,10,10 +58914,6,185,620,102,10,10 +58915,6,187,615,163,10,10 +58916,6,187,616,167,10,10 +58917,6,187,617,165,10,10 +58918,6,187,618,102,10,10 +58919,6,187,619,102,10,10 +58920,6,187,620,102,10,10 +58921,6,188,615,163,10,10 +58922,6,188,616,167,10,10 +58923,6,188,617,165,10,10 +58924,6,188,618,102,10,10 +58925,6,188,619,102,10,10 +58926,6,188,620,102,10,10 +58927,6,192,615,163,10,10 +58928,6,192,616,23,10,10 +58929,6,192,617,163,10,10 +58930,6,192,618,102,10,10 +58931,6,192,619,102,10,10 +58932,6,192,620,102,10,10 +58933,6,201,615,21,10,10 +58934,6,201,616,23,10,10 +58935,6,201,617,21,10,10 +58936,6,201,618,190,10,10 +58937,6,201,619,190,10,10 +58938,6,201,620,190,10,10 +58939,6,205,615,163,10,10 +58940,6,205,616,167,10,10 +58941,6,205,617,165,10,10 +58942,6,205,618,102,10,10 +58943,6,205,619,102,10,10 +58944,6,205,620,102,10,10 +58945,6,206,615,163,10,10 +58946,6,206,616,167,10,10 +58947,6,206,617,165,10,10 +58948,6,206,618,102,10,10 +58949,6,206,619,102,10,10 +58950,6,206,620,102,10,10 +58951,6,209,615,163,10,10 +58952,6,209,616,167,10,10 +58953,6,209,617,165,10,10 +58954,6,209,618,102,10,10 +58955,6,209,619,102,10,10 +58956,6,209,620,102,10,10 +58957,6,210,615,163,10,10 +58958,6,210,616,167,10,10 +58959,6,210,617,165,10,10 +58960,6,210,618,102,10,10 +58961,6,210,619,102,10,10 +58962,6,210,620,102,10,10 +58963,6,222,615,163,10,10 +58964,6,222,616,167,10,10 +58965,6,222,617,165,10,10 +58966,6,222,618,102,10,10 +58967,6,222,619,102,10,10 +58968,6,222,620,102,10,10 +58969,6,223,615,163,10,10 +58970,6,223,616,167,10,10 +58971,6,223,617,165,10,10 +58972,6,223,618,102,10,10 +58973,6,223,619,102,10,10 +58974,6,223,620,102,10,10 +58975,6,236,615,21,10,10 +58976,6,236,616,23,10,10 +58977,6,236,617,21,10,10 +58978,6,236,618,190,10,10 +58979,6,236,619,190,10,10 +58980,6,236,620,190,10,10 +58981,6,241,615,163,10,10 +58982,6,241,616,48,10,10 +58983,6,241,617,163,10,10 +58984,6,241,618,102,10,10 +58985,6,241,619,102,10,10 +58986,6,241,620,102,10,10 +58987,6,243,615,21,10,10 +58988,6,243,616,21,10,10 +58989,6,243,617,21,10,10 +58990,6,243,618,190,10,10 +58991,6,243,619,190,10,10 +58992,6,243,620,190,10,10 +58993,6,251,615,21,10,10 +58994,6,251,616,21,10,10 +58995,6,251,617,21,10,10 +58996,6,251,618,190,10,10 +58997,6,251,619,190,10,10 +58998,6,251,620,190,10,10 +58999,6,252,615,21,10,10 +59000,6,252,616,21,10,10 +59001,6,252,617,21,10,10 +59002,6,252,618,190,10,10 +59003,6,252,619,190,10,10 +59004,6,252,620,190,10,10 +59005,6,798,615,21,10,10 +59006,6,798,616,23,10,10 +59007,6,798,617,21,10,10 +59008,6,798,618,190,10,10 +59009,6,798,619,190,10,10 +59010,6,798,620,190,10,10 +59011,6,242,615,163,10,10 +59012,6,242,616,48,10,10 +59013,6,242,617,163,10,10 +59014,6,242,618,102,10,10 +59015,6,242,619,102,10,10 +59016,6,242,620,102,10,10 +59017,6,204,615,163,10,10 +59018,6,204,616,204,10,10 +59019,6,204,617,204,10,10 +59020,6,204,618,164,10,10 +59021,6,204,619,12,10,10 +59022,6,204,620,15,10,10 +59023,6,287,621,163,10,10 +59024,6,287,622,23,10,10 +59025,6,287,623,163,10,10 +59026,6,287,624,102,10,10 +59027,6,287,625,102,10,10 +59028,6,287,626,102,10,10 +59029,6,288,621,163,10,10 +59030,6,288,622,23,10,10 +59031,6,288,623,163,10,10 +59032,6,288,624,102,10,10 +59033,6,288,625,102,10,10 +59034,6,288,626,102,10,10 +59035,6,185,621,163,10,10 +59036,6,185,622,167,10,10 +59037,6,185,623,165,10,10 +59038,6,185,624,102,10,10 +59039,6,185,625,102,10,10 +59040,6,185,626,102,10,10 +59041,6,187,621,163,10,10 +59042,6,187,622,167,10,10 +59043,6,187,623,165,10,10 +59044,6,187,624,102,10,10 +59045,6,187,625,102,10,10 +59046,6,187,626,102,10,10 +59047,6,188,621,163,10,10 +59048,6,188,622,167,10,10 +59049,6,188,623,165,10,10 +59050,6,188,624,102,10,10 +59051,6,188,625,102,10,10 +59052,6,188,626,102,10,10 +59053,6,192,621,163,10,10 +59054,6,192,622,23,10,10 +59055,6,192,623,163,10,10 +59056,6,192,624,102,10,10 +59057,6,192,625,102,10,10 +59058,6,192,626,102,10,10 +59059,6,201,621,21,10,10 +59060,6,201,622,23,10,10 +59061,6,201,623,21,10,10 +59062,6,201,624,190,10,10 +59063,6,201,625,190,10,10 +59064,6,201,626,190,10,10 +59065,6,205,621,163,10,10 +59066,6,205,622,167,10,10 +59067,6,205,623,165,10,10 +59068,6,205,624,102,10,10 +59069,6,205,625,102,10,10 +59070,6,205,626,102,10,10 +59071,6,206,621,163,10,10 +59072,6,206,622,167,10,10 +59073,6,206,623,165,10,10 +59074,6,206,624,102,10,10 +59075,6,206,625,102,10,10 +59076,6,206,626,102,10,10 +59077,6,209,621,163,10,10 +59078,6,209,622,167,10,10 +59079,6,209,623,165,10,10 +59080,6,209,624,102,10,10 +59081,6,209,625,102,10,10 +59082,6,209,626,102,10,10 +59083,6,210,621,163,10,10 +59084,6,210,622,167,10,10 +59085,6,210,623,165,10,10 +59086,6,210,624,102,10,10 +59087,6,210,625,102,10,10 +59088,6,210,626,102,10,10 +59089,6,222,621,163,10,10 +59090,6,222,622,167,10,10 +59091,6,222,623,165,10,10 +59092,6,222,624,102,10,10 +59093,6,222,625,102,10,10 +59094,6,222,626,102,10,10 +59095,6,223,621,163,10,10 +59096,6,223,622,167,10,10 +59097,6,223,623,165,10,10 +59098,6,223,624,102,10,10 +59099,6,223,625,102,10,10 +59100,6,223,626,102,10,10 +59101,6,236,621,21,10,10 +59102,6,236,622,23,10,10 +59103,6,236,623,21,10,10 +59104,6,236,624,190,10,10 +59105,6,236,625,190,10,10 +59106,6,236,626,190,10,10 +59107,6,241,621,163,10,10 +59108,6,241,622,48,10,10 +59109,6,241,623,163,10,10 +59110,6,241,624,102,10,10 +59111,6,241,625,102,10,10 +59112,6,241,626,102,10,10 +59113,6,243,621,21,10,10 +59114,6,243,622,21,10,10 +59115,6,243,623,21,10,10 +59116,6,243,624,190,10,10 +59117,6,243,625,190,10,10 +59118,6,243,626,190,10,10 +59119,6,251,621,21,10,10 +59120,6,251,622,21,10,10 +59121,6,251,623,21,10,10 +59122,6,251,624,190,10,10 +59123,6,251,625,190,10,10 +59124,6,251,626,190,10,10 +59125,6,252,621,21,10,10 +59126,6,252,622,21,10,10 +59127,6,252,623,21,10,10 +59128,6,252,624,190,10,10 +59129,6,252,625,190,10,10 +59130,6,252,626,190,10,10 +59131,6,798,621,21,10,10 +59132,6,798,622,23,10,10 +59133,6,798,623,21,10,10 +59134,6,798,624,190,10,10 +59135,6,798,625,190,10,10 +59136,6,798,626,190,10,10 +59137,6,242,621,163,10,10 +59138,6,242,622,48,10,10 +59139,6,242,623,163,10,10 +59140,6,242,624,102,10,10 +59141,6,242,625,102,10,10 +59142,6,242,626,102,10,10 +59143,6,204,621,163,10,10 +59144,6,204,622,204,10,10 +59145,6,204,623,204,10,10 +59146,6,204,624,164,10,10 +59147,6,204,625,12,10,10 +59148,6,204,626,15,10,10 +59149,6,287,627,163,10,10 +59150,6,287,628,204,10,10 +59151,6,287,629,204,10,10 +59152,6,287,630,102,10,10 +59153,6,287,631,102,10,10 +59154,6,287,632,102,10,10 +59155,6,288,627,163,10,10 +59156,6,288,628,204,10,10 +59157,6,288,629,204,10,10 +59158,6,288,630,102,10,10 +59159,6,288,631,102,10,10 +59160,6,288,632,102,10,10 +59161,6,185,627,163,10,10 +59162,6,185,628,204,10,10 +59163,6,185,629,204,10,10 +59164,6,185,630,102,10,10 +59165,6,185,631,102,10,10 +59166,6,185,632,102,10,10 +59167,6,187,627,163,10,10 +59168,6,187,628,204,10,10 +59169,6,187,629,204,10,10 +59170,6,187,630,102,10,10 +59171,6,187,631,102,10,10 +59172,6,187,632,102,10,10 +59173,6,188,627,163,10,10 +59174,6,188,628,204,10,10 +59175,6,188,629,204,10,10 +59176,6,188,630,102,10,10 +59177,6,188,631,102,10,10 +59178,6,188,632,102,10,10 +59179,6,192,627,163,10,10 +59180,6,192,628,204,10,10 +59181,6,192,629,204,10,10 +59182,6,192,630,102,10,10 +59183,6,192,631,102,10,10 +59184,6,192,632,102,10,10 +59185,6,201,627,21,10,10 +59186,6,201,628,214,10,10 +59187,6,201,629,214,10,10 +59188,6,201,630,190,10,10 +59189,6,201,631,190,10,10 +59190,6,201,632,190,10,10 +59191,6,205,627,163,10,10 +59192,6,205,628,204,10,10 +59193,6,205,629,204,10,10 +59194,6,205,630,102,10,10 +59195,6,205,631,102,10,10 +59196,6,205,632,102,10,10 +59197,6,206,627,163,10,10 +59198,6,206,628,204,10,10 +59199,6,206,629,204,10,10 +59200,6,206,630,102,10,10 +59201,6,206,631,102,10,10 +59202,6,206,632,102,10,10 +59203,6,209,627,163,10,10 +59204,6,209,628,204,10,10 +59205,6,209,629,204,10,10 +59206,6,209,630,102,10,10 +59207,6,209,631,102,10,10 +59208,6,209,632,102,10,10 +59209,6,210,627,163,10,10 +59210,6,210,628,204,10,10 +59211,6,210,629,204,10,10 +59212,6,210,630,102,10,10 +59213,6,210,631,102,10,10 +59214,6,210,632,102,10,10 +59215,6,222,627,163,10,10 +59216,6,222,628,204,10,10 +59217,6,222,629,204,10,10 +59218,6,222,630,102,10,10 +59219,6,222,631,102,10,10 +59220,6,222,632,102,10,10 +59221,6,223,627,163,10,10 +59222,6,223,628,204,10,10 +59223,6,223,629,204,10,10 +59224,6,223,630,102,10,10 +59225,6,223,631,102,10,10 +59226,6,223,632,102,10,10 +59227,6,236,627,21,10,10 +59228,6,236,628,214,10,10 +59229,6,236,629,214,10,10 +59230,6,236,630,190,10,10 +59231,6,236,631,190,10,10 +59232,6,236,632,190,10,10 +59233,6,241,627,163,10,10 +59234,6,241,628,204,10,10 +59235,6,241,629,204,10,10 +59236,6,241,630,102,10,10 +59237,6,241,631,102,10,10 +59238,6,241,632,102,10,10 +59239,6,243,627,21,10,10 +59240,6,243,628,214,10,10 +59241,6,243,629,214,10,10 +59242,6,243,630,190,10,10 +59243,6,243,631,190,10,10 +59244,6,243,632,190,10,10 +59245,6,251,627,21,10,10 +59246,6,251,628,214,10,10 +59247,6,251,629,214,10,10 +59248,6,251,630,190,10,10 +59249,6,251,631,190,10,10 +59250,6,251,632,190,10,10 +59251,6,252,627,21,10,10 +59252,6,252,628,214,10,10 +59253,6,252,629,214,10,10 +59254,6,252,630,190,10,10 +59255,6,252,631,190,10,10 +59256,6,252,632,190,10,10 +59257,6,798,627,21,10,10 +59258,6,798,628,214,10,10 +59259,6,798,629,214,10,10 +59260,6,798,630,190,10,10 +59261,6,798,631,190,10,10 +59262,6,798,632,190,10,10 +59263,6,242,627,163,10,10 +59264,6,242,628,204,10,10 +59265,6,242,629,204,10,10 +59266,6,242,630,102,10,10 +59267,6,242,631,102,10,10 +59268,6,242,632,102,10,10 +59269,6,204,627,163,10,10 +59270,6,204,628,10,10,10 +59271,6,204,629,13,10,10 +59272,6,204,630,163,10,10 +59273,6,204,631,11,10,10 +59274,6,204,632,14,10,10 59275,4,282,581,143,50,50 59276,5,282,581,143,50,50 59277,6,282,582,143,50,50 From 27fb1eb160b2195c84bad82cc9e1bee3fe25cd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 9 Mar 2021 20:58:43 +0100 Subject: [PATCH 015/113] fix: use correct folder --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9ce7cbc8..a8c433f4 100755 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ sync-to-veekun: pull pull-veekun # Copy data from this repository to ../pokedex cp -a ./data/v2/csv/. ${veekun_pokedex_repository}/pokedex/data/csv hasura-export: # Export Hasura configuration - hasura md export --admin-secret pokemon + hasura md export --project hasura --admin-secret pokemon hasura-apply: # Apply local Hasura configuration - hasura md apply --admin-secret pokemon + hasura md apply --project hasura --admin-secret pokemon From e61049558f2d84ca4d504e62ed28255bf0c2a64c Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Thu, 11 Mar 2021 19:41:29 -0300 Subject: [PATCH 016/113] Add missing encounters Gen 3 edition Added encounter methods and slots for: - Squirt Bottle - Wailmer Pail Added missing locations and their areas where applicable: - Two island - Three island - Three isle path - Six island - Seven island - Birth island - Navel rock - Faraway island - Hoenn Battle Frontier Added missing encounters: - Deoxis in Birth Island (FR LG & E) - Lugia and Ho-Oh in Navel Rock (FR LG & E) - Mew in Faraway island (E) - Sudowoodo in Johto Route 36 (G S C HG & SS) - Sudowoodo in Hoenn Battle Frontier (E) --- data/v2/csv/encounter_method_prose.csv | 2 ++ data/v2/csv/encounter_methods.csv | 2 ++ data/v2/csv/encounter_slots.csv | 4 ++++ data/v2/csv/encounters.csv | 16 ++++++++++++++++ data/v2/csv/location_area_prose.csv | 3 +++ data/v2/csv/location_areas.csv | 4 ++++ data/v2/csv/location_names.csv | 9 +++++++++ data/v2/csv/locations.csv | 9 +++++++++ 8 files changed, 49 insertions(+) diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index 2ead64df..041f915b 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -40,3 +40,5 @@ encounter_method_id,local_language_id,name 22,9,Headbutting a low encounter rate tree 23,9,Headbutting a normal encounter rate tree 24,9,Headbutting a high encounter rate tree +25,9,Using the Squirt Bottle on a Sudowoodo +26,9,Using the Wailmer Pail on a Sudowoodo diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index 76f597fd..8510d441 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -23,3 +23,5 @@ id,identifier,order 22,headbutt-low,22 23,headbutt-normal,23 24,headbutt-high,24 +25,squirt-bottle,25 +26,wailmer-pail,26 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 023fe190..78a73111 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -631,3 +631,7 @@ id,version_group_id,encounter_method_id,slot,rarity 630,4,24,4,10 631,4,24,5,5 632,4,24,6,5 +633,3,25,,100 +634,4,25,,100 +635,10,25,,100 +636,6,26,,100 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 5c6abea0..19de89b4 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -55576,3 +55576,19 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 59286,7,804,565,384,70,70 59287,8,804,565,384,70,70 59288,9,804,566,384,70,70 +59289,4,209,633,185,20,20 +59290,5,209,633,185,20,20 +59291,6,209,634,185,20,20 +59292,15,209,635,185,20,20 +59293,16,209,635,185,20,20 +59294,9,809,636,185,40,40 +59295,9,807,566,249,70,70 +59296,9,807,566,250,70,70 +59297,10,807,567,249,70,70 +59298,10,807,567,250,70,70 +59299,11,807,567,249,70,70 +59300,11,807,567,250,70,70 +59301,10,806,567,386,30,30 +59302,11,806,567,386,30,30 +59303,9,806,566,386,30,30 +59304,9,808,566,151,30,30 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 832039ba..098b4834 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -662,3 +662,6 @@ location_area_id,local_language_id,name 803,9,Marine Cave 804,9,Sky Pillar Apex 805,9,Bell Tower 1F +806,9,Birth Island +807,9,Navel Rock +808,9,Faraway Island diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 855778c0..efaee7c0 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -694,3 +694,7 @@ id,location_id,game_index,identifier 803,804,0,area 804,448,0,apex 805,139,0,1f +806,810,0,area +807,811,0,area +808,812,0,area +809,813,0,area diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv index a58e1ce2..c07954c8 100644 --- a/data/v2/csv/location_names.csv +++ b/data/v2/csv/location_names.csv @@ -3582,3 +3582,12 @@ location_id,local_language_id,name,subtitle 802,9,Roaming Sinnoh, 803,9,Terra Cave, 804,9,Marine Cave, +805,9,Two Island, +806,9,Three Island, +80,9,Three Isle Path, +808,9,Six Island, +809,9,Seven Island, +810,9,Birth Island, +811,9,Navel Rock, +812,9,Faraway Island, +813,9,Hoenn Battle Frontier, diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index deb6dd48..323c0087 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -786,3 +786,12 @@ id,region_id,identifier 802,4,roaming-sinnoh 803,3,terra-cave 804,3,marine-cave +805,1,two-island +806,1,three-island +807,1,three-isle-path +808,1,six-island +809,1,seven-island +810,1,birth-island +811,1,navel-rock +812,3,faraway-island +813,3,hoenn-battle-frontier From 0e98f900515a7a73306914e7328660b98d0d8098 Mon Sep 17 00:00:00 2001 From: SimplyBLGDev Date: Sun, 14 Mar 2021 18:49:24 -0300 Subject: [PATCH 017/113] Add missing encounters underwater, regies - Replaced the encounter method on the underwater encounters in RSE from 'surf' to 'seaweed' - Added missing location areas for island cave, desert ruins and ancient tomb - Added missing encounters for the legendary regies (Regirock, Regice and Registeel) - Added missing encounters for Latios and Latias at Southern Island --- data/v2/csv/encounter_method_prose.csv | 1 + data/v2/csv/encounter_methods.csv | 1 + data/v2/csv/encounter_slots.csv | 10 ++++ data/v2/csv/encounters.csv | 73 +++++++++++++++----------- data/v2/csv/location_area_prose.csv | 4 ++ data/v2/csv/location_areas.csv | 3 ++ 6 files changed, 62 insertions(+), 30 deletions(-) diff --git a/data/v2/csv/encounter_method_prose.csv b/data/v2/csv/encounter_method_prose.csv index 041f915b..8549b8bd 100644 --- a/data/v2/csv/encounter_method_prose.csv +++ b/data/v2/csv/encounter_method_prose.csv @@ -42,3 +42,4 @@ encounter_method_id,local_language_id,name 24,9,Headbutting a high encounter rate tree 25,9,Using the Squirt Bottle on a Sudowoodo 26,9,Using the Wailmer Pail on a Sudowoodo +27,9,Surfing on seaweed diff --git a/data/v2/csv/encounter_methods.csv b/data/v2/csv/encounter_methods.csv index 8510d441..1322a72a 100644 --- a/data/v2/csv/encounter_methods.csv +++ b/data/v2/csv/encounter_methods.csv @@ -25,3 +25,4 @@ id,identifier,order 24,headbutt-high,24 25,squirt-bottle,25 26,wailmer-pail,26 +27,seaweed,27 diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index 78a73111..6c52a64a 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -635,3 +635,13 @@ id,version_group_id,encounter_method_id,slot,rarity 634,4,25,,100 635,10,25,,100 636,6,26,,100 +637,5,27,1,60 +638,5,27,2,30 +639,5,27,3,5 +640,5,27,4,4 +641,5,27,5,1 +642,6,27,1,60 +643,6,27,2,30 +644,6,27,3,5 +645,6,27,4,4 +646,6,27,5,1 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 19de89b4..c308133c 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -24118,11 +24118,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 27828,7,416,167,278,15,25 27829,7,416,168,279,25,30 27830,7,416,169,279,25,30 -27831,7,417,165,366,20,30 -27832,7,417,166,170,20,30 -27833,7,417,167,366,30,35 -27834,7,417,168,369,30,35 -27835,7,417,169,369,30,35 +27831,7,417,637,366,20,30 +27832,7,417,638,170,20,30 +27833,7,417,639,366,30,35 +27834,7,417,640,369,30,35 +27835,7,417,641,369,30,35 27836,7,418,155,129,10,30 27837,7,418,156,72,10,30 27838,7,418,157,320,10,30 @@ -24153,11 +24153,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 27863,7,419,167,278,15,25 27864,7,419,168,279,25,30 27865,7,419,169,279,25,30 -27866,7,420,165,366,20,30 -27867,7,420,166,170,20,30 -27868,7,420,167,366,30,35 -27869,7,420,168,369,30,35 -27870,7,420,169,369,30,35 +27866,7,420,637,366,20,30 +27867,7,420,638,170,20,30 +27868,7,420,639,366,30,35 +27869,7,420,640,369,30,35 +27870,7,420,641,369,30,35 27871,7,421,155,129,10,30 27872,7,421,156,72,10,30 27873,7,421,157,320,10,30 @@ -25569,11 +25569,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 29279,8,416,167,278,15,25 29280,8,416,168,279,25,30 29281,8,416,169,279,25,30 -29282,8,417,165,366,20,30 -29283,8,417,166,170,20,30 -29284,8,417,167,366,30,35 -29285,8,417,168,369,30,35 -29286,8,417,169,369,30,35 +29282,8,417,637,366,20,30 +29283,8,417,638,170,20,30 +29284,8,417,639,366,30,35 +29285,8,417,640,369,30,35 +29286,8,417,641,369,30,35 29287,8,418,155,129,10,30 29288,8,418,156,72,10,30 29289,8,418,157,320,10,30 @@ -25604,11 +25604,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 29314,8,419,167,278,15,25 29315,8,419,168,279,25,30 29316,8,419,169,279,25,30 -29317,8,420,165,366,20,30 -29318,8,420,166,170,20,30 -29319,8,420,167,366,30,35 -29320,8,420,168,369,30,35 -29321,8,420,169,369,30,35 +29317,8,420,637,366,20,30 +29318,8,420,638,170,20,30 +29319,8,420,639,366,30,35 +29320,8,420,640,369,30,35 +29321,8,420,641,369,30,35 29322,8,421,155,129,10,30 29323,8,421,156,72,10,30 29324,8,421,157,320,10,30 @@ -26158,11 +26158,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 29868,9,416,211,278,15,25 29869,9,416,212,279,25,30 29870,9,416,213,279,25,30 -29871,9,417,209,366,20,30 -29872,9,417,210,170,20,30 -29873,9,417,211,366,30,35 -29874,9,417,212,369,30,35 -29875,9,417,213,369,30,35 +29871,9,417,642,366,20,30 +29872,9,417,643,170,20,30 +29873,9,417,644,366,30,35 +29874,9,417,645,369,30,35 +29875,9,417,646,369,30,35 29876,9,365,187,261,5,5 29877,9,365,188,265,5,5 29878,9,365,189,285,5,5 @@ -26519,11 +26519,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 30229,9,436,196,241,37,37 30230,9,436,197,228,39,39 30231,9,436,198,241,40,40 -30232,9,420,209,366,20,30 -30233,9,420,210,170,20,30 -30234,9,420,211,366,30,35 -30235,9,420,212,369,30,35 -30236,9,420,213,369,30,35 +30232,9,420,642,366,20,30 +30233,9,420,643,170,20,30 +30234,9,420,644,366,30,35 +30235,9,420,645,369,30,35 +30236,9,420,646,369,30,35 30237,9,419,199,129,10,30 30238,9,419,200,72,10,30 30239,9,419,201,320,10,30 @@ -55592,3 +55592,16 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 59302,11,806,567,386,30,30 59303,9,806,566,386,30,30 59304,9,808,566,151,30,30 +59305,7,810,565,377,40,40 +59306,7,811,565,378,40,40 +59307,7,812,565,379,40,40 +59308,8,810,565,377,40,40 +59309,8,811,565,378,40,40 +59310,8,812,565,379,40,40 +59311,9,810,566,377,40,40 +59312,9,811,566,378,40,40 +59313,9,812,566,379,40,40 +59314,7,785,565,380,50,50 +59315,8,785,565,381,50,50 +59316,9,785,566,380,50,50 +59317,9,785,566,381,50,50 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 098b4834..24ba3158 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -665,3 +665,7 @@ location_area_id,local_language_id,name 806,9,Birth Island 807,9,Navel Rock 808,9,Faraway Island +809,9,Hoenn Battle Frontier +810,9,Desert Ruins +811,9,Island Cave +812,9,Ancient Tomb diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index efaee7c0..fe6b80da 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -698,3 +698,6 @@ id,location_id,game_index,identifier 807,811,0,area 808,812,0,area 809,813,0,area +810,582,0,area +811,581,0,area +812,583,0,area From a59b1e0ef2983f8a11e0cdb8853d7d617ae28191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 19 Mar 2021 19:07:01 +0100 Subject: [PATCH 018/113] ignore secrets --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f909a3f2..f4561112 100755 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ db.* venv* node_modules .vscode +.env \ No newline at end of file From 875f0652750d94542b128c780570b1db7cb7f198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 19 Mar 2021 19:09:59 +0100 Subject: [PATCH 019/113] feat: add graphiql --- Makefile | 16 +++- .../compose/docker-compose-prod-graphql.yml | 31 ++++++++ Resources/docker/web/Dockerfile | 2 - Resources/nginx/nginx.conf | 75 +++++++++++++++++-- config/docker-compose.py | 5 +- docker-compose.yml | 11 +-- 6 files changed, 119 insertions(+), 21 deletions(-) create mode 100644 Resources/compose/docker-compose-prod-graphql.yml delete mode 100644 Resources/docker/web/Dockerfile diff --git a/Makefile b/Makefile index a8c433f4..77402432 100755 --- a/Makefile +++ b/Makefile @@ -1,8 +1,10 @@ veekun_pokedex_repository = ../pokedex local_config = --settings=config.local docker_config = --settings=config.docker-compose +HASURA_GRAPHQL_ADMIN_SECRET=pokemon .PHONY: help +.SILENT: help: @grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @@ -81,14 +83,20 @@ pull-veekun: git -C ${veekun_pokedex_repository} checkout master-pokeapi git -C ${veekun_pokedex_repository} pull -sync-from-veekun: pull pull-veekun # Copy data from ../pokedex to this repository +sync-from-veekun: pull pull-veekun # Copy data from ../pokedex to this repository cp -a ${veekun_pokedex_repository}/pokedex/data/csv/. ./data/v2/csv -sync-to-veekun: pull pull-veekun # Copy data from this repository to ../pokedex +sync-to-veekun: pull pull-veekun # Copy data from this repository to ../pokedex cp -a ./data/v2/csv/. ${veekun_pokedex_repository}/pokedex/data/csv +read-env-file: # Exports ./.env into shell environment variables + export `egrep -v '^#' .env | xargs` + hasura-export: # Export Hasura configuration - hasura md export --project hasura --admin-secret pokemon + hasura md export --project hasura --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET} hasura-apply: # Apply local Hasura configuration - hasura md apply --project hasura --admin-secret pokemon + hasura md apply --project hasura --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET} + +hasura-get-anon-schema: # Dumps GraphQL schema + gq http://localhost:8080/v1/graphql --introspect > hasura/schema.graphql diff --git a/Resources/compose/docker-compose-prod-graphql.yml b/Resources/compose/docker-compose-prod-graphql.yml new file mode 100644 index 00000000..b7eef5fd --- /dev/null +++ b/Resources/compose/docker-compose-prod-graphql.yml @@ -0,0 +1,31 @@ +version: '2.4' +services: + db: + environment: + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_USER: "${POSTGRES_USER}" + + app: + env_file: .env + + web: + volumes: + - graphiql:/public-console:ro + + graphql-engine: + environment: + HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/pokeapi" + HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" + + graphiql: + image: pokeapi/graphiql:1.0.0 + command: sh -c 'cp -a /app/static/. /transfer/ && tail -f /etc/passwd' + volumes: + - graphiql:/transfer + depends_on: + - graphql-engine + +volumes: + graphiql: + +# docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-graphql.yml up diff --git a/Resources/docker/web/Dockerfile b/Resources/docker/web/Dockerfile deleted file mode 100644 index 3b701f42..00000000 --- a/Resources/docker/web/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM nginx:alpine -COPY ./nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/Resources/nginx/nginx.conf b/Resources/nginx/nginx.conf index 96052237..e91b490d 100644 --- a/Resources/nginx/nginx.conf +++ b/Resources/nginx/nginx.conf @@ -38,6 +38,23 @@ http { server app:8000 fail_timeout=0; } + upstream graphql_upstream { + server graphql-engine:8080 fail_timeout=0; + } + + geo $limit { + default 1; + 10.0.0.0/8 0; + 192.168.0.0/24 0; + } + + map $limit $limit_key { + 0 ""; + 1 $binary_remote_addr; + } + + limit_req_zone $limit_key zone=graphqlDefaultLimit:50m rate=1r/m; + server { listen 80 deferred; server_name _; @@ -47,6 +64,48 @@ http { root /code; + + # Admin console + location /graphql/admin/ { + expires 1m; # client-side caching, one minute for each API resource + add_header Cache-Control "public"; + add_header Pragma public; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + proxy_redirect off; + + proxy_pass http://graphql_upstream/; + } + + location /graphql/console { + alias /public-console/; + index index.html; + try_files $uri $uri/ /index.html =405; + } + + location /graphql/v1beta { + limit_req zone=graphqlDefaultLimit burst=100 nodelay; + limit_req_status 429; + expires 1m; # client-side caching, one minute for each API resource + add_header Cache-Control "public"; + add_header Pragma public; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + proxy_redirect off; + + proxy_pass http://graphql_upstream/v1/graphql; + } + location /media/ { root /code; autoindex off; @@ -57,14 +116,6 @@ http { autoindex off; } - location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ { # cache all these extensions for 5 days, disable logging - access_log off; - log_not_found off; - expires 5d; - add_header Cache-Control "public"; - add_header Pragma public; - } - location /api/ { expires 1m; # client-side caching, one minute for each API resource add_header Cache-Control "public"; @@ -79,6 +130,14 @@ http { proxy_pass http://pokeapi_upstream; } + # location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ { # cache all these extensions for 5 days, disable logging + # access_log off; + # log_not_found off; + # expires 5d; + # add_header Cache-Control "public"; + # add_header Pragma public; + # } + location / { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/config/docker-compose.py b/config/docker-compose.py index 824ea030..e33a2394 100644 --- a/config/docker-compose.py +++ b/config/docker-compose.py @@ -1,12 +1,13 @@ # Docker settings +import os from .settings import * DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql_psycopg2", "NAME": "pokeapi", - "USER": "ash", - "PASSWORD": "pokemon", + "USER": os.environ.get("POSTGRES_USER", "ash"), + "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "pokemon"), "HOST": "db", "PORT": 5432, } diff --git a/docker-compose.yml b/docker-compose.yml index a1fb2307..baf916f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,20 +31,21 @@ services: restart: always web: - build: - context: ./Resources - dockerfile: ./docker/web/Dockerfile + image: nginx:alpine ports: - "80:80" - "443:443" restart: always + command: [nginx-debug, '-g', 'daemon off;'] + volumes: + - ./Resources/nginx/nginx.conf:/etc/nginx/nginx.conf:ro volumes_from: - app:ro links: - app graphql-engine: - image: hasura/graphql-engine:v2.0.0-alpha.3 + image: hasura/graphql-engine:v2.0.0-alpha.5 ports: - "8080:8080" depends_on: @@ -58,7 +59,7 @@ services: HASURA_GRAPHQL_ADMIN_SECRET: pokemon HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anon HASURA_GRAPHQL_ENABLE_TELEMETRY: "false" - HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets + # HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets volumes: pg_data: From 4d355f75197ab9b931045211f047ae03821a9a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 19 Mar 2021 19:10:13 +0100 Subject: [PATCH 020/113] docs: add examples --- hasura/examples/alola_road_encounters.gql | 8 +- hasura/examples/best_poison_grass_pokemon.gql | 31 +++++ hasura/examples/gen3_species.gql | 17 +++ hasura/examples/package.json | 14 +++ hasura/examples/pokemon.gql | 65 ---------- hasura/examples/pokemon.js | 116 ++++++++++++++++++ 6 files changed, 185 insertions(+), 66 deletions(-) create mode 100644 hasura/examples/best_poison_grass_pokemon.gql create mode 100644 hasura/examples/gen3_species.gql create mode 100644 hasura/examples/package.json delete mode 100644 hasura/examples/pokemon.gql create mode 100644 hasura/examples/pokemon.js diff --git a/hasura/examples/alola_road_encounters.gql b/hasura/examples/alola_road_encounters.gql index 500c5815..b98b1f9d 100644 --- a/hasura/examples/alola_road_encounters.gql +++ b/hasura/examples/alola_road_encounters.gql @@ -1,3 +1,10 @@ +""" +Variables: +{ + "region": "alola" +} +""" + query location_evolutions_in_alola($region: String) { region: pokemon_v2_region(where: {name: {_eq: $region}}) { name @@ -15,4 +22,3 @@ query location_evolutions_in_alola($region: String) { } } } - diff --git a/hasura/examples/best_poison_grass_pokemon.gql b/hasura/examples/best_poison_grass_pokemon.gql new file mode 100644 index 00000000..93fbb1a8 --- /dev/null +++ b/hasura/examples/best_poison_grass_pokemon.gql @@ -0,0 +1,31 @@ +query best_grass_poison_pokemons { + pokemon: pokemon_v2_pokemon( + where: { + _and: [ + { + pokemon_v2_pokemontypes: { + pokemon_v2_type: { name: { _eq: "grass" } } + } + } + { + pokemon_v2_pokemontypes: { + pokemon_v2_type: { name: { _eq: "poison" } } + } + } + ] + } + order_by: { + pokemon_v2_pokemonstats_aggregate: { sum: { base_stat: desc } } + } + limit: 3 + ) { + name + stats: pokemon_v2_pokemonstats_aggregate(order_by: {}) { + aggregate { + sum { + base_stat + } + } + } + } +} diff --git a/hasura/examples/gen3_species.gql b/hasura/examples/gen3_species.gql new file mode 100644 index 00000000..bdf45037 --- /dev/null +++ b/hasura/examples/gen3_species.gql @@ -0,0 +1,17 @@ +query samplePokeAPIquery { + # Gets all the pokemon belonging to generation 3 + gen3_species: pokemon_v2_pokemonspecies(where: {pokemon_v2_generation: {name: {_eq: "generation-iii"}}}, order_by: {id: asc}) { + name + id + } + # You can run multiple queries at the same time + # Counts how many pokemon where release for each generation + generations: pokemon_v2_generation { + name + pokemon_species: pokemon_v2_pokemonspecies_aggregate { + aggregate { + count + } + } + } +} diff --git a/hasura/examples/package.json b/hasura/examples/package.json new file mode 100644 index 00000000..de79a9b5 --- /dev/null +++ b/hasura/examples/package.json @@ -0,0 +1,14 @@ +{ + "name": "examples", + "version": "1.0.0", + "description": "", + "main": "''", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "node-fetch": "^2.6.1" + } +} diff --git a/hasura/examples/pokemon.gql b/hasura/examples/pokemon.gql deleted file mode 100644 index ee95d261..00000000 --- a/hasura/examples/pokemon.gql +++ /dev/null @@ -1,65 +0,0 @@ - -query pokemon_details { - species: pokemon_v2_pokemonspecies(where: {name: {_eq: "staryu"}}) { - name - base_happiness - is_legendary - is_mythical - generation: pokemon_v2_generation { - name - } - habitat: pokemon_v2_pokemonhabitat { - name - } - pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { - nodes { - height - name - id - weight - abilities: pokemon_v2_pokemonabilities_aggregate { - nodes { - ability: pokemon_v2_ability { - name - } - } - } - stats: pokemon_v2_pokemonstats { - base_stat - stat: pokemon_v2_stat { - name - } - } - types: pokemon_v2_pokemontypes { - slot - type: pokemon_v2_type { - name - } - } - levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { - nodes { - move: pokemon_v2_move { - name - } - level - } - } - pokemon_v2_encounters_aggregate { - aggregate { - count - } - } - pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { - pokemon_v2_item { - name - cost - } - rarity - } - } - } - flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { - flavor_text - } - } -} \ No newline at end of file diff --git a/hasura/examples/pokemon.js b/hasura/examples/pokemon.js new file mode 100644 index 00000000..1fc7713d --- /dev/null +++ b/hasura/examples/pokemon.js @@ -0,0 +1,116 @@ +/* +This is an example snippet - you should consider tailoring it +to your service. +*/ +/* +Add these to your `package.json`: + "node-fetch": "^2.5.0" +*/ + +// Node doesn't implement fetch so we have to import it +const fetch =require("node-fetch"); + +async function fetchGraphQL(operationsDoc, operationName, variables) { + const result = await fetch( + "http://localhost:80/graphql/v1beta", + { + method: "POST", + body: JSON.stringify({ + query: operationsDoc, + variables: variables, + operationName: operationName + }) + } + ); + + return await result.json(); +} + +const operationsDoc = ` + query pokemon_details { + species: pokemon_v2_pokemonspecies(where: {name: {_eq: "staryu"}}) { + name + base_happiness + is_legendary + is_mythical + generation: pokemon_v2_generation { + name + } + habitat: pokemon_v2_pokemonhabitat { + name + } + pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { + nodes { + height + name + id + weight + abilities: pokemon_v2_pokemonabilities_aggregate { + nodes { + ability: pokemon_v2_ability { + name + } + } + } + stats: pokemon_v2_pokemonstats { + base_stat + stat: pokemon_v2_stat { + name + } + } + types: pokemon_v2_pokemontypes { + slot + type: pokemon_v2_type { + name + } + } + levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { + nodes { + move: pokemon_v2_move { + name + } + level + } + } + pokemon_v2_encounters_aggregate { + aggregate { + count + } + } + pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { + pokemon_v2_item { + name + cost + } + rarity + } + } + } + flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { + flavor_text + } + } + } +`; + +function fetchPokemon_details() { + return fetchGraphQL( + operationsDoc, + "pokemon_details", + {} + ); +} + +async function startFetchPokemon_details() { + const { errors, data } = await fetchPokemon_details(); + + if (errors) { + // handle those errors like a pro + console.error(errors); + } + + // do something great with this precious data + console.log(data); +} + +startFetchPokemon_details(); \ No newline at end of file From 1995abb2d1d3948e2eae307fad51f434ddfa7ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 19 Mar 2021 19:53:00 +0100 Subject: [PATCH 021/113] fix: lower version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index baf916f2..81667f8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,7 +45,7 @@ services: - app graphql-engine: - image: hasura/graphql-engine:v2.0.0-alpha.5 + image: hasura/graphql-engine:v2.0.0-alpha.4 ports: - "8080:8080" depends_on: From c27585db896605f38557c7fbe5840dda742c806a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 19 Mar 2021 19:53:12 +0100 Subject: [PATCH 022/113] fix: allow all hosts --- config/docker-compose.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/docker-compose.py b/config/docker-compose.py index e33a2394..23659e70 100644 --- a/config/docker-compose.py +++ b/config/docker-compose.py @@ -26,3 +26,5 @@ CACHES = { DEBUG = False TASTYPIE_FULL_DEBUG = False + +ALLOWED_HOSTS = ["*"] \ No newline at end of file From ef6f7db539220ce7061db7dc51277f99dc6f5b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 19 Mar 2021 20:05:08 +0100 Subject: [PATCH 023/113] feat: update hasura --- docker-compose.yml | 2 +- hasura/metadata/databases/databases.yaml | 155 +----------------- .../default/functions/functions.yaml | 1 + .../tables/public_pokemon_v2_ability.yaml | 2 +- .../public_pokemon_v2_abilitychange.yaml | 2 +- ...ic_pokemon_v2_abilitychangeeffecttext.yaml | 2 +- .../public_pokemon_v2_abilityeffecttext.yaml | 2 +- .../public_pokemon_v2_abilityflavortext.yaml | 2 +- .../tables/public_pokemon_v2_abilityname.yaml | 2 +- .../tables/public_pokemon_v2_berry.yaml | 2 +- .../public_pokemon_v2_berryfirmness.yaml | 2 +- .../public_pokemon_v2_berryfirmnessname.yaml | 2 +- .../tables/public_pokemon_v2_berryflavor.yaml | 2 +- .../public_pokemon_v2_berryflavormap.yaml | 2 +- .../public_pokemon_v2_berryflavorname.yaml | 2 +- .../public_pokemon_v2_characteristic.yaml | 2 +- ..._pokemon_v2_characteristicdescription.yaml | 2 +- .../public_pokemon_v2_contestcombo.yaml | 2 +- .../public_pokemon_v2_contesteffect.yaml | 2 +- ...ic_pokemon_v2_contesteffecteffecttext.yaml | 2 +- ...ic_pokemon_v2_contesteffectflavortext.yaml | 2 +- .../tables/public_pokemon_v2_contesttype.yaml | 2 +- .../public_pokemon_v2_contesttypename.yaml | 2 +- .../tables/public_pokemon_v2_egggroup.yaml | 2 +- .../public_pokemon_v2_egggroupname.yaml | 2 +- .../tables/public_pokemon_v2_encounter.yaml | 2 +- .../public_pokemon_v2_encountercondition.yaml | 2 +- ...lic_pokemon_v2_encounterconditionname.yaml | 2 +- ...ic_pokemon_v2_encounterconditionvalue.yaml | 2 +- ...pokemon_v2_encounterconditionvaluemap.yaml | 2 +- ...okemon_v2_encounterconditionvaluename.yaml | 2 +- .../public_pokemon_v2_encountermethod.yaml | 2 +- ...public_pokemon_v2_encountermethodname.yaml | 2 +- .../public_pokemon_v2_encounterslot.yaml | 2 +- .../public_pokemon_v2_evolutionchain.yaml | 2 +- .../public_pokemon_v2_evolutiontrigger.yaml | 2 +- ...ublic_pokemon_v2_evolutiontriggername.yaml | 2 +- .../tables/public_pokemon_v2_experience.yaml | 2 +- .../tables/public_pokemon_v2_gender.yaml | 2 +- .../tables/public_pokemon_v2_generation.yaml | 2 +- .../public_pokemon_v2_generationname.yaml | 2 +- .../tables/public_pokemon_v2_growthrate.yaml | 2 +- ...blic_pokemon_v2_growthratedescription.yaml | 2 +- .../tables/public_pokemon_v2_item.yaml | 2 +- .../public_pokemon_v2_itemattribute.yaml | 2 +- ...c_pokemon_v2_itemattributedescription.yaml | 2 +- .../public_pokemon_v2_itemattributemap.yaml | 2 +- .../public_pokemon_v2_itemattributename.yaml | 2 +- .../public_pokemon_v2_itemcategory.yaml | 2 +- .../public_pokemon_v2_itemcategoryname.yaml | 2 +- .../public_pokemon_v2_itemeffecttext.yaml | 2 +- .../public_pokemon_v2_itemflavortext.yaml | 2 +- .../public_pokemon_v2_itemflingeffect.yaml | 2 +- ..._pokemon_v2_itemflingeffecteffecttext.yaml | 2 +- .../public_pokemon_v2_itemgameindex.yaml | 2 +- .../tables/public_pokemon_v2_itemname.yaml | 2 +- .../tables/public_pokemon_v2_itempocket.yaml | 2 +- .../public_pokemon_v2_itempocketname.yaml | 2 +- .../tables/public_pokemon_v2_itemsprites.yaml | 2 +- .../tables/public_pokemon_v2_language.yaml | 2 +- .../public_pokemon_v2_languagename.yaml | 2 +- .../tables/public_pokemon_v2_location.yaml | 2 +- .../public_pokemon_v2_locationarea.yaml | 2 +- ..._pokemon_v2_locationareaencounterrate.yaml | 2 +- .../public_pokemon_v2_locationareaname.yaml | 2 +- .../public_pokemon_v2_locationgameindex.yaml | 2 +- .../public_pokemon_v2_locationname.yaml | 2 +- .../tables/public_pokemon_v2_machine.yaml | 2 +- .../tables/public_pokemon_v2_move.yaml | 2 +- .../public_pokemon_v2_moveattribute.yaml | 2 +- ...c_pokemon_v2_moveattributedescription.yaml | 2 +- .../public_pokemon_v2_moveattributemap.yaml | 2 +- .../public_pokemon_v2_moveattributename.yaml | 2 +- .../public_pokemon_v2_movebattlestyle.yaml | 2 +- ...public_pokemon_v2_movebattlestylename.yaml | 2 +- .../tables/public_pokemon_v2_movechange.yaml | 2 +- .../public_pokemon_v2_movedamageclass.yaml | 2 +- ...pokemon_v2_movedamageclassdescription.yaml | 2 +- ...public_pokemon_v2_movedamageclassname.yaml | 2 +- .../tables/public_pokemon_v2_moveeffect.yaml | 2 +- .../public_pokemon_v2_moveeffectchange.yaml | 2 +- ...pokemon_v2_moveeffectchangeeffecttext.yaml | 2 +- ...ublic_pokemon_v2_moveeffecteffecttext.yaml | 2 +- .../public_pokemon_v2_moveflavortext.yaml | 2 +- .../public_pokemon_v2_movelearnmethod.yaml | 2 +- ...pokemon_v2_movelearnmethoddescription.yaml | 2 +- ...public_pokemon_v2_movelearnmethodname.yaml | 2 +- .../tables/public_pokemon_v2_movemeta.yaml | 2 +- .../public_pokemon_v2_movemetaailment.yaml | 2 +- ...public_pokemon_v2_movemetaailmentname.yaml | 2 +- .../public_pokemon_v2_movemetacategory.yaml | 2 +- ...okemon_v2_movemetacategorydescription.yaml | 2 +- .../public_pokemon_v2_movemetastatchange.yaml | 2 +- .../tables/public_pokemon_v2_movename.yaml | 2 +- .../tables/public_pokemon_v2_movetarget.yaml | 2 +- ...blic_pokemon_v2_movetargetdescription.yaml | 2 +- .../public_pokemon_v2_movetargetname.yaml | 2 +- .../tables/public_pokemon_v2_nature.yaml | 2 +- ...okemon_v2_naturebattlestylepreference.yaml | 2 +- .../tables/public_pokemon_v2_naturename.yaml | 2 +- ...ublic_pokemon_v2_naturepokeathlonstat.yaml | 2 +- .../tables/public_pokemon_v2_palpark.yaml | 2 +- .../tables/public_pokemon_v2_palparkarea.yaml | 2 +- .../public_pokemon_v2_palparkareaname.yaml | 2 +- .../public_pokemon_v2_pokeathlonstat.yaml | 2 +- .../public_pokemon_v2_pokeathlonstatname.yaml | 2 +- .../tables/public_pokemon_v2_pokedex.yaml | 2 +- .../public_pokemon_v2_pokedexdescription.yaml | 2 +- .../tables/public_pokemon_v2_pokedexname.yaml | 2 +- ...public_pokemon_v2_pokedexversiongroup.yaml | 2 +- .../tables/public_pokemon_v2_pokemon.yaml | 2 +- .../public_pokemon_v2_pokemonability.yaml | 2 +- .../public_pokemon_v2_pokemoncolor.yaml | 2 +- .../public_pokemon_v2_pokemoncolorname.yaml | 2 +- .../public_pokemon_v2_pokemondexnumber.yaml | 2 +- .../public_pokemon_v2_pokemonegggroup.yaml | 2 +- .../public_pokemon_v2_pokemonevolution.yaml | 2 +- .../tables/public_pokemon_v2_pokemonform.yaml | 2 +- ...blic_pokemon_v2_pokemonformgeneration.yaml | 2 +- .../public_pokemon_v2_pokemonformname.yaml | 2 +- .../public_pokemon_v2_pokemonformsprites.yaml | 2 +- .../public_pokemon_v2_pokemonformtype.yaml | 2 +- .../public_pokemon_v2_pokemongameindex.yaml | 2 +- .../public_pokemon_v2_pokemonhabitat.yaml | 2 +- .../public_pokemon_v2_pokemonhabitatname.yaml | 2 +- .../tables/public_pokemon_v2_pokemonitem.yaml | 2 +- .../tables/public_pokemon_v2_pokemonmove.yaml | 2 +- .../public_pokemon_v2_pokemonshape.yaml | 2 +- .../public_pokemon_v2_pokemonshapename.yaml | 2 +- .../public_pokemon_v2_pokemonspecies.yaml | 2 +- ..._pokemon_v2_pokemonspeciesdescription.yaml | 2 +- ...c_pokemon_v2_pokemonspeciesflavortext.yaml | 2 +- .../public_pokemon_v2_pokemonspeciesname.yaml | 2 +- .../public_pokemon_v2_pokemonsprites.yaml | 2 +- .../tables/public_pokemon_v2_pokemonstat.yaml | 2 +- .../tables/public_pokemon_v2_pokemontype.yaml | 2 +- .../public_pokemon_v2_pokemontypepast.yaml | 2 +- .../tables/public_pokemon_v2_region.yaml | 2 +- .../tables/public_pokemon_v2_regionname.yaml | 2 +- .../tables/public_pokemon_v2_stat.yaml | 2 +- .../tables/public_pokemon_v2_statname.yaml | 2 +- .../public_pokemon_v2_supercontestcombo.yaml | 2 +- .../public_pokemon_v2_supercontesteffect.yaml | 2 +- ...kemon_v2_supercontesteffectflavortext.yaml | 2 +- .../tables/public_pokemon_v2_type.yaml | 2 +- .../public_pokemon_v2_typeefficacy.yaml | 2 +- .../public_pokemon_v2_typegameindex.yaml | 2 +- .../tables/public_pokemon_v2_typename.yaml | 2 +- .../tables/public_pokemon_v2_version.yaml | 2 +- .../public_pokemon_v2_versiongroup.yaml | 2 +- ...okemon_v2_versiongroupmovelearnmethod.yaml | 2 +- .../public_pokemon_v2_versiongroupregion.yaml | 2 +- .../tables/public_pokemon_v2_versionname.yaml | 2 +- .../databases/default/tables/tables.yaml | 150 +++++++++++++++++ hasura/metadata/inherited_roles.yaml | 1 + hasura/metadata/rest_endpoints.yaml | 1 + 156 files changed, 307 insertions(+), 303 deletions(-) create mode 100644 hasura/metadata/databases/default/functions/functions.yaml create mode 100644 hasura/metadata/databases/default/tables/tables.yaml create mode 100644 hasura/metadata/inherited_roles.yaml create mode 100644 hasura/metadata/rest_endpoints.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 81667f8f..baf916f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,7 +45,7 @@ services: - app graphql-engine: - image: hasura/graphql-engine:v2.0.0-alpha.4 + image: hasura/graphql-engine:v2.0.0-alpha.5 ports: - "8080:8080" depends_on: diff --git a/hasura/metadata/databases/databases.yaml b/hasura/metadata/databases/databases.yaml index 4e5f99cf..c9409ae7 100644 --- a/hasura/metadata/databases/databases.yaml +++ b/hasura/metadata/databases/databases.yaml @@ -1,4 +1,5 @@ - name: default + kind: postgres configuration: connection_info: database_url: @@ -7,155 +8,5 @@ idle_timeout: 180 max_connections: 50 retries: 1 - tables: - - "!include public_pokemon_v2_ability.yaml" - - "!include public_pokemon_v2_abilitychange.yaml" - - "!include public_pokemon_v2_abilitychangeeffecttext.yaml" - - "!include public_pokemon_v2_abilityeffecttext.yaml" - - "!include public_pokemon_v2_abilityflavortext.yaml" - - "!include public_pokemon_v2_abilityname.yaml" - - "!include public_pokemon_v2_berry.yaml" - - "!include public_pokemon_v2_berryfirmness.yaml" - - "!include public_pokemon_v2_berryfirmnessname.yaml" - - "!include public_pokemon_v2_berryflavor.yaml" - - "!include public_pokemon_v2_berryflavormap.yaml" - - "!include public_pokemon_v2_berryflavorname.yaml" - - "!include public_pokemon_v2_characteristic.yaml" - - "!include public_pokemon_v2_characteristicdescription.yaml" - - "!include public_pokemon_v2_contestcombo.yaml" - - "!include public_pokemon_v2_contesteffect.yaml" - - "!include public_pokemon_v2_contesteffecteffecttext.yaml" - - "!include public_pokemon_v2_contesteffectflavortext.yaml" - - "!include public_pokemon_v2_contesttype.yaml" - - "!include public_pokemon_v2_contesttypename.yaml" - - "!include public_pokemon_v2_egggroup.yaml" - - "!include public_pokemon_v2_egggroupname.yaml" - - "!include public_pokemon_v2_encounter.yaml" - - "!include public_pokemon_v2_encountercondition.yaml" - - "!include public_pokemon_v2_encounterconditionname.yaml" - - "!include public_pokemon_v2_encounterconditionvalue.yaml" - - "!include public_pokemon_v2_encounterconditionvaluemap.yaml" - - "!include public_pokemon_v2_encounterconditionvaluename.yaml" - - "!include public_pokemon_v2_encountermethod.yaml" - - "!include public_pokemon_v2_encountermethodname.yaml" - - "!include public_pokemon_v2_encounterslot.yaml" - - "!include public_pokemon_v2_evolutionchain.yaml" - - "!include public_pokemon_v2_evolutiontrigger.yaml" - - "!include public_pokemon_v2_evolutiontriggername.yaml" - - "!include public_pokemon_v2_experience.yaml" - - "!include public_pokemon_v2_gender.yaml" - - "!include public_pokemon_v2_generation.yaml" - - "!include public_pokemon_v2_generationname.yaml" - - "!include public_pokemon_v2_growthrate.yaml" - - "!include public_pokemon_v2_growthratedescription.yaml" - - "!include public_pokemon_v2_item.yaml" - - "!include public_pokemon_v2_itemattribute.yaml" - - "!include public_pokemon_v2_itemattributedescription.yaml" - - "!include public_pokemon_v2_itemattributemap.yaml" - - "!include public_pokemon_v2_itemattributename.yaml" - - "!include public_pokemon_v2_itemcategory.yaml" - - "!include public_pokemon_v2_itemcategoryname.yaml" - - "!include public_pokemon_v2_itemeffecttext.yaml" - - "!include public_pokemon_v2_itemflavortext.yaml" - - "!include public_pokemon_v2_itemflingeffect.yaml" - - "!include public_pokemon_v2_itemflingeffecteffecttext.yaml" - - "!include public_pokemon_v2_itemgameindex.yaml" - - "!include public_pokemon_v2_itemname.yaml" - - "!include public_pokemon_v2_itempocket.yaml" - - "!include public_pokemon_v2_itempocketname.yaml" - - "!include public_pokemon_v2_itemsprites.yaml" - - "!include public_pokemon_v2_language.yaml" - - "!include public_pokemon_v2_languagename.yaml" - - "!include public_pokemon_v2_location.yaml" - - "!include public_pokemon_v2_locationarea.yaml" - - "!include public_pokemon_v2_locationareaencounterrate.yaml" - - "!include public_pokemon_v2_locationareaname.yaml" - - "!include public_pokemon_v2_locationgameindex.yaml" - - "!include public_pokemon_v2_locationname.yaml" - - "!include public_pokemon_v2_machine.yaml" - - "!include public_pokemon_v2_move.yaml" - - "!include public_pokemon_v2_moveattribute.yaml" - - "!include public_pokemon_v2_moveattributedescription.yaml" - - "!include public_pokemon_v2_moveattributemap.yaml" - - "!include public_pokemon_v2_moveattributename.yaml" - - "!include public_pokemon_v2_movebattlestyle.yaml" - - "!include public_pokemon_v2_movebattlestylename.yaml" - - "!include public_pokemon_v2_movechange.yaml" - - "!include public_pokemon_v2_movedamageclass.yaml" - - "!include public_pokemon_v2_movedamageclassdescription.yaml" - - "!include public_pokemon_v2_movedamageclassname.yaml" - - "!include public_pokemon_v2_moveeffect.yaml" - - "!include public_pokemon_v2_moveeffectchange.yaml" - - "!include public_pokemon_v2_moveeffectchangeeffecttext.yaml" - - "!include public_pokemon_v2_moveeffecteffecttext.yaml" - - "!include public_pokemon_v2_moveflavortext.yaml" - - "!include public_pokemon_v2_movelearnmethod.yaml" - - "!include public_pokemon_v2_movelearnmethoddescription.yaml" - - "!include public_pokemon_v2_movelearnmethodname.yaml" - - "!include public_pokemon_v2_movemeta.yaml" - - "!include public_pokemon_v2_movemetaailment.yaml" - - "!include public_pokemon_v2_movemetaailmentname.yaml" - - "!include public_pokemon_v2_movemetacategory.yaml" - - "!include public_pokemon_v2_movemetacategorydescription.yaml" - - "!include public_pokemon_v2_movemetastatchange.yaml" - - "!include public_pokemon_v2_movename.yaml" - - "!include public_pokemon_v2_movetarget.yaml" - - "!include public_pokemon_v2_movetargetdescription.yaml" - - "!include public_pokemon_v2_movetargetname.yaml" - - "!include public_pokemon_v2_nature.yaml" - - "!include public_pokemon_v2_naturebattlestylepreference.yaml" - - "!include public_pokemon_v2_naturename.yaml" - - "!include public_pokemon_v2_naturepokeathlonstat.yaml" - - "!include public_pokemon_v2_palpark.yaml" - - "!include public_pokemon_v2_palparkarea.yaml" - - "!include public_pokemon_v2_palparkareaname.yaml" - - "!include public_pokemon_v2_pokeathlonstat.yaml" - - "!include public_pokemon_v2_pokeathlonstatname.yaml" - - "!include public_pokemon_v2_pokedex.yaml" - - "!include public_pokemon_v2_pokedexdescription.yaml" - - "!include public_pokemon_v2_pokedexname.yaml" - - "!include public_pokemon_v2_pokedexversiongroup.yaml" - - "!include public_pokemon_v2_pokemon.yaml" - - "!include public_pokemon_v2_pokemonability.yaml" - - "!include public_pokemon_v2_pokemoncolor.yaml" - - "!include public_pokemon_v2_pokemoncolorname.yaml" - - "!include public_pokemon_v2_pokemondexnumber.yaml" - - "!include public_pokemon_v2_pokemonegggroup.yaml" - - "!include public_pokemon_v2_pokemonevolution.yaml" - - "!include public_pokemon_v2_pokemonform.yaml" - - "!include public_pokemon_v2_pokemonformgeneration.yaml" - - "!include public_pokemon_v2_pokemonformname.yaml" - - "!include public_pokemon_v2_pokemonformsprites.yaml" - - "!include public_pokemon_v2_pokemonformtype.yaml" - - "!include public_pokemon_v2_pokemongameindex.yaml" - - "!include public_pokemon_v2_pokemonhabitat.yaml" - - "!include public_pokemon_v2_pokemonhabitatname.yaml" - - "!include public_pokemon_v2_pokemonitem.yaml" - - "!include public_pokemon_v2_pokemonmove.yaml" - - "!include public_pokemon_v2_pokemonshape.yaml" - - "!include public_pokemon_v2_pokemonshapename.yaml" - - "!include public_pokemon_v2_pokemonspecies.yaml" - - "!include public_pokemon_v2_pokemonspeciesdescription.yaml" - - "!include public_pokemon_v2_pokemonspeciesflavortext.yaml" - - "!include public_pokemon_v2_pokemonspeciesname.yaml" - - "!include public_pokemon_v2_pokemonsprites.yaml" - - "!include public_pokemon_v2_pokemonstat.yaml" - - "!include public_pokemon_v2_pokemontype.yaml" - - "!include public_pokemon_v2_pokemontypepast.yaml" - - "!include public_pokemon_v2_region.yaml" - - "!include public_pokemon_v2_regionname.yaml" - - "!include public_pokemon_v2_stat.yaml" - - "!include public_pokemon_v2_statname.yaml" - - "!include public_pokemon_v2_supercontestcombo.yaml" - - "!include public_pokemon_v2_supercontesteffect.yaml" - - "!include public_pokemon_v2_supercontesteffectflavortext.yaml" - - "!include public_pokemon_v2_type.yaml" - - "!include public_pokemon_v2_typeefficacy.yaml" - - "!include public_pokemon_v2_typegameindex.yaml" - - "!include public_pokemon_v2_typename.yaml" - - "!include public_pokemon_v2_version.yaml" - - "!include public_pokemon_v2_versiongroup.yaml" - - "!include public_pokemon_v2_versiongroupmovelearnmethod.yaml" - - "!include public_pokemon_v2_versiongroupregion.yaml" - - "!include public_pokemon_v2_versionname.yaml" - functions: [] + tables: "!include default\\tables\\tables.yaml" + functions: "!include default\\functions\\functions.yaml" diff --git a/hasura/metadata/databases/default/functions/functions.yaml b/hasura/metadata/databases/default/functions/functions.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/metadata/databases/default/functions/functions.yaml @@ -0,0 +1 @@ +[] diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml index 181980f2..fcc8766e 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml @@ -41,7 +41,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml index 56760b92..d9dea5e0 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml @@ -16,7 +16,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml index 387515f5..02b81f00 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml index e9d815b6..fd369f55 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml index 4143ad22..d9b60d86 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml index 1c30728d..6f1417b7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml index 186821d5..b43bca94 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml @@ -19,7 +19,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml index ee7f7959..658d8293 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml index 92ec750b..347da149 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml index a4fd200b..cf9ba60d 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml @@ -34,7 +34,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml index 6a45dcb6..4527b905 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml index 9c37d439..860e76ae 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml index c1248985..dafea462 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml @@ -13,7 +13,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml index 1a385618..b376c124 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml index dcd312c3..43335b20 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml index c000b6d6..f30784e3 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml @@ -23,7 +23,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml index 7e4097f3..b97d8bea 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml index d2fc6472..39585f6e 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml index 3b2d4e90..703dae89 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml @@ -23,7 +23,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml index 3db12522..ee480d1f 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml index a9121584..961e2fff 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml index 0d9be7c3..455dbdb3 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml index db08152c..c663ee46 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml @@ -22,7 +22,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml index eccab225..e315ec78 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml index e3b000dc..7e1f7568 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml index 5fd78c1c..c5ecedf8 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml @@ -20,7 +20,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml index cfe99746..392fd676 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml index 175b7403..a9b12deb 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml index 9c314980..20a64033 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml @@ -23,7 +23,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml index 44b4696e..5d8e7c87 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml index 28368fde..b210ad48 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml @@ -16,7 +16,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml index 12f77e9c..d8ed3465 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml @@ -13,7 +13,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml index 9578bf3e..47c970a6 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml index 6611951a..1eac18f9 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml index fdea2a6e..9046a9f7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml @@ -5,7 +5,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml index 0b2ced25..49b159ad 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml @@ -9,7 +9,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml index 6f7019a3..111aabb9 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml @@ -83,7 +83,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml index ea40a4f0..91d45bc4 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml index a37ec24c..faa8c08d 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml @@ -30,7 +30,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml index 5794026d..d9de6391 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml index 9a81f28a..a925bd0c 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml @@ -93,7 +93,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml index 9e7aa0ef..753f9b60 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml @@ -23,7 +23,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml index be5154cf..27ca451e 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml index aecdf86f..ddec7d9d 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml index 8f98765a..424f1171 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml index 674304fc..2ab29fa8 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml @@ -20,7 +20,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml index cc5721b6..04fe5c23 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml index dfbea21d..aa55738a 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml index 0d6dba8b..a296f2fe 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml index c5f6b9de..931a4341 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml index 0ca82b40..c78380e8 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml index acfe3032..23c1f1f0 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml index 3875c6b1..767986a7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml index aa65c8c0..113cded3 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml index cb37c5db..70b4d04f 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml index 3e0a2e98..e25840a1 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml @@ -5,7 +5,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml index 1df8d71b..ab900e4d 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml @@ -429,7 +429,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml index c53f1a40..8904f655 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml index 09587efc..264dd9e2 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml @@ -34,7 +34,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml index 2c897e75..de56821b 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml @@ -27,7 +27,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml index 31861e1f..b7fa27c0 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml index 2fc31c20..680635e6 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml index 10234818..60c17d23 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml index 4aead9f1..f8e51da6 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml index b5c6b365..95656abe 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml @@ -14,7 +14,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml index 9b6287f3..b4bedcf7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml @@ -118,7 +118,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml index f8b6b8de..3055b72b 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml @@ -23,7 +23,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml index 9ee62de3..c3c8a437 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml index 55b5f7e5..fb368cef 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml index c5edfea1..b119b48b 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml index c887b964..00b41fae 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml index 209fd562..6aa32830 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml index a8224aa4..962f9158 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml @@ -14,7 +14,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml index a212561e..ca03b1a0 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml @@ -37,7 +37,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml index ffb2ebe2..14c3b155 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml index 6ee29698..5b032ceb 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml index b5b1e318..a5ecd96b 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml @@ -30,7 +30,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml index b8e1a75b..27da3e3a 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml @@ -16,7 +16,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml index 8087d115..29969b54 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml index b7e0b0ed..a29873e7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml index fb89e49f..50f251f2 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml index 27329aa9..4040f615 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml @@ -30,7 +30,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml index 4b70486b..0dbdc607 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml index a7b15985..096376e0 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml index ef54bf00..a6736b46 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml index 1cd342e9..5a0b90dc 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml index 8f7e55af..a484fa71 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml index 7746a462..cee67977 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml index df29bd13..ff1436bb 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml index 781e45c9..8d504d4e 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml index 9aafc140..7d60a458 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml index 4828dffc..3e582c3f 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml @@ -23,7 +23,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml index 162fd713..6d5dbc16 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml index 4919df57..b1adab81 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml index b6c72577..acc41dc3 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml @@ -36,7 +36,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml index d6c9c792..ac2287d6 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml index 8840374d..ce77095a 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml index b5ccc6a3..749c2143 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml index 4fbcb513..a9bc86ac 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml index a4c9e254..3853d619 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml index 1b7dc18a..d8fe5daa 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml index d3f95190..0850d846 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml index a9381616..05ff51b7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml index 9d3a2741..c8a87246 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml @@ -34,7 +34,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml index e1850165..75fd428e 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml index 625d68c6..3714215a 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml index 89022c64..edda9e51 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml index 420f3587..0a518ded 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml @@ -76,7 +76,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml index be2295c8..5eb9a859 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml index 6425788c..4d47ec20 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml index f80a0c47..e588f7ec 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml index edb746b7..8029bc05 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml index e03ec218..db399ff4 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml index 7517612f..815a0b52 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml @@ -35,7 +35,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml index 950ead19..b73f10e1 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml @@ -37,7 +37,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml index 302c86e3..20b6c044 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml index 5d0a4507..a2b0d6db 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml index ff27f347..a9e3017c 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml @@ -5,7 +5,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml index ca1b67f0..ca0967df 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml index 0c08dfb9..77079472 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml index a9a32392..2ce82e62 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml index 86e146e6..359af1f5 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml index d7efb85f..0f883177 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml index 9ddc19c3..e5c69238 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml @@ -14,7 +14,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml index bbf6d1c8..e989aa20 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml index 72cdf1bd..3c36ed1b 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml index f8954280..2daa43e7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml @@ -101,7 +101,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml index e4e4fe36..b4b5b3b9 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml index b36a7ea2..5f82eeb2 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml index 0b6e8f96..b1cd21e6 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml index 3e0d83ae..cbf67b2c 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml @@ -5,7 +5,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml index 923a7800..d62cacba 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml index 042f9278..98ff4f4a 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml index 9b792195..0379af37 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml @@ -11,7 +11,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml index 1d8c917e..19d9887b 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml @@ -37,7 +37,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml index 6bfde712..ae3b077c 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml index a4fbbbee..45ad0dd7 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml @@ -48,7 +48,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml index c9ddb45c..09e9fa10 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml index 99a091c6..82fbcb29 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml index 78c79bce..dee17dc2 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml @@ -16,7 +16,7 @@ array_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml index 793434a8..fef1cb67 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml index 022c8abf..6fdf381d 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml @@ -93,7 +93,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml index a3066985..ca87ef56 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml index 0be06f48..e1f38141 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml index da225420..8dd2f665 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml index d1f5777e..1d64dc48 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml @@ -48,7 +48,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml index 7c583a0a..6d80f684 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml @@ -104,7 +104,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml index 7da4c73b..9b0e7f08 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml index 180f1462..225a2b9c 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml b/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml index c980452b..2c328e2d 100644 --- a/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml +++ b/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml @@ -8,7 +8,7 @@ object_relationships: select_permissions: - permission: allow_aggregations: true - columns: '*' + columns: "*" filter: {} limit: 100000 role: anon diff --git a/hasura/metadata/databases/default/tables/tables.yaml b/hasura/metadata/databases/default/tables/tables.yaml new file mode 100644 index 00000000..64e416ee --- /dev/null +++ b/hasura/metadata/databases/default/tables/tables.yaml @@ -0,0 +1,150 @@ +- "!include public_pokemon_v2_ability.yaml" +- "!include public_pokemon_v2_abilitychange.yaml" +- "!include public_pokemon_v2_abilitychangeeffecttext.yaml" +- "!include public_pokemon_v2_abilityeffecttext.yaml" +- "!include public_pokemon_v2_abilityflavortext.yaml" +- "!include public_pokemon_v2_abilityname.yaml" +- "!include public_pokemon_v2_berry.yaml" +- "!include public_pokemon_v2_berryfirmness.yaml" +- "!include public_pokemon_v2_berryfirmnessname.yaml" +- "!include public_pokemon_v2_berryflavor.yaml" +- "!include public_pokemon_v2_berryflavormap.yaml" +- "!include public_pokemon_v2_berryflavorname.yaml" +- "!include public_pokemon_v2_characteristic.yaml" +- "!include public_pokemon_v2_characteristicdescription.yaml" +- "!include public_pokemon_v2_contestcombo.yaml" +- "!include public_pokemon_v2_contesteffect.yaml" +- "!include public_pokemon_v2_contesteffecteffecttext.yaml" +- "!include public_pokemon_v2_contesteffectflavortext.yaml" +- "!include public_pokemon_v2_contesttype.yaml" +- "!include public_pokemon_v2_contesttypename.yaml" +- "!include public_pokemon_v2_egggroup.yaml" +- "!include public_pokemon_v2_egggroupname.yaml" +- "!include public_pokemon_v2_encounter.yaml" +- "!include public_pokemon_v2_encountercondition.yaml" +- "!include public_pokemon_v2_encounterconditionname.yaml" +- "!include public_pokemon_v2_encounterconditionvalue.yaml" +- "!include public_pokemon_v2_encounterconditionvaluemap.yaml" +- "!include public_pokemon_v2_encounterconditionvaluename.yaml" +- "!include public_pokemon_v2_encountermethod.yaml" +- "!include public_pokemon_v2_encountermethodname.yaml" +- "!include public_pokemon_v2_encounterslot.yaml" +- "!include public_pokemon_v2_evolutionchain.yaml" +- "!include public_pokemon_v2_evolutiontrigger.yaml" +- "!include public_pokemon_v2_evolutiontriggername.yaml" +- "!include public_pokemon_v2_experience.yaml" +- "!include public_pokemon_v2_gender.yaml" +- "!include public_pokemon_v2_generation.yaml" +- "!include public_pokemon_v2_generationname.yaml" +- "!include public_pokemon_v2_growthrate.yaml" +- "!include public_pokemon_v2_growthratedescription.yaml" +- "!include public_pokemon_v2_item.yaml" +- "!include public_pokemon_v2_itemattribute.yaml" +- "!include public_pokemon_v2_itemattributedescription.yaml" +- "!include public_pokemon_v2_itemattributemap.yaml" +- "!include public_pokemon_v2_itemattributename.yaml" +- "!include public_pokemon_v2_itemcategory.yaml" +- "!include public_pokemon_v2_itemcategoryname.yaml" +- "!include public_pokemon_v2_itemeffecttext.yaml" +- "!include public_pokemon_v2_itemflavortext.yaml" +- "!include public_pokemon_v2_itemflingeffect.yaml" +- "!include public_pokemon_v2_itemflingeffecteffecttext.yaml" +- "!include public_pokemon_v2_itemgameindex.yaml" +- "!include public_pokemon_v2_itemname.yaml" +- "!include public_pokemon_v2_itempocket.yaml" +- "!include public_pokemon_v2_itempocketname.yaml" +- "!include public_pokemon_v2_itemsprites.yaml" +- "!include public_pokemon_v2_language.yaml" +- "!include public_pokemon_v2_languagename.yaml" +- "!include public_pokemon_v2_location.yaml" +- "!include public_pokemon_v2_locationarea.yaml" +- "!include public_pokemon_v2_locationareaencounterrate.yaml" +- "!include public_pokemon_v2_locationareaname.yaml" +- "!include public_pokemon_v2_locationgameindex.yaml" +- "!include public_pokemon_v2_locationname.yaml" +- "!include public_pokemon_v2_machine.yaml" +- "!include public_pokemon_v2_move.yaml" +- "!include public_pokemon_v2_moveattribute.yaml" +- "!include public_pokemon_v2_moveattributedescription.yaml" +- "!include public_pokemon_v2_moveattributemap.yaml" +- "!include public_pokemon_v2_moveattributename.yaml" +- "!include public_pokemon_v2_movebattlestyle.yaml" +- "!include public_pokemon_v2_movebattlestylename.yaml" +- "!include public_pokemon_v2_movechange.yaml" +- "!include public_pokemon_v2_movedamageclass.yaml" +- "!include public_pokemon_v2_movedamageclassdescription.yaml" +- "!include public_pokemon_v2_movedamageclassname.yaml" +- "!include public_pokemon_v2_moveeffect.yaml" +- "!include public_pokemon_v2_moveeffectchange.yaml" +- "!include public_pokemon_v2_moveeffectchangeeffecttext.yaml" +- "!include public_pokemon_v2_moveeffecteffecttext.yaml" +- "!include public_pokemon_v2_moveflavortext.yaml" +- "!include public_pokemon_v2_movelearnmethod.yaml" +- "!include public_pokemon_v2_movelearnmethoddescription.yaml" +- "!include public_pokemon_v2_movelearnmethodname.yaml" +- "!include public_pokemon_v2_movemeta.yaml" +- "!include public_pokemon_v2_movemetaailment.yaml" +- "!include public_pokemon_v2_movemetaailmentname.yaml" +- "!include public_pokemon_v2_movemetacategory.yaml" +- "!include public_pokemon_v2_movemetacategorydescription.yaml" +- "!include public_pokemon_v2_movemetastatchange.yaml" +- "!include public_pokemon_v2_movename.yaml" +- "!include public_pokemon_v2_movetarget.yaml" +- "!include public_pokemon_v2_movetargetdescription.yaml" +- "!include public_pokemon_v2_movetargetname.yaml" +- "!include public_pokemon_v2_nature.yaml" +- "!include public_pokemon_v2_naturebattlestylepreference.yaml" +- "!include public_pokemon_v2_naturename.yaml" +- "!include public_pokemon_v2_naturepokeathlonstat.yaml" +- "!include public_pokemon_v2_palpark.yaml" +- "!include public_pokemon_v2_palparkarea.yaml" +- "!include public_pokemon_v2_palparkareaname.yaml" +- "!include public_pokemon_v2_pokeathlonstat.yaml" +- "!include public_pokemon_v2_pokeathlonstatname.yaml" +- "!include public_pokemon_v2_pokedex.yaml" +- "!include public_pokemon_v2_pokedexdescription.yaml" +- "!include public_pokemon_v2_pokedexname.yaml" +- "!include public_pokemon_v2_pokedexversiongroup.yaml" +- "!include public_pokemon_v2_pokemon.yaml" +- "!include public_pokemon_v2_pokemonability.yaml" +- "!include public_pokemon_v2_pokemoncolor.yaml" +- "!include public_pokemon_v2_pokemoncolorname.yaml" +- "!include public_pokemon_v2_pokemondexnumber.yaml" +- "!include public_pokemon_v2_pokemonegggroup.yaml" +- "!include public_pokemon_v2_pokemonevolution.yaml" +- "!include public_pokemon_v2_pokemonform.yaml" +- "!include public_pokemon_v2_pokemonformgeneration.yaml" +- "!include public_pokemon_v2_pokemonformname.yaml" +- "!include public_pokemon_v2_pokemonformsprites.yaml" +- "!include public_pokemon_v2_pokemonformtype.yaml" +- "!include public_pokemon_v2_pokemongameindex.yaml" +- "!include public_pokemon_v2_pokemonhabitat.yaml" +- "!include public_pokemon_v2_pokemonhabitatname.yaml" +- "!include public_pokemon_v2_pokemonitem.yaml" +- "!include public_pokemon_v2_pokemonmove.yaml" +- "!include public_pokemon_v2_pokemonshape.yaml" +- "!include public_pokemon_v2_pokemonshapename.yaml" +- "!include public_pokemon_v2_pokemonspecies.yaml" +- "!include public_pokemon_v2_pokemonspeciesdescription.yaml" +- "!include public_pokemon_v2_pokemonspeciesflavortext.yaml" +- "!include public_pokemon_v2_pokemonspeciesname.yaml" +- "!include public_pokemon_v2_pokemonsprites.yaml" +- "!include public_pokemon_v2_pokemonstat.yaml" +- "!include public_pokemon_v2_pokemontype.yaml" +- "!include public_pokemon_v2_pokemontypepast.yaml" +- "!include public_pokemon_v2_region.yaml" +- "!include public_pokemon_v2_regionname.yaml" +- "!include public_pokemon_v2_stat.yaml" +- "!include public_pokemon_v2_statname.yaml" +- "!include public_pokemon_v2_supercontestcombo.yaml" +- "!include public_pokemon_v2_supercontesteffect.yaml" +- "!include public_pokemon_v2_supercontesteffectflavortext.yaml" +- "!include public_pokemon_v2_type.yaml" +- "!include public_pokemon_v2_typeefficacy.yaml" +- "!include public_pokemon_v2_typegameindex.yaml" +- "!include public_pokemon_v2_typename.yaml" +- "!include public_pokemon_v2_version.yaml" +- "!include public_pokemon_v2_versiongroup.yaml" +- "!include public_pokemon_v2_versiongroupmovelearnmethod.yaml" +- "!include public_pokemon_v2_versiongroupregion.yaml" +- "!include public_pokemon_v2_versionname.yaml" diff --git a/hasura/metadata/inherited_roles.yaml b/hasura/metadata/inherited_roles.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/metadata/inherited_roles.yaml @@ -0,0 +1 @@ +[] diff --git a/hasura/metadata/rest_endpoints.yaml b/hasura/metadata/rest_endpoints.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/metadata/rest_endpoints.yaml @@ -0,0 +1 @@ +[] From 2909877a6560c7cef8ad72f08caaaba6a90ba8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 20 Mar 2021 19:04:28 +0100 Subject: [PATCH 024/113] chore: bump graphiql --- Resources/compose/docker-compose-prod-graphql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/compose/docker-compose-prod-graphql.yml b/Resources/compose/docker-compose-prod-graphql.yml index b7eef5fd..fcdf1bca 100644 --- a/Resources/compose/docker-compose-prod-graphql.yml +++ b/Resources/compose/docker-compose-prod-graphql.yml @@ -18,7 +18,7 @@ services: HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" graphiql: - image: pokeapi/graphiql:1.0.0 + image: pokeapi/graphiql:1.0.1 command: sh -c 'cp -a /app/static/. /transfer/ && tail -f /etc/passwd' volumes: - graphiql:/transfer From b29616791f20fd87e9b835d7ab33a19cb5de0b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 21 Mar 2021 21:31:22 +0100 Subject: [PATCH 025/113] docs: add comments --- hasura/examples/alola_road_encounters.gql | 2 ++ hasura/examples/best_poison_grass_pokemon.gql | 4 +++ hasura/examples/pokemon.js | 27 +++++++++++++------ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/hasura/examples/alola_road_encounters.gql b/hasura/examples/alola_road_encounters.gql index b98b1f9d..625197c5 100644 --- a/hasura/examples/alola_road_encounters.gql +++ b/hasura/examples/alola_road_encounters.gql @@ -1,4 +1,6 @@ """ +Finds Pokemons in Alola that evolve when you are in a particular location. + Variables: { "region": "alola" diff --git a/hasura/examples/best_poison_grass_pokemon.gql b/hasura/examples/best_poison_grass_pokemon.gql index 93fbb1a8..fca10ffb 100644 --- a/hasura/examples/best_poison_grass_pokemon.gql +++ b/hasura/examples/best_poison_grass_pokemon.gql @@ -1,3 +1,7 @@ +""" +Returns the strongest 3 grass and poison pokemon. It uses thier stats to compute their strenght. +""" + query best_grass_poison_pokemons { pokemon: pokemon_v2_pokemon( where: { diff --git a/hasura/examples/pokemon.js b/hasura/examples/pokemon.js index 1fc7713d..11850ae0 100644 --- a/hasura/examples/pokemon.js +++ b/hasura/examples/pokemon.js @@ -1,10 +1,21 @@ /* -This is an example snippet - you should consider tailoring it -to your service. -*/ -/* -Add these to your `package.json`: - "node-fetch": "^2.5.0" +Get's many details about Staryu. + +It gets: + - happiness + - if legendary/mythical + - generation + - habitat + - height + - weight + - ID + - abilities + - stats + - types + - learnable moves by leveling up + - in how many locations it can be found + - holdable items in Fire Red + - flavor text */ // Node doesn't implement fetch so we have to import it @@ -72,12 +83,12 @@ const operationsDoc = ` level } } - pokemon_v2_encounters_aggregate { + foundInAsManyPlaces: pokemon_v2_encounters_aggregate { aggregate { count } } - pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { + fireRedItems: pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { pokemon_v2_item { name cost From 21c959e87be1afee724cdb1232c20ce50301f2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 22 Mar 2021 19:31:59 +0100 Subject: [PATCH 026/113] feat: allow ssl --- .gitignore | 3 ++- Resources/nginx/nginx.conf | 2 ++ docker-compose.yml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f4561112..23ae4a2d 100755 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ db.* venv* node_modules .vscode -.env \ No newline at end of file +.env +Resources/nginx/ssl/* \ No newline at end of file diff --git a/Resources/nginx/nginx.conf b/Resources/nginx/nginx.conf index e91b490d..bd80f158 100644 --- a/Resources/nginx/nginx.conf +++ b/Resources/nginx/nginx.conf @@ -59,6 +59,8 @@ http { listen 80 deferred; server_name _; + include /ssl/ssl.conf*; + client_body_timeout 5s; client_header_timeout 5s; diff --git a/docker-compose.yml b/docker-compose.yml index baf916f2..79d87e35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,7 @@ services: command: [nginx-debug, '-g', 'daemon off;'] volumes: - ./Resources/nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - ./Resources/nginx/ssl:/ssl:ro volumes_from: - app:ro links: From af8c80d422225ae7f7eca22fe8a069cd33ecbf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 19:11:18 +0100 Subject: [PATCH 027/113] docs: add example ssl config --- .gitignore | 3 ++- Resources/nginx/ssl/ssh.sample.conf | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Resources/nginx/ssl/ssh.sample.conf diff --git a/.gitignore b/.gitignore index 23ae4a2d..005a535f 100755 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ venv* node_modules .vscode .env -Resources/nginx/ssl/* \ No newline at end of file +Resources/nginx/ssl/* +!Resources/nginx/ssl/*.sample.* \ No newline at end of file diff --git a/Resources/nginx/ssl/ssh.sample.conf b/Resources/nginx/ssl/ssh.sample.conf new file mode 100644 index 00000000..0064e38c --- /dev/null +++ b/Resources/nginx/ssl/ssh.sample.conf @@ -0,0 +1,14 @@ +# Copy this file to ssl.conf, add certificate and private key to enable ssl + +listen 443 ssl http2; +listen [::]:443 ssl http2; + +ssl_certificate /ssl/cert.cer; +ssl_certificate_key /ssl/key.key; +ssl_session_timeout 1d; +ssl_session_cache shared:MozSSL:10m; +ssl_session_tickets off; + +ssl_protocols TLSv1.2 TLSv1.3; +ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; +ssl_prefer_server_ciphers off; \ No newline at end of file From 384e86ee4731b6b0acbd22165b56f9fddc5450f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 19:11:33 +0100 Subject: [PATCH 028/113] feat: tune nginx config --- Resources/nginx/nginx.conf | 51 +++++++++----------------------------- 1 file changed, 12 insertions(+), 39 deletions(-) diff --git a/Resources/nginx/nginx.conf b/Resources/nginx/nginx.conf index bd80f158..5773a5ce 100644 --- a/Resources/nginx/nginx.conf +++ b/Resources/nginx/nginx.conf @@ -1,7 +1,7 @@ -worker_processes 4; # 80$ droplet, so 4 core enabled +worker_processes 2; events { - worker_connections 8096; # accepted incoming connections*2 + worker_connections 4096; multi_accept on; # accept each connection as soon as you can accept_mutex off; use epoll; @@ -17,7 +17,7 @@ http { client_body_buffer_size 10K; # raise the threshold by which requests are written to HDD instead of RAM client_header_buffer_size 2k; - client_max_body_size 8m; # we dont accept requests larger that 8mb, probably you are DoSing us + client_max_body_size 8m; # we dont accept requests larger that 8mb sendfile on; tcp_nopush on; @@ -25,16 +25,18 @@ http { keepalive_timeout 5; - gzip on; # enable zipping files - gzip_vary on; - gzip_min_length 5120; # enable it only for medium-big files (slowbro size is 7000) - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml application/json; + gzip on; gzip_disable "msi6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 6; + gzip_buffers 16 8k; + gzip_http_version 1.1; + gzip_min_length 256; + gzip_types application/atom+xml application/geo+json application/javascript application/x-javascript application/json application/ld+json application/manifest+json application/rdf+xml application/rss+xml application/xhtml+xml application/xml font/eot font/otf font/ttf image/svg+xml text/css text/javascript text/plain text/xml; upstream pokeapi_upstream { # 'app' is the Django container name in Docker - # DO NOT EDIT IT ALONE or it'll break docker-compose server app:8000 fail_timeout=0; } @@ -58,15 +60,13 @@ http { server { listen 80 deferred; server_name _; + root /code; include /ssl/ssl.conf*; client_body_timeout 5s; client_header_timeout 5s; - root /code; - - # Admin console location /graphql/admin/ { expires 1m; # client-side caching, one minute for each API resource @@ -78,9 +78,7 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; - proxy_redirect off; - proxy_pass http://graphql_upstream/; } @@ -102,51 +100,26 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; - proxy_redirect off; - proxy_pass http://graphql_upstream/v1/graphql; } - - location /media/ { - root /code; - autoindex off; - } - - location /static/ { - alias /code/assets/; - autoindex off; - } location /api/ { expires 1m; # client-side caching, one minute for each API resource add_header Cache-Control "public"; add_header Pragma public; - proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; - proxy_redirect off; - proxy_pass http://pokeapi_upstream; } - # location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ { # cache all these extensions for 5 days, disable logging - # access_log off; - # log_not_found off; - # expires 5d; - # add_header Cache-Control "public"; - # add_header Pragma public; - # } - location / { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; - proxy_redirect off; - proxy_pass http://pokeapi_upstream; } } From e8d00089b2bd169b3193ebfe28047c002d79d94c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 19:21:01 +0100 Subject: [PATCH 029/113] perf: limit concurrent connections --- Resources/nginx/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/nginx/nginx.conf b/Resources/nginx/nginx.conf index 5773a5ce..0a633b54 100644 --- a/Resources/nginx/nginx.conf +++ b/Resources/nginx/nginx.conf @@ -56,6 +56,7 @@ http { } limit_req_zone $limit_key zone=graphqlDefaultLimit:50m rate=1r/m; + limit_conn_zone $binary_remote_addr zone=addr:20m; server { listen 80 deferred; @@ -66,6 +67,7 @@ http { client_body_timeout 5s; client_header_timeout 5s; + limit_conn addr 10; # Admin console location /graphql/admin/ { From 480b77ade2b8113ce3a154ab6c95f5bb2dd24389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 19:43:58 +0100 Subject: [PATCH 030/113] refactor: rename folder --- {hasura => graphql}/config.yaml | 0 {hasura => graphql}/examples/alola_road_encounters.gql | 0 {hasura => graphql}/examples/best_poison_grass_pokemon.gql | 0 {hasura => graphql}/examples/gen3_species.gql | 0 {hasura => graphql}/examples/package.json | 0 {hasura => graphql}/examples/pokemon.js | 0 {hasura => graphql}/metadata/actions.graphql | 0 {hasura => graphql}/metadata/actions.yaml | 0 {hasura => graphql}/metadata/allow_list.yaml | 0 {hasura => graphql}/metadata/cron_triggers.yaml | 0 {hasura => graphql}/metadata/databases/databases.yaml | 0 .../metadata/databases/default/functions/functions.yaml | 0 .../databases/default/tables/public_pokemon_v2_ability.yaml | 0 .../databases/default/tables/public_pokemon_v2_abilitychange.yaml | 0 .../default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml | 0 .../default/tables/public_pokemon_v2_abilityeffecttext.yaml | 0 .../default/tables/public_pokemon_v2_abilityflavortext.yaml | 0 .../databases/default/tables/public_pokemon_v2_abilityname.yaml | 0 .../databases/default/tables/public_pokemon_v2_berry.yaml | 0 .../databases/default/tables/public_pokemon_v2_berryfirmness.yaml | 0 .../default/tables/public_pokemon_v2_berryfirmnessname.yaml | 0 .../databases/default/tables/public_pokemon_v2_berryflavor.yaml | 0 .../default/tables/public_pokemon_v2_berryflavormap.yaml | 0 .../default/tables/public_pokemon_v2_berryflavorname.yaml | 0 .../default/tables/public_pokemon_v2_characteristic.yaml | 0 .../tables/public_pokemon_v2_characteristicdescription.yaml | 0 .../databases/default/tables/public_pokemon_v2_contestcombo.yaml | 0 .../databases/default/tables/public_pokemon_v2_contesteffect.yaml | 0 .../default/tables/public_pokemon_v2_contesteffecteffecttext.yaml | 0 .../default/tables/public_pokemon_v2_contesteffectflavortext.yaml | 0 .../databases/default/tables/public_pokemon_v2_contesttype.yaml | 0 .../default/tables/public_pokemon_v2_contesttypename.yaml | 0 .../databases/default/tables/public_pokemon_v2_egggroup.yaml | 0 .../databases/default/tables/public_pokemon_v2_egggroupname.yaml | 0 .../databases/default/tables/public_pokemon_v2_encounter.yaml | 0 .../default/tables/public_pokemon_v2_encountercondition.yaml | 0 .../default/tables/public_pokemon_v2_encounterconditionname.yaml | 0 .../default/tables/public_pokemon_v2_encounterconditionvalue.yaml | 0 .../tables/public_pokemon_v2_encounterconditionvaluemap.yaml | 0 .../tables/public_pokemon_v2_encounterconditionvaluename.yaml | 0 .../default/tables/public_pokemon_v2_encountermethod.yaml | 0 .../default/tables/public_pokemon_v2_encountermethodname.yaml | 0 .../databases/default/tables/public_pokemon_v2_encounterslot.yaml | 0 .../default/tables/public_pokemon_v2_evolutionchain.yaml | 0 .../default/tables/public_pokemon_v2_evolutiontrigger.yaml | 0 .../default/tables/public_pokemon_v2_evolutiontriggername.yaml | 0 .../databases/default/tables/public_pokemon_v2_experience.yaml | 0 .../databases/default/tables/public_pokemon_v2_gender.yaml | 0 .../databases/default/tables/public_pokemon_v2_generation.yaml | 0 .../default/tables/public_pokemon_v2_generationname.yaml | 0 .../databases/default/tables/public_pokemon_v2_growthrate.yaml | 0 .../default/tables/public_pokemon_v2_growthratedescription.yaml | 0 .../metadata/databases/default/tables/public_pokemon_v2_item.yaml | 0 .../databases/default/tables/public_pokemon_v2_itemattribute.yaml | 0 .../tables/public_pokemon_v2_itemattributedescription.yaml | 0 .../default/tables/public_pokemon_v2_itemattributemap.yaml | 0 .../default/tables/public_pokemon_v2_itemattributename.yaml | 0 .../databases/default/tables/public_pokemon_v2_itemcategory.yaml | 0 .../default/tables/public_pokemon_v2_itemcategoryname.yaml | 0 .../default/tables/public_pokemon_v2_itemeffecttext.yaml | 0 .../default/tables/public_pokemon_v2_itemflavortext.yaml | 0 .../default/tables/public_pokemon_v2_itemflingeffect.yaml | 0 .../tables/public_pokemon_v2_itemflingeffecteffecttext.yaml | 0 .../databases/default/tables/public_pokemon_v2_itemgameindex.yaml | 0 .../databases/default/tables/public_pokemon_v2_itemname.yaml | 0 .../databases/default/tables/public_pokemon_v2_itempocket.yaml | 0 .../default/tables/public_pokemon_v2_itempocketname.yaml | 0 .../databases/default/tables/public_pokemon_v2_itemsprites.yaml | 0 .../databases/default/tables/public_pokemon_v2_language.yaml | 0 .../databases/default/tables/public_pokemon_v2_languagename.yaml | 0 .../databases/default/tables/public_pokemon_v2_location.yaml | 0 .../databases/default/tables/public_pokemon_v2_locationarea.yaml | 0 .../tables/public_pokemon_v2_locationareaencounterrate.yaml | 0 .../default/tables/public_pokemon_v2_locationareaname.yaml | 0 .../default/tables/public_pokemon_v2_locationgameindex.yaml | 0 .../databases/default/tables/public_pokemon_v2_locationname.yaml | 0 .../databases/default/tables/public_pokemon_v2_machine.yaml | 0 .../metadata/databases/default/tables/public_pokemon_v2_move.yaml | 0 .../databases/default/tables/public_pokemon_v2_moveattribute.yaml | 0 .../tables/public_pokemon_v2_moveattributedescription.yaml | 0 .../default/tables/public_pokemon_v2_moveattributemap.yaml | 0 .../default/tables/public_pokemon_v2_moveattributename.yaml | 0 .../default/tables/public_pokemon_v2_movebattlestyle.yaml | 0 .../default/tables/public_pokemon_v2_movebattlestylename.yaml | 0 .../databases/default/tables/public_pokemon_v2_movechange.yaml | 0 .../default/tables/public_pokemon_v2_movedamageclass.yaml | 0 .../tables/public_pokemon_v2_movedamageclassdescription.yaml | 0 .../default/tables/public_pokemon_v2_movedamageclassname.yaml | 0 .../databases/default/tables/public_pokemon_v2_moveeffect.yaml | 0 .../default/tables/public_pokemon_v2_moveeffectchange.yaml | 0 .../tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml | 0 .../default/tables/public_pokemon_v2_moveeffecteffecttext.yaml | 0 .../default/tables/public_pokemon_v2_moveflavortext.yaml | 0 .../default/tables/public_pokemon_v2_movelearnmethod.yaml | 0 .../tables/public_pokemon_v2_movelearnmethoddescription.yaml | 0 .../default/tables/public_pokemon_v2_movelearnmethodname.yaml | 0 .../databases/default/tables/public_pokemon_v2_movemeta.yaml | 0 .../default/tables/public_pokemon_v2_movemetaailment.yaml | 0 .../default/tables/public_pokemon_v2_movemetaailmentname.yaml | 0 .../default/tables/public_pokemon_v2_movemetacategory.yaml | 0 .../tables/public_pokemon_v2_movemetacategorydescription.yaml | 0 .../default/tables/public_pokemon_v2_movemetastatchange.yaml | 0 .../databases/default/tables/public_pokemon_v2_movename.yaml | 0 .../databases/default/tables/public_pokemon_v2_movetarget.yaml | 0 .../default/tables/public_pokemon_v2_movetargetdescription.yaml | 0 .../default/tables/public_pokemon_v2_movetargetname.yaml | 0 .../databases/default/tables/public_pokemon_v2_nature.yaml | 0 .../tables/public_pokemon_v2_naturebattlestylepreference.yaml | 0 .../databases/default/tables/public_pokemon_v2_naturename.yaml | 0 .../default/tables/public_pokemon_v2_naturepokeathlonstat.yaml | 0 .../databases/default/tables/public_pokemon_v2_palpark.yaml | 0 .../databases/default/tables/public_pokemon_v2_palparkarea.yaml | 0 .../default/tables/public_pokemon_v2_palparkareaname.yaml | 0 .../default/tables/public_pokemon_v2_pokeathlonstat.yaml | 0 .../default/tables/public_pokemon_v2_pokeathlonstatname.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokedex.yaml | 0 .../default/tables/public_pokemon_v2_pokedexdescription.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokedexname.yaml | 0 .../default/tables/public_pokemon_v2_pokedexversiongroup.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemon.yaml | 0 .../default/tables/public_pokemon_v2_pokemonability.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemoncolor.yaml | 0 .../default/tables/public_pokemon_v2_pokemoncolorname.yaml | 0 .../default/tables/public_pokemon_v2_pokemondexnumber.yaml | 0 .../default/tables/public_pokemon_v2_pokemonegggroup.yaml | 0 .../default/tables/public_pokemon_v2_pokemonevolution.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemonform.yaml | 0 .../default/tables/public_pokemon_v2_pokemonformgeneration.yaml | 0 .../default/tables/public_pokemon_v2_pokemonformname.yaml | 0 .../default/tables/public_pokemon_v2_pokemonformsprites.yaml | 0 .../default/tables/public_pokemon_v2_pokemonformtype.yaml | 0 .../default/tables/public_pokemon_v2_pokemongameindex.yaml | 0 .../default/tables/public_pokemon_v2_pokemonhabitat.yaml | 0 .../default/tables/public_pokemon_v2_pokemonhabitatname.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemonitem.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemonmove.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemonshape.yaml | 0 .../default/tables/public_pokemon_v2_pokemonshapename.yaml | 0 .../default/tables/public_pokemon_v2_pokemonspecies.yaml | 0 .../tables/public_pokemon_v2_pokemonspeciesdescription.yaml | 0 .../tables/public_pokemon_v2_pokemonspeciesflavortext.yaml | 0 .../default/tables/public_pokemon_v2_pokemonspeciesname.yaml | 0 .../default/tables/public_pokemon_v2_pokemonsprites.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemonstat.yaml | 0 .../databases/default/tables/public_pokemon_v2_pokemontype.yaml | 0 .../default/tables/public_pokemon_v2_pokemontypepast.yaml | 0 .../databases/default/tables/public_pokemon_v2_region.yaml | 0 .../databases/default/tables/public_pokemon_v2_regionname.yaml | 0 .../metadata/databases/default/tables/public_pokemon_v2_stat.yaml | 0 .../databases/default/tables/public_pokemon_v2_statname.yaml | 0 .../default/tables/public_pokemon_v2_supercontestcombo.yaml | 0 .../default/tables/public_pokemon_v2_supercontesteffect.yaml | 0 .../tables/public_pokemon_v2_supercontesteffectflavortext.yaml | 0 .../metadata/databases/default/tables/public_pokemon_v2_type.yaml | 0 .../databases/default/tables/public_pokemon_v2_typeefficacy.yaml | 0 .../databases/default/tables/public_pokemon_v2_typegameindex.yaml | 0 .../databases/default/tables/public_pokemon_v2_typename.yaml | 0 .../databases/default/tables/public_pokemon_v2_version.yaml | 0 .../databases/default/tables/public_pokemon_v2_versiongroup.yaml | 0 .../tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml | 0 .../default/tables/public_pokemon_v2_versiongroupregion.yaml | 0 .../databases/default/tables/public_pokemon_v2_versionname.yaml | 0 {hasura => graphql}/metadata/databases/default/tables/tables.yaml | 0 {hasura => graphql}/metadata/inherited_roles.yaml | 0 {hasura => graphql}/metadata/query_collections.yaml | 0 {hasura => graphql}/metadata/remote_schemas.yaml | 0 {hasura => graphql}/metadata/rest_endpoints.yaml | 0 {hasura => graphql}/metadata/version.yaml | 0 168 files changed, 0 insertions(+), 0 deletions(-) rename {hasura => graphql}/config.yaml (100%) rename {hasura => graphql}/examples/alola_road_encounters.gql (100%) rename {hasura => graphql}/examples/best_poison_grass_pokemon.gql (100%) rename {hasura => graphql}/examples/gen3_species.gql (100%) rename {hasura => graphql}/examples/package.json (100%) rename {hasura => graphql}/examples/pokemon.js (100%) rename {hasura => graphql}/metadata/actions.graphql (100%) rename {hasura => graphql}/metadata/actions.yaml (100%) rename {hasura => graphql}/metadata/allow_list.yaml (100%) rename {hasura => graphql}/metadata/cron_triggers.yaml (100%) rename {hasura => graphql}/metadata/databases/databases.yaml (100%) rename {hasura => graphql}/metadata/databases/default/functions/functions.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_ability.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_berry.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_experience.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_gender.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_generation.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_item.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_language.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_location.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_machine.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_move.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_nature.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_region.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_stat.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_statname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_type.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_typename.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_version.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml (100%) rename {hasura => graphql}/metadata/databases/default/tables/tables.yaml (100%) rename {hasura => graphql}/metadata/inherited_roles.yaml (100%) rename {hasura => graphql}/metadata/query_collections.yaml (100%) rename {hasura => graphql}/metadata/remote_schemas.yaml (100%) rename {hasura => graphql}/metadata/rest_endpoints.yaml (100%) rename {hasura => graphql}/metadata/version.yaml (100%) diff --git a/hasura/config.yaml b/graphql/config.yaml similarity index 100% rename from hasura/config.yaml rename to graphql/config.yaml diff --git a/hasura/examples/alola_road_encounters.gql b/graphql/examples/alola_road_encounters.gql similarity index 100% rename from hasura/examples/alola_road_encounters.gql rename to graphql/examples/alola_road_encounters.gql diff --git a/hasura/examples/best_poison_grass_pokemon.gql b/graphql/examples/best_poison_grass_pokemon.gql similarity index 100% rename from hasura/examples/best_poison_grass_pokemon.gql rename to graphql/examples/best_poison_grass_pokemon.gql diff --git a/hasura/examples/gen3_species.gql b/graphql/examples/gen3_species.gql similarity index 100% rename from hasura/examples/gen3_species.gql rename to graphql/examples/gen3_species.gql diff --git a/hasura/examples/package.json b/graphql/examples/package.json similarity index 100% rename from hasura/examples/package.json rename to graphql/examples/package.json diff --git a/hasura/examples/pokemon.js b/graphql/examples/pokemon.js similarity index 100% rename from hasura/examples/pokemon.js rename to graphql/examples/pokemon.js diff --git a/hasura/metadata/actions.graphql b/graphql/metadata/actions.graphql similarity index 100% rename from hasura/metadata/actions.graphql rename to graphql/metadata/actions.graphql diff --git a/hasura/metadata/actions.yaml b/graphql/metadata/actions.yaml similarity index 100% rename from hasura/metadata/actions.yaml rename to graphql/metadata/actions.yaml diff --git a/hasura/metadata/allow_list.yaml b/graphql/metadata/allow_list.yaml similarity index 100% rename from hasura/metadata/allow_list.yaml rename to graphql/metadata/allow_list.yaml diff --git a/hasura/metadata/cron_triggers.yaml b/graphql/metadata/cron_triggers.yaml similarity index 100% rename from hasura/metadata/cron_triggers.yaml rename to graphql/metadata/cron_triggers.yaml diff --git a/hasura/metadata/databases/databases.yaml b/graphql/metadata/databases/databases.yaml similarity index 100% rename from hasura/metadata/databases/databases.yaml rename to graphql/metadata/databases/databases.yaml diff --git a/hasura/metadata/databases/default/functions/functions.yaml b/graphql/metadata/databases/default/functions/functions.yaml similarity index 100% rename from hasura/metadata/databases/default/functions/functions.yaml rename to graphql/metadata/databases/default/functions/functions.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_ability.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_ability.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_ability.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_berry.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_berry.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_berry.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_experience.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_experience.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_experience.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_gender.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_gender.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_gender.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_generation.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_generation.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_generation.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_item.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_item.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_item.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_language.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_language.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_language.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_location.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_location.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_location.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_machine.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_machine.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_machine.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_move.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_move.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_move.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movetargetdescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_movetargetname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_nature.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_nature.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_nature.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_naturebattlestylepreference.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_naturename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_naturepokeathlonstat.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_palpark.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_palparkarea.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_palparkareaname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstat.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokeathlonstatname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokedex.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokedexdescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokedexname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokedexversiongroup.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonability.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemoncolor.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemoncolorname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemondexnumber.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonegggroup.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonform.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformgeneration.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformsprites.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonformtype.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemongameindex.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitat.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonhabitatname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonitem.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonmove.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonshape.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonshapename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspecies.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesdescription.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesflavortext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonspeciesname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonsprites.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonstat.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemontype.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_pokemontypepast.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_region.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_region.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_region.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_regionname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_stat.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_stat.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_stat.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_statname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_statname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_statname.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_supercontestcombo.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_supercontesteffect.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_supercontesteffectflavortext.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_type.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_type.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_type.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_typeefficacy.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_typegameindex.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_typename.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_typename.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_typename.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_version.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_version.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_version.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_versiongroup.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_versiongroupmovelearnmethod.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_versiongroupregion.yaml diff --git a/hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml b/graphql/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml rename to graphql/metadata/databases/default/tables/public_pokemon_v2_versionname.yaml diff --git a/hasura/metadata/databases/default/tables/tables.yaml b/graphql/metadata/databases/default/tables/tables.yaml similarity index 100% rename from hasura/metadata/databases/default/tables/tables.yaml rename to graphql/metadata/databases/default/tables/tables.yaml diff --git a/hasura/metadata/inherited_roles.yaml b/graphql/metadata/inherited_roles.yaml similarity index 100% rename from hasura/metadata/inherited_roles.yaml rename to graphql/metadata/inherited_roles.yaml diff --git a/hasura/metadata/query_collections.yaml b/graphql/metadata/query_collections.yaml similarity index 100% rename from hasura/metadata/query_collections.yaml rename to graphql/metadata/query_collections.yaml diff --git a/hasura/metadata/remote_schemas.yaml b/graphql/metadata/remote_schemas.yaml similarity index 100% rename from hasura/metadata/remote_schemas.yaml rename to graphql/metadata/remote_schemas.yaml diff --git a/hasura/metadata/rest_endpoints.yaml b/graphql/metadata/rest_endpoints.yaml similarity index 100% rename from hasura/metadata/rest_endpoints.yaml rename to graphql/metadata/rest_endpoints.yaml diff --git a/hasura/metadata/version.yaml b/graphql/metadata/version.yaml similarity index 100% rename from hasura/metadata/version.yaml rename to graphql/metadata/version.yaml From 26c1036d0b7d62196b71eff0551d9cd2302d17b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 19:44:14 +0100 Subject: [PATCH 031/113] refactor: use correct name --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 77402432..12465581 100755 --- a/Makefile +++ b/Makefile @@ -89,14 +89,14 @@ sync-from-veekun: pull pull-veekun # Copy data from ../pokedex to this reposito sync-to-veekun: pull pull-veekun # Copy data from this repository to ../pokedex cp -a ./data/v2/csv/. ${veekun_pokedex_repository}/pokedex/data/csv -read-env-file: # Exports ./.env into shell environment variables - export `egrep -v '^#' .env | xargs` +# read-env-file: # Exports ./.env into shell environment variables +# export `egrep -v '^#' .env | xargs` hasura-export: # Export Hasura configuration - hasura md export --project hasura --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET} + hasura md export --project graphql --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET} hasura-apply: # Apply local Hasura configuration - hasura md apply --project hasura --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET} + hasura md apply --project graphql --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET} hasura-get-anon-schema: # Dumps GraphQL schema - gq http://localhost:8080/v1/graphql --introspect > hasura/schema.graphql + gq http://localhost:8080/v1/graphql --introspect > graphql/schema.graphql From 120717a6d2db75435883ae528a7c8b3d8622cc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 19:46:04 +0100 Subject: [PATCH 032/113] feat: align gunicorn port to the one of compose --- gunicorn.py.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gunicorn.py.ini b/gunicorn.py.ini index e4c4c540..9db1e924 100644 --- a/gunicorn.py.ini +++ b/gunicorn.py.ini @@ -1,5 +1,5 @@ from multiprocessing import cpu_count -bind = '0.0.0.0:8000' +bind = '0.0.0.0:80' workers = cpu_count() * 2 threads = cpu_count() * 2 From e967a0ef192e9eea02f18771302070b3cf518e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 20:01:28 +0100 Subject: [PATCH 033/113] docs: update readme with graphql info/move section --- README.md | 78 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 410899e4..ba75eb39 100755 --- a/README.md +++ b/README.md @@ -18,30 +18,7 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co) -## Join Us On Slack! - -Have a question or just want to discuss new ideas and improvements? Hit us up on slack. Consider talking with us here before creating new issue. -This way we can keep issues here a bit more organized and helpful in the long run. Be excellent to each other :smile: - -[Sign up](https://pokeapi-slack-invite.herokuapp.com/) easily! - -Once you've signed up visit [PokéAPI on Slack](https://pokeapi.slack.com) - -## Official Wrappers - -* Node server-side [PokeAPI/pokedex-promise-v2](https://github.com/PokeAPI/pokedex-promise-v2) | _Auto caching_ -* Browser client-side [PokeAPI/pokeapi-js-wrapper](https://github.com/PokeAPI/pokeapi-js-wrapper) | _Auto caching_ -* Java/Kotlin [PokeAPI/pokekotlin](https://github.com/PokeAPI/pokekotlin) -* Python 3 [GregHilmes/pokebase](https://github.com/GregHilmes/pokebase) | _Auto caching_ -* Python 2/3 [PokeAPI/pokepy](https://github.com/PokeAPI/pokepy) | _Auto caching_ -* PHP [lmerotta/phpokeapi](https://github.com/lmerotta/phpokeapi) | _Auto caching, lazy loading_ -* Ruby [rdavid1099/poke-api-v2](https://github.com/rdavid1099/poke-api-v2) -* .Net Standard [mtrdp642/PokeApiNet](https://github.com/mtrdp642/PokeApiNet) | _Auto caching_ -* Go [mtslzr/pokeapi-go](https://github.com/mtslzr/pokeapi-go) | _Auto caching_ -* Dart [prathanbomb/pokedart](https://github.com/prathanbomb/pokedart) -* Rust [lunik1/pokerust](https://gitlab.com/lunik1/pokerust) | _Auto caching_ -* Spring Boot [dlfigueira/spring-pokeapi](https://github.com/dlfigueira/spring-pokeapi) | _Auto caching_ -* Swift [kinkofer/PokemonAPI](https://github.com/kinkofer/PokemonAPI) +> Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql) for more info. ## Setup [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/) @@ -81,7 +58,7 @@ from data.v2.build import build_all build_all() ``` -Visit [localhost:8000/api/v2/](localhost:8000/api/v2/) to see the running API! +Visit [localhost:80/api/v2/](localhost:80/api/v2/) to see the running API! Each time the build script is run, it will iterate over each table in the database, wipe it, and rewrite each row using the data found in data/v2/csv. @@ -95,9 +72,9 @@ make wipe_db ## Docker and Compose -There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allow you to deploy a production-like environment, with separate containers for each services. +There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allows you to deploy a production-like environment, with separate containers for each services and is recommended if you need to simply spin up PokeAPI. -Start everything by simply +Start everything by ```sh make docker-setup @@ -113,14 +90,59 @@ docker-compose exec -T app sh -c 'echo "from data.v2.build import build_all; bui Browse [localhost/api/v2/](http://localhost/api/v2/) or [localhost/api/v2/pokemon/bulbasaur/](http://localhost/api/v2/pokemon/bulbasaur/) on port `80`. +## GraphQL + + + + + +When you start PokeAPI with the above docker-compose setup, an [Hasura Engine](https://github.com/hasura/graphql-engine) server is started as well. It's possible to track all the PokeAPI tables and foreign keys by simply + +```sh +# hasura cli needs to be installed and available in your $PATH: https://hasura.io/docs/latest/graphql/core/hasura-cli/install-hasura-cli.html +# hasura cli's version has to be v2.0.0-alpha.5 +make hasura-apply +``` + +When finished browse http://localhost:8080 and you will find the admin console. The GraphQL endpoint will be hosted at http://localhost:8080/v1/graphql. + +A free public GraphiQL console is browsable at the address https://beta.pokeapi.co/graphql/console/. The relative GraphQL endpoint is accessible at https://beta.pokeapi.co/graphql/v1beta + +A set of examples are provided in the directory [/graphql/examples](./graphql/examples) of this repository. + +## Official REST Wrappers + +* Node server-side [PokeAPI/pokedex-promise-v2](https://github.com/PokeAPI/pokedex-promise-v2) | _Auto caching_ +* Browser client-side [PokeAPI/pokeapi-js-wrapper](https://github.com/PokeAPI/pokeapi-js-wrapper) | _Auto caching_ +* Java/Kotlin [PokeAPI/pokekotlin](https://github.com/PokeAPI/pokekotlin) +* Python 3 [GregHilmes/pokebase](https://github.com/GregHilmes/pokebase) | _Auto caching_ +* Python 2/3 [PokeAPI/pokepy](https://github.com/PokeAPI/pokepy) | _Auto caching_ +* PHP [lmerotta/phpokeapi](https://github.com/lmerotta/phpokeapi) | _Auto caching, lazy loading_ +* Ruby [rdavid1099/poke-api-v2](https://github.com/rdavid1099/poke-api-v2) +* .Net Standard [mtrdp642/PokeApiNet](https://github.com/mtrdp642/PokeApiNet) | _Auto caching_ +* Go [mtslzr/pokeapi-go](https://github.com/mtslzr/pokeapi-go) | _Auto caching_ +* Dart [prathanbomb/pokedart](https://github.com/prathanbomb/pokedart) +* Rust [lunik1/pokerust](https://gitlab.com/lunik1/pokerust) | _Auto caching_ +* Spring Boot [dlfigueira/spring-pokeapi](https://github.com/dlfigueira/spring-pokeapi) | _Auto caching_ +* Swift [kinkofer/PokemonAPI](https://github.com/kinkofer/PokemonAPI) + ## Donations -Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get almost 20 million requests a month! +Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get 60 million requests a month! Thank you to all our backers! [Become a backer](https://opencollective.com/pokeapi#backer) +## Join Us On Slack! + +Have a question or just want to discuss new ideas and improvements? Hit us up on slack. Consider talking with us here before creating new issue. +This way we can keep issues here a bit more organized and helpful in the long run. Be excellent to each other :smile: + +[Sign up](https://pokeapi-slack-invite.herokuapp.com/) easily! + +Once you've signed up visit [PokéAPI on Slack](https://pokeapi.slack.com) + ## Contributing This project exists thanks to all the people who [contribute](https://github.com/PokeAPI/pokeapi/blob/master/CONTRIBUTING.md) From f4b46552fd8f121b7070b7e8dcb9fe8206a12e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 20:08:22 +0100 Subject: [PATCH 034/113] perf: disable debug for nginx --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 79d87e35..28a2dfff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: - "80:80" - "443:443" restart: always - command: [nginx-debug, '-g', 'daemon off;'] + # command: [nginx-debug, '-g', 'daemon off;'] volumes: - ./Resources/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./Resources/nginx/ssl:/ssl:ro From 7714b570b75d5579d49bb3681d14bdd3841d2c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 23 Mar 2021 20:43:59 +0100 Subject: [PATCH 035/113] refactor: add newline --- config/docker-compose.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/docker-compose.py b/config/docker-compose.py index 23659e70..f8dffe4c 100644 --- a/config/docker-compose.py +++ b/config/docker-compose.py @@ -27,4 +27,4 @@ CACHES = { DEBUG = False TASTYPIE_FULL_DEBUG = False -ALLOWED_HOSTS = ["*"] \ No newline at end of file +ALLOWED_HOSTS = ["*"] From ad732576490d92f50b48d6bc57058c5f1265a5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 8 Apr 2021 19:46:57 +0200 Subject: [PATCH 036/113] fix: use new app address --- Resources/nginx/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/nginx/nginx.conf b/Resources/nginx/nginx.conf index 0a633b54..4c3763c7 100644 --- a/Resources/nginx/nginx.conf +++ b/Resources/nginx/nginx.conf @@ -37,7 +37,7 @@ http { upstream pokeapi_upstream { # 'app' is the Django container name in Docker - server app:8000 fail_timeout=0; + server app:80 fail_timeout=0; } upstream graphql_upstream { From 408600f7ed32541ff579821c4cb99b02ba0e09db Mon Sep 17 00:00:00 2001 From: Quoc Trung Hoang Date: Sat, 10 Apr 2021 18:12:01 +0200 Subject: [PATCH 037/113] Add graphql go consumption example Signed-off-by: Quoc Trung Hoang --- graphql/examples/pokemon.go | 107 ++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 graphql/examples/pokemon.go diff --git a/graphql/examples/pokemon.go b/graphql/examples/pokemon.go new file mode 100644 index 00000000..4d739a0c --- /dev/null +++ b/graphql/examples/pokemon.go @@ -0,0 +1,107 @@ +package main + +import ( + "bytes" + "encoding/json" + "io/ioutil" + "log" + "net/http" +) + +type Operation struct { + Query string `json:"query"` + Variables map[string]interface{} `json:"variables"` + OperationName string `json:"operationName"` +} + +var ( + pokemonDetails = Operation{ + OperationName: "pokemon_details", + Variables: map[string]interface{}{}, + Query: ` +query pokemon_details { + species: pokemon_v2_pokemonspecies(where: {name: {_eq: "staryu"}}) { + name + base_happiness + is_legendary + is_mythical + generation: pokemon_v2_generation { + name + } + habitat: pokemon_v2_pokemonhabitat { + name + } + pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { + nodes { + height + name + id + weight + abilities: pokemon_v2_pokemonabilities_aggregate { + nodes { + ability: pokemon_v2_ability { + name + } + } + } + stats: pokemon_v2_pokemonstats { + base_stat + stat: pokemon_v2_stat { + name + } + } + types: pokemon_v2_pokemontypes { + slot + type: pokemon_v2_type { + name + } + } + levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { + nodes { + move: pokemon_v2_move { + name + } + level + } + } + foundInAsManyPlaces: pokemon_v2_encounters_aggregate { + aggregate { + count + } + } + fireRedItems: pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { + pokemon_v2_item { + name + cost + } + rarity + } + } + } + flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { + flavor_text + } + } +} + `, + } +) + +func main() { + url := "https://beta.pokeapi.co/graphql/v1beta" + body, err := json.Marshal(pokemonDetails) + if err != nil { + log.Fatal(err) + } + + resp, err := http.Post(url, "", bytes.NewReader(body)) + if err != nil { + log.Fatal(err) + } + defer resp.Body.Close() + body, err = ioutil.ReadAll(resp.Body) + if err != nil { + log.Fatal(err) + } + log.Println(string(body)) +} From e0e6431dedac8cc0572bba0c0f729ee5e93225e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 10 Apr 2021 20:03:32 +0200 Subject: [PATCH 038/113] docs: move go examples, document it --- graphql/examples/go/README.md | 9 +++ graphql/examples/go/pokemon.go | 110 +++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 graphql/examples/go/README.md create mode 100644 graphql/examples/go/pokemon.go diff --git a/graphql/examples/go/README.md b/graphql/examples/go/README.md new file mode 100644 index 00000000..ed240eb8 --- /dev/null +++ b/graphql/examples/go/README.md @@ -0,0 +1,9 @@ +# Go examples + +## `pokemon.go` + +Fetches details about a Pokémon and prints an unformatted JSON to the `stdout`. The name of the Pokémon is passed as a variable. + +```sh +go run pokemon.go # | jq +``` diff --git a/graphql/examples/go/pokemon.go b/graphql/examples/go/pokemon.go new file mode 100644 index 00000000..7a1abf1f --- /dev/null +++ b/graphql/examples/go/pokemon.go @@ -0,0 +1,110 @@ +package main + +import ( + "bytes" + "encoding/json" + "fmt" + "io/ioutil" + "log" + "net/http" +) + +type Operation struct { + Query string `json:"query"` + Variables map[string]interface{} `json:"variables"` + OperationName string `json:"operationName"` +} + +var ( + pokemonDetails = Operation{ + OperationName: "pokemon_details", + Variables: map[string]interface{}{ + "name": "staryu", + }, + Query: ` +query pokemon_details($name: String) { + species: pokemon_v2_pokemonspecies(where: {name: {_eq: $name}}) { + name + base_happiness + is_legendary + is_mythical + generation: pokemon_v2_generation { + name + } + habitat: pokemon_v2_pokemonhabitat { + name + } + pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { + nodes { + height + name + id + weight + abilities: pokemon_v2_pokemonabilities_aggregate { + nodes { + ability: pokemon_v2_ability { + name + } + } + } + stats: pokemon_v2_pokemonstats { + base_stat + stat: pokemon_v2_stat { + name + } + } + types: pokemon_v2_pokemontypes { + slot + type: pokemon_v2_type { + name + } + } + levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { + nodes { + move: pokemon_v2_move { + name + } + level + } + } + foundInAsManyPlaces: pokemon_v2_encounters_aggregate { + aggregate { + count + } + } + fireRedItems: pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { + pokemon_v2_item { + name + cost + } + rarity + } + } + } + flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { + flavor_text + } + } +} + `, + } +) + +func main() { + url := "https://beta.pokeapi.co/graphql/v1beta" + body, err := json.Marshal(pokemonDetails) + if err != nil { + log.Fatal(err) + } + + resp, err := http.Post(url, "", bytes.NewReader(body)) + if err != nil { + log.Fatal(err) + } + defer resp.Body.Close() + body, err = ioutil.ReadAll(resp.Body) + if err != nil { + log.Fatal(err) + } + fmt.Println(string(body)) +} From 98027550383107578daedbbda122b659a2879cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 10 Apr 2021 20:03:42 +0200 Subject: [PATCH 039/113] chore: remove go example --- graphql/examples/pokemon.go | 107 ------------------------------------ 1 file changed, 107 deletions(-) delete mode 100644 graphql/examples/pokemon.go diff --git a/graphql/examples/pokemon.go b/graphql/examples/pokemon.go deleted file mode 100644 index 4d739a0c..00000000 --- a/graphql/examples/pokemon.go +++ /dev/null @@ -1,107 +0,0 @@ -package main - -import ( - "bytes" - "encoding/json" - "io/ioutil" - "log" - "net/http" -) - -type Operation struct { - Query string `json:"query"` - Variables map[string]interface{} `json:"variables"` - OperationName string `json:"operationName"` -} - -var ( - pokemonDetails = Operation{ - OperationName: "pokemon_details", - Variables: map[string]interface{}{}, - Query: ` -query pokemon_details { - species: pokemon_v2_pokemonspecies(where: {name: {_eq: "staryu"}}) { - name - base_happiness - is_legendary - is_mythical - generation: pokemon_v2_generation { - name - } - habitat: pokemon_v2_pokemonhabitat { - name - } - pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { - nodes { - height - name - id - weight - abilities: pokemon_v2_pokemonabilities_aggregate { - nodes { - ability: pokemon_v2_ability { - name - } - } - } - stats: pokemon_v2_pokemonstats { - base_stat - stat: pokemon_v2_stat { - name - } - } - types: pokemon_v2_pokemontypes { - slot - type: pokemon_v2_type { - name - } - } - levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { - nodes { - move: pokemon_v2_move { - name - } - level - } - } - foundInAsManyPlaces: pokemon_v2_encounters_aggregate { - aggregate { - count - } - } - fireRedItems: pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { - pokemon_v2_item { - name - cost - } - rarity - } - } - } - flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { - flavor_text - } - } -} - `, - } -) - -func main() { - url := "https://beta.pokeapi.co/graphql/v1beta" - body, err := json.Marshal(pokemonDetails) - if err != nil { - log.Fatal(err) - } - - resp, err := http.Post(url, "", bytes.NewReader(body)) - if err != nil { - log.Fatal(err) - } - defer resp.Body.Close() - body, err = ioutil.ReadAll(resp.Body) - if err != nil { - log.Fatal(err) - } - log.Println(string(body)) -} From ca1ecb43ebf5495fca89f13456fb606ff89d7c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 10 Apr 2021 20:03:58 +0200 Subject: [PATCH 040/113] chore: move js example --- graphql/examples/{ => node}/package.json | 0 graphql/examples/{ => node}/pokemon.js | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename graphql/examples/{ => node}/package.json (100%) rename graphql/examples/{ => node}/pokemon.js (100%) diff --git a/graphql/examples/package.json b/graphql/examples/node/package.json similarity index 100% rename from graphql/examples/package.json rename to graphql/examples/node/package.json diff --git a/graphql/examples/pokemon.js b/graphql/examples/node/pokemon.js similarity index 100% rename from graphql/examples/pokemon.js rename to graphql/examples/node/pokemon.js From 72dcb019f25704ffca5fa680beff722b8f0b8418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 10 Apr 2021 20:07:24 +0200 Subject: [PATCH 041/113] docs: document node example --- graphql/examples/node/README.md | 10 ++++++++++ graphql/examples/node/package-lock.json | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 graphql/examples/node/README.md create mode 100644 graphql/examples/node/package-lock.json diff --git a/graphql/examples/node/README.md b/graphql/examples/node/README.md new file mode 100644 index 00000000..075c5388 --- /dev/null +++ b/graphql/examples/node/README.md @@ -0,0 +1,10 @@ +# Node examples + +## `pokemon.js` + +Fetches info about Staryu using `node-fetch`. + +```sh +npm i +node pokemon.js +``` diff --git a/graphql/examples/node/package-lock.json b/graphql/examples/node/package-lock.json new file mode 100644 index 00000000..ff4a6872 --- /dev/null +++ b/graphql/examples/node/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "examples", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + } + } +} From d74edcc0b6acb7eeea125819ab37f535cb12b3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 10 Apr 2021 21:02:28 +0200 Subject: [PATCH 042/113] docs: add two gql examples --- graphql/examples/README.md | 5 ++++ graphql/examples/alola_road_encounters.gql | 2 +- graphql/examples/item_translations.gql | 27 ++++++++++++++++++++++ graphql/examples/pokemon_stats.gql | 23 ++++++++++++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 graphql/examples/README.md create mode 100644 graphql/examples/item_translations.gql create mode 100644 graphql/examples/pokemon_stats.gql diff --git a/graphql/examples/README.md b/graphql/examples/README.md new file mode 100644 index 00000000..59ca62cd --- /dev/null +++ b/graphql/examples/README.md @@ -0,0 +1,5 @@ +# GraphQL examples + +You can use all the `.gql` examples in our console at https://beta.pokeapi.co/graphql/console/. + +Inside the folders you find GraphQL queries implemented in different languages, frameworks and libraries. diff --git a/graphql/examples/alola_road_encounters.gql b/graphql/examples/alola_road_encounters.gql index 625197c5..b3dcafb9 100644 --- a/graphql/examples/alola_road_encounters.gql +++ b/graphql/examples/alola_road_encounters.gql @@ -3,7 +3,7 @@ Finds Pokemons in Alola that evolve when you are in a particular location. Variables: { - "region": "alola" + "region": "alola" } """ diff --git a/graphql/examples/item_translations.gql b/graphql/examples/item_translations.gql new file mode 100644 index 00000000..e0008aa6 --- /dev/null +++ b/graphql/examples/item_translations.gql @@ -0,0 +1,27 @@ +# for each language, list all items and the relative English translation +query getItemsTranslation1 { + pokemon_v2_language { + name + iso639 + iso3166 + items: pokemon_v2_itemnames { + name + englishName: pokemon_v2_item { + name + } + } + } +} + +# for each item, show the English name and get all it's translations +query getItemsTranslation2 { + items: pokemon_v2_item { + name + translations: pokemon_v2_itemnames { + foreignName: name + language: pokemon_v2_language { + name + } + } + } +} \ No newline at end of file diff --git a/graphql/examples/pokemon_stats.gql b/graphql/examples/pokemon_stats.gql new file mode 100644 index 00000000..01990293 --- /dev/null +++ b/graphql/examples/pokemon_stats.gql @@ -0,0 +1,23 @@ +query tallest { + pokemon: pokemon_v2_pokemon(order_by: {height: desc}, limit: 3, where: {is_default: {_eq: true}}) { + name + height + } +} + +query fattest { + pokemon: pokemon_v2_pokemon(order_by: {weight: desc}, limit: 3, where: {is_default: {_eq: true}}) { + name + weight + } +} + +query avgHappiness { + species: pokemon_v2_pokemonspecies_aggregate { + aggregate { + avg { + base_happiness + } + } + } +} From a918d08da157c9568876de5f1c341b2e79031dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 10 Apr 2021 21:19:11 +0200 Subject: [PATCH 043/113] docs: improve Node example --- graphql/examples/node/pokemon.js | 144 +++++++++++++++---------------- 1 file changed, 71 insertions(+), 73 deletions(-) diff --git a/graphql/examples/node/pokemon.js b/graphql/examples/node/pokemon.js index 11850ae0..a7e730f3 100644 --- a/graphql/examples/node/pokemon.js +++ b/graphql/examples/node/pokemon.js @@ -18,110 +18,108 @@ It gets: - flavor text */ -// Node doesn't implement fetch so we have to import it -const fetch =require("node-fetch"); +const fetch = require("node-fetch") -async function fetchGraphQL(operationsDoc, operationName, variables) { +async function fetchGraphQL(query, variables, operationName) { const result = await fetch( - "http://localhost:80/graphql/v1beta", + "https://beta.pokeapi.co/graphql/v1beta", { method: "POST", body: JSON.stringify({ - query: operationsDoc, + query: query, variables: variables, operationName: operationName }) } - ); + ) - return await result.json(); + return await result.json() } -const operationsDoc = ` - query pokemon_details { - species: pokemon_v2_pokemonspecies(where: {name: {_eq: "staryu"}}) { - name - base_happiness - is_legendary - is_mythical - generation: pokemon_v2_generation { + + +function fetchPokemon_details(name="starmie") { + const query = ` + query pokemon_details($name: String) { + species: pokemon_v2_pokemonspecies(where: {name: {_eq: $name}}) { name - } - habitat: pokemon_v2_pokemonhabitat { - name - } - pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { - nodes { - height + base_happiness + is_legendary + is_mythical + generation: pokemon_v2_generation { name - id - weight - abilities: pokemon_v2_pokemonabilities_aggregate { - nodes { - ability: pokemon_v2_ability { + } + habitat: pokemon_v2_pokemonhabitat { + name + } + pokemon: pokemon_v2_pokemons_aggregate(limit: 1) { + nodes { + height + name + id + weight + abilities: pokemon_v2_pokemonabilities_aggregate { + nodes { + ability: pokemon_v2_ability { + name + } + } + } + stats: pokemon_v2_pokemonstats { + base_stat + stat: pokemon_v2_stat { name } } - } - stats: pokemon_v2_pokemonstats { - base_stat - stat: pokemon_v2_stat { - name - } - } - types: pokemon_v2_pokemontypes { - slot - type: pokemon_v2_type { - name - } - } - levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { - nodes { - move: pokemon_v2_move { + types: pokemon_v2_pokemontypes { + slot + type: pokemon_v2_type { name } - level } - } - foundInAsManyPlaces: pokemon_v2_encounters_aggregate { - aggregate { - count + levelUpMoves: pokemon_v2_pokemonmoves_aggregate(where: {pokemon_v2_movelearnmethod: {name: {_eq: "level-up"}}}, distinct_on: move_id) { + nodes { + move: pokemon_v2_move { + name + } + level + } } - } - fireRedItems: pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { - pokemon_v2_item { - name - cost + foundInAsManyPlaces: pokemon_v2_encounters_aggregate { + aggregate { + count + } + } + fireRedItems: pokemon_v2_pokemonitems(where: {pokemon_v2_version: {name: {_eq: "firered"}}}) { + pokemon_v2_item { + name + cost + } + rarity } - rarity } } - } - flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { - flavor_text + flavorText: pokemon_v2_pokemonspeciesflavortexts(where: {pokemon_v2_language: {name: {_eq: "en"}}, pokemon_v2_version: {name: {_eq: "firered"}}}) { + flavor_text + } } } - } -`; + ` -function fetchPokemon_details() { return fetchGraphQL( - operationsDoc, - "pokemon_details", - {} - ); + query, + {"name": name}, + "pokemon_details" + ) } -async function startFetchPokemon_details() { - const { errors, data } = await fetchPokemon_details(); - +async function main() { + const pokemon = process.argv.slice(2)[0]; + const { errors, data } = await fetchPokemon_details(pokemon) if (errors) { - // handle those errors like a pro - console.error(errors); + console.error(errors) } - - // do something great with this precious data - console.log(data); + console.log(JSON.stringify(data, null, 2)) } -startFetchPokemon_details(); \ No newline at end of file +main() From 880fbf00ce7ea6b310e5b4b828d4dfcf275ca28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 10 Apr 2021 21:19:55 +0200 Subject: [PATCH 044/113] docs: better comment --- graphql/examples/node/pokemon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql/examples/node/pokemon.js b/graphql/examples/node/pokemon.js index a7e730f3..b11a8f59 100644 --- a/graphql/examples/node/pokemon.js +++ b/graphql/examples/node/pokemon.js @@ -1,5 +1,5 @@ /* -Get's many details about Staryu. +Get's many details about a pokemon passed as argument (starmie as default). It gets: - happiness From 30e531d347dc206296d6851b1ca7b539ef514ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 11 Apr 2021 19:33:42 +0200 Subject: [PATCH 045/113] docs: typo --- graphql/examples/item_translations.gql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql/examples/item_translations.gql b/graphql/examples/item_translations.gql index e0008aa6..3948495d 100644 --- a/graphql/examples/item_translations.gql +++ b/graphql/examples/item_translations.gql @@ -13,7 +13,7 @@ query getItemsTranslation1 { } } -# for each item, show the English name and get all it's translations +# for each item, show the English name and get all its translations query getItemsTranslation2 { items: pokemon_v2_item { name From 60583d8882a6439baa017e6d4f8825e803051aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 18 Apr 2021 18:06:17 +0200 Subject: [PATCH 046/113] feat: brings in https://github.com/PokeAPI/pokedex/pull/43 --- data/v2/csv/pokemon_species_names.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/csv/pokemon_species_names.csv b/data/v2/csv/pokemon_species_names.csv index 87711a28..95f7b99e 100644 --- a/data/v2/csv/pokemon_species_names.csv +++ b/data/v2/csv/pokemon_species_names.csv @@ -9375,7 +9375,7 @@ pokemon_species_id,local_language_id,name,genus 889,1,ザマゼンタ,つわものポケモン 889,3,자마젠타,강자포켓몬 889,4,藏瑪然特,強者寶可夢 -889,5,Zamazent,Pokémon Valeureux +889,5,Zamazenta,Pokémon Valeureux 889,6,Zamazenta,Krieger 889,7,Zamazenta,Pokémon Guerrero 889,8,Zamazenta,Pokémon Guerriero From 8db11d324089b2456d8bcc2c98faf2ad45a0d18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 27 Apr 2021 21:58:16 +0200 Subject: [PATCH 047/113] chore: update deps --- requirements.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7e49ba18..9bebe2bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,18 @@ -Django==2.1.11 +Django==2.2.20 Unipath==1.1 coverage==4.5.1 -django-appconf==1.0.2 -django-cors-headers==2.4.0 +django-appconf==1.0.4 +django-cors-headers==2.5.3 django-discover-runner==1.0 -django-redis==4.10.0 -django-cachalot==2.1.0 -django-tastypie==0.14.2 -djangorestframework==3.9.0 +django-redis==4.12.1 +django-cachalot==2.3.5 +django-tastypie==0.14.3 +djangorestframework==3.12.4 drf-ujson==1.2.0 -gunicorn==19.9.0 +gunicorn==20.1.0 mimeparse==0.1.3 -psycopg2==2.7.5 -python-dateutil==2.7.3 +psycopg2==2.8.6 +python-dateutil==2.8.1 python-mimeparse==1.6.0 -simplejson==3.16.0 -six==1.11.0 +simplejson==3.17.2 +six==1.15.0 From 40424c27050ba8a73b92904d44611ee55b374445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 28 Apr 2021 23:12:34 +0200 Subject: [PATCH 048/113] chore: update test requirements --- test-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 9d8a9f70..3d3057d9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,5 @@ -r requirements.txt -pylint===2.1.1 -pylint-django===2.0.2 -astroid==2.0.4 +pylint===2.8.2 +pylint-django===2.4.4 +astroid==2.5.6 black==20.8b1 From 4f012fb23b095d168426414438a468886d85b0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 28 Apr 2021 23:16:58 +0200 Subject: [PATCH 049/113] chore: downgrade djangorestframework --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9bebe2bc..18817e90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ django-discover-runner==1.0 django-redis==4.12.1 django-cachalot==2.3.5 django-tastypie==0.14.3 -djangorestframework==3.12.4 +djangorestframework==3.9.4 drf-ujson==1.2.0 gunicorn==20.1.0 mimeparse==0.1.3 From 432b7304c3f9a2a472fcfb38404d70c026d88614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 29 Apr 2021 19:36:27 +0200 Subject: [PATCH 050/113] chore: increase minor --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 18817e90..860c00c2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ django-discover-runner==1.0 django-redis==4.12.1 django-cachalot==2.3.5 django-tastypie==0.14.3 -djangorestframework==3.9.4 +djangorestframework==3.10.3 drf-ujson==1.2.0 gunicorn==20.1.0 mimeparse==0.1.3 From 14af88ff3a620b21c344c23ce4a66380eb5169e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 12 May 2021 19:20:28 +0200 Subject: [PATCH 051/113] sync: https://github.com/PokeAPI/pokedex/pull/29 --- data/v2/csv/ability_names.csv | 106 ++++++++-- data/v2/csv/move_names.csv | 374 ++++++++++++++++++++++++++-------- data/v2/csv/moves.csv | 2 +- 3 files changed, 376 insertions(+), 106 deletions(-) diff --git a/data/v2/csv/ability_names.csv b/data/v2/csv/ability_names.csv index fa111c09..f70c4ab3 100644 --- a/data/v2/csv/ability_names.csv +++ b/data/v2/csv/ability_names.csv @@ -353,7 +353,7 @@ ability_id,local_language_id,name 36,3,트레이스 36,4,複製 36,5,Calque -36,6,Fährte +36,6,Erfassen 36,7,Rastro 36,8,Traccia 36,9,Trace @@ -593,7 +593,7 @@ ability_id,local_language_id,name 60,3,점착 60,4,黏著 60,5,Glu -60,6,Wertehalter +60,6,Klebekörper 60,7,Viscosidad 60,8,Antifurto 60,9,Sticky Hold @@ -1354,7 +1354,7 @@ ability_id,local_language_id,name 136,4,多重鱗片 136,5,Multiécaille 136,6,Multischuppe -136,7,Compensación +136,7,Multiescamas 136,8,Multisquame 136,9,Multiscale 136,11,マルチスケイル @@ -1413,7 +1413,7 @@ ability_id,local_language_id,name 142,3,방진 142,4,防塵 142,5,Envelocape -142,6,Wetterfest +142,6,Partikelschutz 142,7,Funda 142,8,Copricapo 142,9,Overcoat @@ -2329,6 +2329,7 @@ ability_id,local_language_id,name 233,9,Neuroforce 233,11,ブレインフォース 233,12,脑核之力 +234,1,ふとうのけん 234,3,불요의검 234,4,不撓之劍 234,5,Lame Indomptable @@ -2336,8 +2337,9 @@ ability_id,local_language_id,name 234,7,Espada Indómita 234,8,Spada Indomita 234,9,Intrepid Sword +234,11,ふとうのけん 234,12,不挠之剑 -234,13,Espada Intrépida +235,1,ふくつのたて 235,3,불굴의방패 235,4,不屈之盾 235,5,Égide Inflexible @@ -2345,7 +2347,9 @@ ability_id,local_language_id,name 235,7,Escudo Recio 235,8,Scudo Saldo 235,9,Dauntless Shield -235,13,Escudo Destemido +235,11,ふくつのたて +235,12,不屈之盾 +236,1,リベロ 236,3,리베로 236,4,自由者 236,5,Libéro @@ -2353,7 +2357,9 @@ ability_id,local_language_id,name 236,7,Líbero 236,8,Libero 236,9,Libero -236,13,Líbero +236,11,リベロ +236,12,自由者 +237,1,たまひろい 237,3,볼줍기 237,4,撿球 237,5,Ramasse Ball @@ -2361,7 +2367,9 @@ ability_id,local_language_id,name 237,7,Recogebolas 237,8,Raccattapalle 237,9,Ball Fetch +237,11,たまひろい 237,12,捡球 +238,1,わたげ 238,3,솜털 238,4,棉絮 238,5,Effilochage @@ -2369,6 +2377,9 @@ ability_id,local_language_id,name 238,7,Pelusa 238,8,Lanugine 238,9,Cotton Down +238,11,わたげ +238,12,棉絮 +239,1,スクリューおびれ 239,3,스크루지느러미 239,4,螺旋尾鰭 239,5,Propulseur @@ -2376,7 +2387,9 @@ ability_id,local_language_id,name 239,7,Hélice Caudal 239,8,Elicopinna 239,9,Propeller Tail +239,11,スクリューおびれ 239,12,螺旋尾鳍 +240,1,ミラーアーマー 240,3,미러아머 240,4,鏡甲 240,5,Armure Miroir @@ -2384,23 +2397,29 @@ ability_id,local_language_id,name 240,7,Coraza Reflejo 240,8,Blindospecchio 240,9,Mirror Armor +240,11,ミラーアーマー 240,12,镜甲 +241,1,うのミサイル 241,3,그대로꿀꺽미사일 -241,4,口飛彈 +241,4,一口飛彈 241,5,Dégobage 241,6,Würggeschoss 241,7,Tragamisil 241,8,Inghiottimissile 241,9,Gulp Missile -241,12,口导弹 +241,11,うのミサイル +241,12,一口导弹 +242,1,すじがねいり 242,3,굳건한신념 242,4,堅毅 -242,5,Nerfs d'Acier +242,5,Nerfs d’Acier 242,6,Stahlrückgrat 242,7,Acérrimo 242,8,Volontà di Ferro 242,9,Stalwart +242,11,すじがねいり 242,12,坚毅 +243,1,じょうききかん 243,3,증기기관 243,4,蒸汽機 243,5,Turbine @@ -2408,7 +2427,9 @@ ability_id,local_language_id,name 243,7,Combustible 243,8,Vapormacchina 243,9,Steam Engine +243,11,じょうききかん 243,12,蒸汽机 +244,1,パンクロック 244,3,펑크록 244,4,龐克搖滾 244,5,Punk Rock @@ -2416,7 +2437,9 @@ ability_id,local_language_id,name 244,7,Punk Rock 244,8,Punk Rock 244,9,Punk Rock +244,11,パンクロック 244,12,庞克摇滚 +245,1,すなはき 245,3,모래뿜기 245,4,吐沙 245,5,Expul’Sable @@ -2424,6 +2447,9 @@ ability_id,local_language_id,name 245,7,Expulsarena 245,8,Sputasabbia 245,9,Sand Spit +245,11,すなはき +245,12,吐沙 +246,1,こおりのりんぷん 246,3,얼음인분 246,4,冰鱗粉 246,5,Écailles Glacées @@ -2431,7 +2457,9 @@ ability_id,local_language_id,name 246,7,Escama de Hielo 246,8,Geloscaglie 246,9,Ice Scales +246,11,こおりのりんぷん 246,12,冰鳞粉 +247,1,じゅくせい 247,3,숙성 247,4,熟成 247,5,Mûrissement @@ -2439,6 +2467,9 @@ ability_id,local_language_id,name 247,7,Maduración 247,8,Maturazione 247,9,Ripen +247,11,じゅくせい +247,12,熟成 +248,1,アイスフェイス 248,3,아이스페이스 248,4,結凍頭 248,5,Tête de Gel @@ -2446,15 +2477,19 @@ ability_id,local_language_id,name 248,7,Cara de Hielo 248,8,Gelofaccia 248,9,Ice Face +248,11,アイスフェイス 248,12,结冻头 +249,1,パワースポット 249,3,파워스폿 249,4,能量點 -249,5,Cercle d'Énergie +249,5,Cercle d’Énergie 249,6,Kraftquelle 249,7,Fuente Energía 249,8,Fonte Energetica 249,9,Power Spot +249,11,パワースポット 249,12,能量点 +250,1,ぎたい 250,3,의태 250,4,擬態 250,5,Mimétisme @@ -2462,7 +2497,9 @@ ability_id,local_language_id,name 250,7,Mimetismo 250,8,Mimetismo 250,9,Mimicry +250,11,ぎたい 250,12,拟态 +251,1,バリアフリー 251,3,배리어프리 251,4,除障 251,5,Brise-Barrière @@ -2470,7 +2507,9 @@ ability_id,local_language_id,name 251,7,Antibarrera 251,8,Annullabarriere 251,9,Screen Cleaner -251,13,Limpa-vidro +251,11,バリアフリー +251,12,除障 +252,1,はがねのせいしん 252,3,강철정신 252,4,鋼之意志 252,5,Boost Acier @@ -2478,8 +2517,9 @@ ability_id,local_language_id,name 252,7,Alma Acerada 252,8,Spiritoferreo 252,9,Steely Spirit +252,11,はがねのせいしん 252,12,钢之意志 -252,13,Espírito Férreo +253,1,ほろびのボディ 253,3,멸망의바디 253,4,滅亡之軀 253,5,Corps Condamné @@ -2487,8 +2527,9 @@ ability_id,local_language_id,name 253,7,Cuerpo Mortal 253,8,Ultimotocco 253,9,Perish Body +253,11,ほろびのボディ 253,12,灭亡之躯 -253,13,Corpo Perecido +254,1,さまようたましい 254,3,떠도는영혼 254,4,遊魂 254,5,Âme Vagabonde @@ -2496,15 +2537,19 @@ ability_id,local_language_id,name 254,7,Alma Errante 254,8,Anima Errante 254,9,Wandering Spirit +254,11,さまようたましい 254,12,游魂 +255,1,ごりむちゅう 255,3,무아지경 -255,4,猩 +255,4,一猩一意 255,5,Entêtement 255,6,Affenfokus 255,7,Monotema 255,8,Vigorilla 255,9,Gorilla Tactics -255,12,意 +255,11,ごりむちゅう +255,12,一猩一意 +256,1,かがくへんかガス 256,3,화학변화가스 256,4,化學變化氣體 256,5,Gaz Inhibiteur @@ -2512,8 +2557,9 @@ ability_id,local_language_id,name 256,7,Gas Reactivo 256,8,Gas Reagente 256,9,Neutralizing Gas -256,13,化学变化气体 -256,13,Gás Neutralizador +256,11,かがくへんかガス +256,12,化学变化气体 +257,1,パステルベール 257,3,파스텔베일 257,4,粉彩護幕 257,5,Voile Pastel @@ -2521,8 +2567,9 @@ ability_id,local_language_id,name 257,7,Velo Pastel 257,8,Pastelvelo 257,9,Pastel Veil +257,11,パステルベール 257,12,粉彩护幕 -257,13,Véu de Tons Pastéis +258,1,はらぺこスイッチ 258,3,꼬르륵스위치 258,4,飽了又餓 258,5,Déclic Fringale @@ -2530,7 +2577,9 @@ ability_id,local_language_id,name 258,7,Mutapetito 258,8,Pancialterna 258,9,Hunger Switch +258,11,はらぺこスイッチ 258,12,饱了又饿 +259,1,クイックドロウ 259,3,퀵드로 259,4,速擊 259,5,Tir Vif @@ -2538,7 +2587,9 @@ ability_id,local_language_id,name 259,7,Mano Rápida 259,8,Colpolesto 259,9,Quick Draw +259,11,クイックドロウ 259,12,速击 +260,1,ふかしのこぶし 260,3,보이지않는주먹 260,4,無形拳 260,5,Poing Invisible @@ -2546,7 +2597,9 @@ ability_id,local_language_id,name 260,7,Puño Invisible 260,8,Pugni Invisibili 260,9,Unseen Fist +260,11,ふかしのこぶし 260,12,无形拳 +261,1,きみょうなくすり 261,3,기묘한약 261,4,怪藥 261,5,Breuvage Suspect @@ -2554,7 +2607,9 @@ ability_id,local_language_id,name 261,7,Medicina Extraña 261,8,Stranofarmaco 261,9,Curious Medicine +261,11,きみょうなくすり 261,12,怪药 +262,1,トランジスタ 262,3,트랜지스터 262,4,電晶體 262,5,Transistor @@ -2562,15 +2617,19 @@ ability_id,local_language_id,name 262,7,Transistor 262,8,Transistor 262,9,Transistor +262,11,トランジスタ 262,12,电晶体 +263,1,りゅうのあぎと 263,3,용의턱 263,4,龍顎 263,5,Dent de Dragon 263,6,Drachenkiefer 263,7,Mandíbula Dragón 263,8,Dragomascelle -263,9,Dragon's Maw +263,9,Dragon’s Maw +263,11,りゅうのあぎと 263,12,龙颚 +264,1,しろのいななき 264,3,백의울음 264,4,蒼白嘶鳴 264,5,Blanche Ruade @@ -2578,7 +2637,9 @@ ability_id,local_language_id,name 264,7,Relincho Blanco 264,8,Nitrito Bianco 264,9,Chilling Neigh +264,11,しろのいななき 264,12,苍白嘶鸣 +265,1,くろのいななき 265,3,흑의울음 265,4,漆黑嘶鳴 265,5,Sombre Ruade @@ -2586,7 +2647,9 @@ ability_id,local_language_id,name 265,7,Relincho Negro 265,8,Nitrito Nero 265,9,Grim Neigh +265,11,くろのいななき 265,12,漆黑嘶鸣 +266,1,じんばいったい 266,3,혼연일체 266,4,人馬一體 266,5,Osmose Équine @@ -2594,7 +2657,9 @@ ability_id,local_language_id,name 266,7,Unidad Ecuestre 266,8,Sintonia Equina 266,9,As One +266,11,じんばいったい 266,12,人马一体 +267,1,じんばいったい 267,3,혼연일체 267,4,人馬一體 267,5,Osmose Équine @@ -2602,6 +2667,7 @@ ability_id,local_language_id,name 267,7,Unidad Ecuestre 267,8,Sintonia Equina 267,9,As One +267,11,じんばいったい 267,12,人马一体 10001,9,Mountaineer 10002,9,Wave Rider diff --git a/data/v2/csv/move_names.csv b/data/v2/csv/move_names.csv index 66b68a93..cd14e400 100644 --- a/data/v2/csv/move_names.csv +++ b/data/v2/csv/move_names.csv @@ -3,7 +3,7 @@ move_id,local_language_id,name 1,3,막치기 1,4,拍擊 1,5,Écras’Face -1,6,Pfund +1,6,Klaps 1,7,Destructor 1,8,Botta 1,9,Pound @@ -106,7 +106,7 @@ move_id,local_language_id,name 11,6,Klammer 11,7,Agarre 11,8,Presa -11,9,Vice Grip +11,9,Vise Grip 11,11,はさむ 11,12,夹住 12,1,ハサミギロチン @@ -394,7 +394,7 @@ move_id,local_language_id,name 40,4,毒針 40,5,Dard-Venin 40,6,Giftstachel -40,7,Picotazo Ven +40,7,Picotazo Veneno 40,8,Velenospina 40,9,Poison Sting 40,11,どくばり @@ -633,7 +633,7 @@ move_id,local_language_id,name 64,3,쪼기 64,4,啄 64,5,Picpic -64,6,Schnabel +64,6,Pikser 64,7,Picotazo 64,8,Beccata 64,9,Peck @@ -684,7 +684,7 @@ move_id,local_language_id,name 69,4,地球上投 69,5,Frappe Atlas 69,6,Geowurf -69,7,Mov. Sísmico +69,7,Sísmico 69,8,Movim. Sismico 69,9,Seismic Toss 69,11,ちきゅうなげ @@ -1083,7 +1083,7 @@ move_id,local_language_id,name 109,3,이상한빛 109,4,奇異之光 109,5,Onde Folie -109,6,Konfustrahl +109,6,Konfusstrahl 109,7,Rayo Confuso 109,8,Stordiraggio 109,9,Confuse Ray @@ -1184,7 +1184,7 @@ move_id,local_language_id,name 119,4,鸚鵡學舌 119,5,Mimique 119,6,Spiegeltrick -119,7,Mov. Espejo +119,7,Espejo 119,8,Speculmossa 119,9,Mirror Move 119,11,オウムがえし @@ -1363,7 +1363,7 @@ move_id,local_language_id,name 137,3,뱀눈초리 137,4,大蛇瞪眼 137,5,Regard Médusant -137,6,Giftblick +137,6,Schlangenblick 137,7,Deslumbrar 137,8,Sguardo Feroce 137,9,Glare @@ -1394,7 +1394,7 @@ move_id,local_language_id,name 140,4,投球 140,5,Pilonnage 140,6,Stakkato -140,7,Presa +140,7,Bombardeo 140,8,Attacco Pioggia 140,9,Barrage 140,11,たまなげ @@ -1923,7 +1923,7 @@ move_id,local_language_id,name 193,3,꿰뚫어보기 193,4,識破 193,5,Clairvoyance -193,6,Gesichte +193,6,Scharfblick 193,7,Profecía 193,8,Preveggenza 193,9,Foresight @@ -2044,7 +2044,7 @@ move_id,local_language_id,name 205,4,滾動 205,5,Roulade 205,6,Walzer -205,7,Desenrollar +205,7,Rodar 205,8,Rotolamento 205,9,Rollout 205,11,ころがる @@ -2054,7 +2054,7 @@ move_id,local_language_id,name 206,4,點到為止 206,5,Faux-Chage 206,6,Trugschlag -206,7,Falsotortazo +206,7,Falso Tortazo 206,8,Falsofinale 206,9,False Swipe 206,11,みねうち @@ -2713,7 +2713,7 @@ move_id,local_language_id,name 272,3,역할 272,4,扮演 272,5,Imitation -272,6,Rollentausch +272,6,Rollenspiel 272,7,Imitación 272,8,Giocodiruolo 272,9,Role Play @@ -2843,7 +2843,7 @@ move_id,local_language_id,name 285,3,스킬스웹 285,4,特性互換 285,5,Échange -285,6,Wertewechsel +285,6,Fähigkeitstausch 285,7,Intercambio 285,8,Baratto 285,9,Skill Swap @@ -2854,7 +2854,7 @@ move_id,local_language_id,name 286,4,封印 286,5,Possessif 286,6,Begrenzer -286,7,Cerca +286,7,Sellar 286,8,Esclusiva 286,9,Imprison 286,11,ふういん @@ -3044,7 +3044,7 @@ move_id,local_language_id,name 305,4,劇毒牙 305,5,Crochet Venin 305,6,Giftzahn -305,7,Colmillo Ven +305,7,Colmillo Veneno 305,8,Velenodenti 305,9,Poison Fang 305,11,どくどくのキバ @@ -3304,7 +3304,7 @@ move_id,local_language_id,name 331,4,種子機關槍 331,5,Balle Graine 331,6,Kugelsaat -331,7,Recurrente +331,7,Semilladora 331,8,Semitraglia 331,9,Bullet Seed 331,11,タネマシンガン @@ -3745,7 +3745,7 @@ move_id,local_language_id,name 375,5,Échange Psy 375,6,Psybann 375,7,Psicocambio -375,8,Psicotrasfer +375,8,Psicotransfer 375,9,Psycho Shift 375,11,サイコシフト 375,12,精神转移 @@ -3844,7 +3844,7 @@ move_id,local_language_id,name 385,4,防守互換 385,5,Permugarde 385,6,Schutztausch -385,7,Cambia Defensa +385,7,Cambiadefensa 385,8,Barattoscudo 385,9,Guard Swap 385,11,ガードスワップ @@ -5014,7 +5014,7 @@ move_id,local_language_id,name 502,4,交換場地 502,5,Interversion 502,6,Seitentausch -502,7,Cambio Banda +502,7,Cambio de Banda 502,8,Cambiaposto 502,9,Ally Switch 502,11,サイドチェンジ @@ -5078,7 +5078,7 @@ move_id,local_language_id,name 508,8,Cambiomarcia 508,9,Shift Gear 508,11,ギアチェンジ -508,12,换挡 +508,12,换档 509,1,ともえなげ 509,3,배대뒤치기 509,4,巴投 @@ -7288,6 +7288,7 @@ move_id,local_language_id,name 729,8,Sprintaboom 729,9,Zippy Zap 729,11,ばちばちアクセル +729,12,电电加速 730,1,ざぶざぶサーフ 730,3,참방참방서핑 730,4,滔滔衝浪 @@ -7297,6 +7298,7 @@ move_id,local_language_id,name 730,8,Surfasplash 730,9,Splishy Splash 730,11,ざぶざぶサーフ +730,12,滔滔冲浪 731,1,ふわふわフォール 731,3,둥실둥실폴 731,4,飄飄墜落 @@ -7306,6 +7308,7 @@ move_id,local_language_id,name 731,8,Piombaflap 731,9,Floaty Fall 731,11,ふわふわフォール +731,12,飘飘坠落 732,1,ピカピカサンダー 732,3,피카피카썬더 732,4,閃閃雷光 @@ -7315,6 +7318,7 @@ move_id,local_language_id,name 732,8,Pikasaetta 732,9,Pika Papow 732,11,ピカピカサンダー +732,12,闪闪雷光 733,1,いきいきバブル 733,3,생생버블 733,4,活活氣泡 @@ -7324,6 +7328,7 @@ move_id,local_language_id,name 733,8,Bollaslurp 733,9,Bouncy Bubble 733,11,いきいきバブル +733,12,活活气泡 734,1,びりびりエレキ 734,3,찌릿찌릿일렉 734,4,麻麻電擊 @@ -7333,6 +7338,7 @@ move_id,local_language_id,name 734,8,Elettrozap 734,9,Buzzy Buzz 734,11,びりびりエレキ +734,12,麻麻电击 735,1,めらめらバーン 735,3,이글이글번 735,4,熊熊火爆 @@ -7342,6 +7348,7 @@ move_id,local_language_id,name 735,8,Fiammabam 735,9,Sizzly Slide 735,11,めらめらバーン +735,12,熊熊火爆 736,1,どばどばオーラ 736,3,콸콸오라 736,4,嘩嘩氣場 @@ -7349,8 +7356,9 @@ move_id,local_language_id,name 736,6,Pulsieraura 736,7,Espeaura 736,8,Auraswoosh -736,9,Sizzly Slide +736,9,Glitzy Glow 736,11,どばどばオーラ +736,12,哗哗气场 737,1,わるわるゾーン 737,3,아그아그존 737,4,壞壞領域 @@ -7360,6 +7368,7 @@ move_id,local_language_id,name 737,8,Zona Buiabuia 737,9,Baddy Bad 737,11,わるわるゾーン +737,12,坏坏领域 738,1,すくすくボンバー 738,3,쑥쑥봄버 738,4,茁茁轟炸 @@ -7369,6 +7378,7 @@ move_id,local_language_id,name 738,8,Bombafrush 738,9,Sappy Seed 738,11,すくすくボンバー +738,12,茁茁轰炸 739,1,こちこちフロスト 739,3,꽁꽁프로스트 739,4,冰冰霜凍 @@ -7378,6 +7388,7 @@ move_id,local_language_id,name 739,8,Scricchiagelo 739,9,Freezy Frost 739,11,こちこちフロスト +739,12,冰冰霜冻 740,1,きらきらストーム 740,3,반짝반짝스톰 740,4,亮亮風暴 @@ -7387,24 +7398,27 @@ move_id,local_language_id,name 740,8,Sbrilluccibufera 740,9,Sparkly Swirl 740,11,きらきらストーム +740,12,亮亮风暴 741,1,ブイブイブレイク 741,3,브이브이브레이크 -741,4,砰砰撃破 +741,4,砰砰擊破 741,5,Évo-Chardasso 741,6,Evo-Crash 741,7,Eevimpacto 741,8,Eeveempatto 741,9,Veevee Volley 741,11,ブイブイブレイク +741,12,砰砰击破 742,1,ダブルパンツァー 742,3,더블펀처 742,4,鋼拳雙擊 -742,5,Écrous d'Poing +742,5,Écrous d’Poing 742,6,Panzerfäuste 742,7,Ferropuño Doble 742,8,Pugni Corazzati 742,9,Double Iron Bash 742,11,ダブルパンツァー +742,12,钢拳双击 743,1,ダイウォール 743,3,다이월 743,4,極巨防壁 @@ -7414,8 +7428,8 @@ move_id,local_language_id,name 743,8,Dynabarriera 743,9,Max Guard 743,11,ダイウォール -743,12,極巨防壁 -744,1,ダイマックス +743,12,极巨防壁 +744,1,ダイマックスほう 744,3,다이맥스포 744,4,極巨炮 744,5,Canon Dynamax @@ -7423,8 +7437,8 @@ move_id,local_language_id,name 744,7,Cañón Dinamax 744,8,Cannone Dynamax 744,9,Dynamax Cannon -744,11,ダイマックス -744,12,極巨炮 +744,11,ダイマックスほう +744,12,极巨炮 745,1,ねらいうち 745,3,노려맞히기 745,4,狙擊 @@ -7434,7 +7448,7 @@ move_id,local_language_id,name 745,8,Tiromirato 745,9,Snipe Shot 745,11,ねらいうち -745,12,狙擊 +745,12,狙击 746,1,くらいつく 746,3,물고버티기 746,4,緊咬不放 @@ -7444,7 +7458,7 @@ move_id,local_language_id,name 746,8,Morsostretto 746,9,Jaw Lock 746,11,くらいつく -746,12,緊咬不放 +746,12,紧咬不放 747,1,ほおばる 747,3,볼가득넣기 747,4,大快朵頤 @@ -7454,7 +7468,7 @@ move_id,local_language_id,name 747,8,Riempiguance 747,9,Stuff Cheeks 747,11,ほおばる -747,12,大快朵頤 +747,12,大快朵颐 748,1,はいすいのじん 748,3,배수의진 748,4,背水一戰 @@ -7464,7 +7478,7 @@ move_id,local_language_id,name 748,8,Spalle al Muro 748,9,No Retreat 748,11,はいすいのじん -748,12,背水一戰 +748,12,背水一战 749,1,タールショット 749,3,타르숏 749,4,瀝青射擊 @@ -7474,7 +7488,7 @@ move_id,local_language_id,name 749,8,Colpocatrame 749,9,Tar Shot 749,11,タールショット -749,12,瀝青射擊 +749,12,沥青射击 750,1,まほうのこな 750,3,마법가루 750,4,魔法粉 @@ -7494,7 +7508,7 @@ move_id,local_language_id,name 751,8,Dragofrecce 751,9,Dragon Darts 751,11,ドラゴンアロー -751,12,龍箭 +751,12,龙箭 752,1,おちゃかい 752,3,다과회 752,4,茶會 @@ -7504,7 +7518,7 @@ move_id,local_language_id,name 752,8,Ora del Tè 752,9,Teatime 752,11,おちゃかい -752,12,茶會 +752,12,茶会 753,1,たこがため 753,3,문어굳히기 753,4,蛸固 @@ -7524,8 +7538,8 @@ move_id,local_language_id,name 754,8,Beccoshock 754,9,Bolt Beak 754,11,でんげきくちばし -754,12,電喙 -755,1,エラ +754,12,电喙 +755,1,エラがみ 755,3,아가미물기 755,4,鰓咬 755,5,Branchicrok @@ -7533,8 +7547,8 @@ move_id,local_language_id,name 755,7,Branquibocado 755,8,Branchiomorso 755,9,Fishious Rend -755,11,エラ -755,12,鰓咬 +755,11,エラがみ +755,12,鳃咬 756,1,コートチェンジ 756,3,코트체인지 756,4,換場 @@ -7544,7 +7558,7 @@ move_id,local_language_id,name 756,8,Cambiocampo 756,9,Court Change 756,11,コートチェンジ -756,12,換場 +756,12,换场 757,1,ダイバーン 757,3,다이번 757,4,極巨火爆 @@ -7554,7 +7568,7 @@ move_id,local_language_id,name 757,8,Dynafiammata 757,9,Max Flare 757,11,ダイバーン -757,12,極巨火爆 +757,12,极巨火爆 758,1,ダイワーム 758,3,다이웜 758,4,極巨蟲蠱 @@ -7564,7 +7578,7 @@ move_id,local_language_id,name 758,8,Dynainsetto 758,9,Max Flutterby 758,11,ダイワーム -758,12,極巨蟲蠱 +758,12,极巨虫蛊 759,1,ダイサンダー 759,3,다이썬더 759,4,極巨閃電 @@ -7574,7 +7588,7 @@ move_id,local_language_id,name 759,8,Dynasaetta 759,9,Max Lightning 759,11,ダイサンダー -759,12,極巨閃電 +759,12,极巨闪电 760,1,ダイアタック 760,3,다이어택 760,4,極巨攻擊 @@ -7584,7 +7598,7 @@ move_id,local_language_id,name 760,8,Dynattacco 760,9,Max Strike 760,11,ダイアタック -760,12,極巨攻擊 +760,12,极巨攻击 761,1,ダイナックル 761,3,다이너클 761,4,極巨拳鬥 @@ -7594,7 +7608,7 @@ move_id,local_language_id,name 761,8,Dynapugno 761,9,Max Knuckle 761,11,ダイナックル -761,12,極巨拳鬥 +761,12,极巨拳斗 762,1,ダイホロウ 762,3,다이할로우 762,4,極巨幽魂 @@ -7604,7 +7618,7 @@ move_id,local_language_id,name 762,8,Dynavuoto 762,9,Max Phantasm 762,11,ダイホロウ -762,12,極巨幽魂 +762,12,极巨幽魂 763,1,ダイアイス 763,3,다이아이스 763,4,極巨寒冰 @@ -7614,7 +7628,7 @@ move_id,local_language_id,name 763,8,Dynagelo 763,9,Max Hailstorm 763,11,ダイアイス -763,12,極巨寒冰 +763,12,极巨寒冰 764,1,ダイアシッド 764,3,다이애시드 764,4,極巨酸毒 @@ -7624,7 +7638,7 @@ move_id,local_language_id,name 764,8,Dynacorrosione 764,9,Max Ooze 764,11,ダイアシッド -764,12,極巨酸毒 +764,12,极巨酸毒 765,1,ダイストリーム 765,3,다이스트림 765,4,極巨水流 @@ -7634,7 +7648,7 @@ move_id,local_language_id,name 765,8,Dynaflusso 765,9,Max Geyser 765,11,ダイストリーム -765,12,極巨水流 +765,12,极巨水流 766,1,ダイジェット 766,3,다이제트 766,4,極巨飛衝 @@ -7644,7 +7658,7 @@ move_id,local_language_id,name 766,8,Dynajet 766,9,Max Airstream 766,11,ダイジェット -766,12,極巨飛衝 +766,12,极巨飞冲 767,1,ダイフェアリー 767,3,다이페어리 767,4,極巨妖精 @@ -7654,7 +7668,7 @@ move_id,local_language_id,name 767,8,Dynafata 767,9,Max Starfall 767,11,ダイフェアリー -767,12,極巨妖精 +767,12,极巨妖精 768,1,ダイドラグーン 768,3,다이드라군 768,4,極巨龍騎 @@ -7664,7 +7678,7 @@ move_id,local_language_id,name 768,8,Dynadragone 768,9,Max Wyrmwind 768,11,ダイドラグーン -768,12,極巨龍騎 +768,12,极巨龙骑 769,1,ダイサイコ 769,3,다이사이코 769,4,極巨超能 @@ -7674,7 +7688,7 @@ move_id,local_language_id,name 769,8,Dynapsiche 769,9,Max Mindstorm 769,11,ダイサイコ -769,12,極巨超能 +769,12,极巨超能 770,1,ダイロック 770,3,다이록 770,4,極巨岩石 @@ -7684,7 +7698,7 @@ move_id,local_language_id,name 770,8,Dynamacigno 770,9,Max Rockfall 770,11,ダイロック -770,12,極巨岩石 +770,12,极巨岩石 771,1,ダイアース 771,3,다이어스 771,4,極巨大地 @@ -7694,7 +7708,7 @@ move_id,local_language_id,name 771,8,Dynasisma 771,9,Max Quake 771,11,ダイアース -771,12,極巨大地 +771,12,极巨大地 772,1,ダイアーク 772,3,다이아크 772,4,極巨惡霸 @@ -7704,7 +7718,7 @@ move_id,local_language_id,name 772,8,Dynatenebre 772,9,Max Darkness 772,11,ダイアーク -772,12,極巨惡霸 +772,12,极巨恶霸 773,1,ダイソウゲン 773,3,다이그래스 773,4,極巨草原 @@ -7714,7 +7728,7 @@ move_id,local_language_id,name 773,8,Dynaflora 773,9,Max Overgrowth 773,11,ダイソウゲン -773,12,極巨草原 +773,12,极巨草原 774,1,ダイスチル 774,3,다이스틸 774,4,極巨鋼鐵 @@ -7724,7 +7738,7 @@ move_id,local_language_id,name 774,8,Dynametallo 774,9,Max Steelspike 774,11,ダイスチル -774,12,極巨鋼鐵 +774,12,极巨钢铁 775,1,ソウルビート 775,3,소울비트 775,4,魂舞烈音爆 @@ -7744,7 +7758,7 @@ move_id,local_language_id,name 776,8,Schiacciacorpo 776,9,Body Press 776,11,ボディプレス -776,12,撲擊 +776,12,扑击 777,1,デコレーション 777,3,데코레이션 777,4,裝飾 @@ -7754,7 +7768,7 @@ move_id,local_language_id,name 777,8,Decorazione 777,9,Decorate 777,11,デコレーション -777,12,裝飾 +777,12,装饰 778,1,ドラムアタック 778,3,드럼어택 778,4,鼓擊 @@ -7764,7 +7778,7 @@ move_id,local_language_id,name 778,8,Tamburattacco 778,9,Drum Beating 778,11,ドラムアタック -778,12,鼓擊 +778,12,鼓击 779,1,トラバサミ 779,3,집게덫 779,4,捕獸夾 @@ -7774,8 +7788,8 @@ move_id,local_language_id,name 779,8,Tagliola 779,9,Snap Trap 779,11,トラバサミ -779,12,捕獸夾 -780,1,かえん +779,12,捕兽夹 +780,1,かえんボール 780,3,화염볼 780,4,火焰球 780,5,Ballon Brûlant @@ -7783,7 +7797,7 @@ move_id,local_language_id,name 780,7,Balón Ígneo 780,8,Palla Infuocata 780,9,Pyro Ball -780,11,かえん +780,11,かえんボール 780,12,火焰球 781,1,きょじゅうざん 781,3,거수참 @@ -7794,7 +7808,7 @@ move_id,local_language_id,name 781,8,Taglio Maestoso 781,9,Behemoth Blade 781,11,きょじゅうざん -781,12,巨獸斬 +781,12,巨兽斩 782,1,きょじゅうだん 782,3,거수탄 782,4,巨獸彈 @@ -7804,17 +7818,17 @@ move_id,local_language_id,name 782,8,Colpo Maestoso 782,9,Behemoth Bash 782,11,きょじゅうだん -782,12,巨獸彈 -783,1,オーラ +782,12,巨兽弹 +783,1,オーラぐるま 783,3,오라휠 783,4,氣場輪 783,5,Roue Libre 783,6,Aura-Rad 783,7,Rueda Aural -783,8,Ruota d'Aura +783,8,Ruota d’Aura 783,9,Aura Wheel -783,11,オーラ -783,12,氣場輪 +783,11,オーラぐるま +783,12,气场轮 784,1,ワイドブレイカー 784,3,와이드브레이커 784,4,廣域破壞 @@ -7824,7 +7838,17 @@ move_id,local_language_id,name 784,8,Vastoimpatto 784,9,Breaking Swipe 784,11,ワイドブレイカー -784,12,廣域破壞 +784,12,广域破坏 +785,1,えだづき +785,3,가지찌르기 +785,4,木枝突刺 +785,5,Tapotige +785,6,Zweigstoß +785,7,Punzada Rama +785,8,Ramostoccata +785,9,Branch Poke +785,11,えだづき +785,12,木枝突刺 786,1,オーバードライブ 786,3,오버드라이브 786,4,破音 @@ -7844,17 +7868,17 @@ move_id,local_language_id,name 787,8,Acido Malico 787,9,Apple Acid 787,11,りんごさん -787,12,蘋果酸 -788,1, -788,3, +787,12,苹果酸 +788,1,Ｇのちから +788,3,G의힘 788,4,萬有引力 788,5,Force G 788,6,Gravitation 788,7,Fuerza G 788,8,Forza G 788,9,Grav Apple -788,11, -788,12,萬有引力 +788,11,Ｇのちから +788,12,万有引力 789,1,ソウルクラッシュ 789,3,소울크래시 789,4,靈魂衝擊 @@ -7864,7 +7888,7 @@ move_id,local_language_id,name 789,8,Frantumanima 789,9,Spirit Break 789,11,ソウルクラッシュ -789,12,靈魂衝擊 +789,12,灵魂冲击 790,1,ワンダースチーム 790,3,원더스팀 790,4,神奇蒸汽 @@ -7894,7 +7918,7 @@ move_id,local_language_id,name 792,8,Sbarramento 792,9,Obstruct 792,11,ブロッキング -792,12,攔堵 +792,12,拦堵 793,1,どげざつき 793,3,사죄의찌르기 793,4,假跪真撞 @@ -7914,7 +7938,7 @@ move_id,local_language_id,name 794,8,Sfolgorassalto 794,9,Meteor Assault 794,11,スターアサルト -794,12,流星突擊 +794,12,流星突击 795,1,ムゲンダイビーム 795,3,무한다이빔 795,4,無極光束 @@ -7924,137 +7948,317 @@ move_id,local_language_id,name 795,8,Raggio Infinito 795,9,Eternabeam 795,11,ムゲンダイビーム -795,12,無極光束 +795,12,无极光束 796,1,てっていこうせん 796,3,철제광선 796,4,鐵蹄光線 796,5,Métalaser 796,6,Stahlstrahl 796,7,Metaláser -796,8,Raggio d'Acciaio +796,8,Raggio d’Acciaio 796,9,Steel Beam 796,11,てっていこうせん -796,12,鐵蹄光線 +796,12,铁蹄光线 +797,1,ワイドフォース 797,3,와이드포스 +797,4,廣域戰力 797,5,Vaste Pouvoir +797,6,Flächenmacht 797,7,Vasta Fuerza +797,8,Vastenergia 797,9,Expanding Force +797,11,ワイドフォース +797,12,广域战力 +798,1,アイアンローラー 798,3,아이언롤러 +798,4,鐵滾輪 798,5,Métalliroue +798,6,Eisenwalze 798,7,Allanador Férreo +798,8,Ferrorullo 798,9,Steel Roller +798,11,アイアンローラー +798,12,铁滚轮 +799,1,スケイルショット 799,3,스케일샷 +799,4,鱗射 799,5,Rafale Écailles +799,6,Schuppenschuss 799,7,Ráfaga Escamas +799,8,Squamacolpo 799,9,Scale Shot +799,11,スケイルショット +799,12,鳞射 +800,1,メテオビーム 800,3,메테오빔 +800,4,流星光束 800,5,Laser Météore +800,6,Meteorstrahl 800,7,Rayo Meteórico +800,8,Raggiometeora 800,9,Meteor Beam +800,11,メテオビーム +800,12,流星光束 +801,1,シェルアームズ 801,3,셸암즈 +801,4,臂貝武器 801,5,Kokiyarme +801,6,Muschelwaffe 801,7,Moluscañón +801,8,Armaguscio 801,9,Shell Side Arm +801,11,シェルアームズ +801,12,臂贝武器 +802,1,ミストバースト 802,3,미스트버스트 +802,4,薄霧炸裂 802,5,Explo-Brume +802,6,Nebelexplosion 802,7,Bruma Explosiva +802,8,Nebbioscoppio 802,9,Misty Explosion -803,3,그래스슬라이더 -803,5,Gliss'Herbe +802,11,ミストバースト +802,12,薄雾炸裂 +803,1,グラススライダー +803,3,그래스슬라이더 +803,4,青草滑梯 +803,5,Gliss’Herbe +803,6,Grasrutsche 803,7,Fitoimpulso +803,8,Erboscivolata 803,9,Grassy Glide +803,11,グラススライダー +803,12,青草滑梯 +804,1,ライジングボルト 804,3,라이징볼트 +804,4,電力上升 804,5,Monte-Tension +804,6,Hochspannung 804,7,Alto Voltaje +804,8,Elettroimpennata 804,9,Rising Voltage +804,11,ライジングボルト +804,12,电力上升 +805,1,だいちのはどう 805,3,대지의파동 +805,4,大地波動 805,5,Champlification +805,6,Feldimpuls 805,7,Pulso de Campo +805,8,Campopulsar 805,9,Terrain Pulse +805,11,だいちのはどう +805,12,大地波动 +806,1,はいよるいちげき 806,3,엄습하는일격 +806,4,爬擊 806,5,Ravage Rampant +806,6,Krabbelkracher 806,7,Golpe Rastrero +806,8,Strisciacolpo 806,9,Skitter Smack +806,11,はいよるいちげき +806,12,爬击 +807,1,しっとのほのお 807,3,질투의불꽃 +807,4,妒火 807,5,Feu Envieux +807,6,Neidflammen 807,7,Envidia Ardiente +807,8,Fiamminvidia 807,9,Burning Jealousy +807,11,しっとのほのお +807,12,妒火 +808,1,うっぷんばらし 808,3,분풀이 +808,4,洩憤 808,5,Cent Rancunes +808,6,Frustventil 808,7,Desahogo +808,8,Sfogarabbia 808,9,Lash Out +808,11,うっぷんばらし +808,12,泄愤 +809,1,ポルターガイスト 809,3,폴터가이스트 +809,4,靈騷 809,5,Esprit Frappeur +809,6,Poltergeist 809,7,Poltergeist +809,8,Poltergeist 809,9,Poltergeist +809,11,ポルターガイスト +809,12,灵骚 +810,1,ふしょくガス 810,3,부식가스 +810,4,腐蝕氣體 810,5,Gaz Corrosif +810,6,Korrosionsgas 810,7,Gas Corrosivo +810,8,Gas Corrosivo 810,9,Corrosive Gas +810,11,ふしょくガス +810,12,腐蚀气体 +811,1,コーチング 811,3,코칭 +811,4,指導 811,5,Coaching +811,6,Coaching 811,7,Motivación +811,8,Coaching 811,9,Coaching +811,11,コーチング +811,12,指导 +812,1,クイックターン 812,3,퀵턴 +812,4,快速折返 812,5,Eau Revoir +812,6,Rollwende 812,7,Viraje +812,8,Virata 812,9,Flip Turn +812,11,クイックターン +812,12,快速折返 +813,1,トリプルアクセル 813,3,트리플악셀 +813,4,三旋擊 813,5,Triple Axel +813,6,Dreifach-Axel 813,7,Triple Axel +813,8,Triplo Axel 813,9,Triple Axel +813,11,トリプルアクセル +813,12,三旋击 +814,1,ダブルウイング 814,3,더블윙 +814,4,雙翼 814,5,Double Volée +814,6,Doppelflügel 814,7,Ala Bis +814,8,Doppia Ala 814,9,Dual Wingbeat -815,3,열사의대지t +814,11,ダブルウイング +814,12,双翼 +815,1,ねっさのだいち +815,3,열사의대지 +815,4,熱沙大地 815,5,Sable Ardent +815,6,Brandsand 815,7,Arenas Ardientes +815,8,Sabbiardente 815,9,Scorching Sands +815,11,ねっさのだいち +815,12,热沙大地 +816,1,ジャングルヒール 816,3,정글힐 +816,4,叢林治療 816,5,Selve Salvatrice +816,6,Dschungelheilung 816,7,Cura Selvática +816,8,Giunglacura 816,9,Jungle Healing +816,11,ジャングルヒール +816,12,丛林治疗 +817,1,あんこくきょうだ 817,3,암흑강타 +817,4,暗冥強擊 817,5,Poing Obscur +817,6,Finstertreffer 817,7,Golpe Oscuro +817,8,Pugnotenebra 817,9,Wicked Blow +817,11,あんこくきょうだ +817,12,暗冥强击 +818,1,すいりゅうれんだ 818,3,수류연타 +818,4,水流連打 818,5,Torrent de Coups +818,6,Trefferschwall 818,7,Azote Torrencial +818,8,Idroraffica 818,9,Surging Strikes +818,11,すいりゅうれんだ +818,12,水流连打 +819,1,サンダープリズン 819,3,썬더프리즌 +819,4,雷電囚籠 819,5,Voltageôle +819,6,Blitzgefängnis 819,7,Electrojaula +819,8,Elettrogabbia 819,9,Thunder Cage +819,11,サンダープリズン +819,12,雷电囚笼 +820,1,ドラゴンエナジー 820,3,드래곤에너지 +820,4,巨龍威能 820,5,Draco-Énergie +820,6,Drachenkräfte 820,7,Dracoenergía +820,8,Dragoenergia 820,9,Dragon Energy +820,11,ドラゴンエナジー +820,12,巨龙威能 +821,1,いてつくしせん 821,3,얼어붙는시선 +821,4,冰冷視線 821,5,Regard Glaçant +821,6,Eisiger Blick 821,7,Mirada Heladora +821,8,Sguardo Gelido 821,9,Freezing Glare +821,11,いてつくしせん +821,12,冰冷视线 +822,1,もえあがるいかり 822,3,타오르는분노 +822,4,怒火中燒 822,5,Fureur Ardente +822,6,Brennender Zorn 822,7,Furia Candente +822,8,Furia Ardente 822,9,Fiery Wrath +822,11,もえあがるいかり +822,12,怒火中烧 +823,1,らいめいげり 823,3,천둥차기 +823,4,雷鳴蹴擊 823,5,Coup Fulgurant +823,6,Donnernder Tritt 823,7,Patada Relámpago +823,8,Calcio Tonante 823,9,Thunderous Kick +823,11,らいめいげり +823,12,雷鸣蹴击 +824,1,ブリザードランス 824,3,블리자드랜스 +824,4,雪矛 824,5,Lance de Glace +824,6,Blizzardlanze 824,7,Lanza Glacial +824,8,Lancia Glaciale 824,9,Glacial Lance +824,11,ブリザードランス +824,12,雪矛 +825,1,アストラルビット 825,3,아스트랄비트 +825,4,星碎 825,5,Éclat Spectral +825,6,Astralfragmente 825,7,Orbes Espectro +825,8,Schegge Astrali 825,9,Astral Barrage +825,11,アストラルビット +825,12,星碎 +826,1,ぶきみなじゅもん 826,3,섬뜩한주문 +826,4,詭異咒語 826,5,Sort Sinistre +826,6,Schauderspruch 826,7,Conjuro Funesto +826,8,Inquietantesimo 826,9,Eerie Spell +826,11,ぶきみなじゅもん +826,12,诡异咒语 10001,1,ダークラッシュ 10001,5,Charge Noire 10001,6,Cryptoschlag diff --git a/data/v2/csv/moves.csv b/data/v2/csv/moves.csv index 84e822de..d37e68ba 100644 --- a/data/v2/csv/moves.csv +++ b/data/v2/csv/moves.csv @@ -9,7 +9,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 8,ice-punch,1,15,75,15,100,0,10,2,6,10,2,1,17 9,thunder-punch,1,13,75,15,100,0,10,2,7,10,1,1,17 10,scratch,1,1,40,35,100,0,10,2,1,,5,1,5 -11,vice-grip,1,1,55,30,100,0,10,2,1,,5,1,5 +11,vise-grip,1,1,55,30,100,0,10,2,1,,5,1,5 12,guillotine,1,1,,5,30,0,10,2,39,,1,14,9 13,razor-wind,1,1,80,10,100,0,11,3,40,,1,2,6 14,swords-dance,1,1,,20,,0,7,1,51,,2,32,11 From 3c53e4f751293e1f40650b9920a409202d5dccf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 12 May 2021 19:34:59 +0200 Subject: [PATCH 052/113] try: downgrade django --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 860c00c2..3c16308e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==2.2.20 +Django==2.1.11 Unipath==1.1 coverage==4.5.1 django-appconf==1.0.4 From 18480444891bfda3d47eabe8d10a654280033f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 12 May 2021 19:42:21 +0200 Subject: [PATCH 053/113] try: downgrade django-redis --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3c16308e..8d426c39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ coverage==4.5.1 django-appconf==1.0.4 django-cors-headers==2.5.3 django-discover-runner==1.0 -django-redis==4.12.1 +django-redis==4.10.0 django-cachalot==2.3.5 django-tastypie==0.14.3 djangorestframework==3.10.3 From 3bbc9da829d3472adc0b0d917d4776d873cde326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 12 May 2021 19:52:58 +0200 Subject: [PATCH 054/113] try: downgrade djangorestframework --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8d426c39..9f26db35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ django-discover-runner==1.0 django-redis==4.10.0 django-cachalot==2.3.5 django-tastypie==0.14.3 -djangorestframework==3.10.3 +djangorestframework==3.9.0 drf-ujson==1.2.0 gunicorn==20.1.0 mimeparse==0.1.3 From ed8ccbe7e029918e1864be9874ae61f113e7f55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 13 May 2021 20:45:36 +0200 Subject: [PATCH 055/113] data: add missing move --- data/v2/csv/moves.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/data/v2/csv/moves.csv b/data/v2/csv/moves.csv index d37e68ba..ffbc3231 100644 --- a/data/v2/csv/moves.csv +++ b/data/v2/csv/moves.csv @@ -783,6 +783,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 782,behemoth-bash,8,9,100,5,100,0,10,2,,,,, 783,aura-wheel,8,13,110,10,100,0,10,2,,,,, 784,breaking-swipe,8,16,60,15,100,0,11,2,,,,, +784,branch-poke,8,12,40,40,100,0,11,2,,,,, 786,overdrive,8,13,80,10,100,0,11,3,,,,, 787,apple-acid,8,12,80,10,100,0,10,3,,,,, 788,grav-apple,8,12,80,10,100,0,10,2,,,,, From fef9cd6efc4a02fc0a71e34e2c353d24e6b9ee60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 13 May 2021 21:03:06 +0200 Subject: [PATCH 056/113] data: fix id --- data/v2/csv/moves.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/csv/moves.csv b/data/v2/csv/moves.csv index ffbc3231..fb9ae6b0 100644 --- a/data/v2/csv/moves.csv +++ b/data/v2/csv/moves.csv @@ -783,7 +783,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 782,behemoth-bash,8,9,100,5,100,0,10,2,,,,, 783,aura-wheel,8,13,110,10,100,0,10,2,,,,, 784,breaking-swipe,8,16,60,15,100,0,11,2,,,,, -784,branch-poke,8,12,40,40,100,0,11,2,,,,, +785,branch-poke,8,12,40,40,100,0,11,2,,,,, 786,overdrive,8,13,80,10,100,0,11,3,,,,, 787,apple-acid,8,12,80,10,100,0,10,3,,,,, 788,grav-apple,8,12,80,10,100,0,10,2,,,,, From 292d9e8da5e5780cbcc3987d128828945ee0ecdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 14 May 2021 14:53:42 +0200 Subject: [PATCH 057/113] try: update patch --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9f26db35..4c412527 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==2.1.11 +Django==2.1.15 Unipath==1.1 coverage==4.5.1 django-appconf==1.0.4 @@ -7,7 +7,7 @@ django-discover-runner==1.0 django-redis==4.10.0 django-cachalot==2.3.5 django-tastypie==0.14.3 -djangorestframework==3.9.0 +djangorestframework==3.9.4 drf-ujson==1.2.0 gunicorn==20.1.0 mimeparse==0.1.3 From 234b6129043b57d38ec018f74460cf3af4c3d03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 14 May 2021 18:29:02 +0200 Subject: [PATCH 058/113] chore: remove unnecessary volume --- Resources/docker/app/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/docker/app/Dockerfile b/Resources/docker/app/Dockerfile index 51b553c4..a859a749 100644 --- a/Resources/docker/app/Dockerfile +++ b/Resources/docker/app/Dockerfile @@ -6,7 +6,6 @@ ENV PYTHONHASHSEED 'random' RUN mkdir /code WORKDIR /code -VOLUME /code ADD requirements.txt /code/ RUN \ From d8b867355e72af6eed11ad4bc313f900da088afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 14 May 2021 19:48:14 +0200 Subject: [PATCH 059/113] feat: read env when creating containers --- Resources/compose/docker-compose-prod-graphql.yml | 2 +- config/docker-compose.py | 2 +- docker-compose.yml | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/compose/docker-compose-prod-graphql.yml b/Resources/compose/docker-compose-prod-graphql.yml index fcdf1bca..d50c8e58 100644 --- a/Resources/compose/docker-compose-prod-graphql.yml +++ b/Resources/compose/docker-compose-prod-graphql.yml @@ -14,7 +14,7 @@ services: graphql-engine: environment: - HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/pokeapi" + HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-pokeapi}" HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" graphiql: diff --git a/config/docker-compose.py b/config/docker-compose.py index f8dffe4c..185878ce 100644 --- a/config/docker-compose.py +++ b/config/docker-compose.py @@ -5,7 +5,7 @@ from .settings import * DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql_psycopg2", - "NAME": "pokeapi", + "NAME": os.environ.get("POSTGRES_DB", "pokeapi"), "USER": os.environ.get("POSTGRES_USER", "ash"), "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "pokemon"), "HOST": "db", diff --git a/docker-compose.yml b/docker-compose.yml index 28a2dfff..f2d5814a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,9 +9,9 @@ services: db: image: postgres environment: - POSTGRES_PASSWORD: 'pokemon' - POSTGRES_USER: 'ash' - POSTGRES_DB: 'pokeapi' + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon} + POSTGRES_USER: ${POSTGRES_USER:-ash} + POSTGRES_DB: ${POSTGRES_DB:-pokeapi} volumes: - pg_data:/var/lib/postgresql/data restart: always @@ -20,6 +20,10 @@ services: build: context: . dockerfile: ./Resources/docker/app/Dockerfile + environment: + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon} + POSTGRES_USER: ${POSTGRES_USER:-ash} + POSTGRES_DB: ${POSTGRES_DB:-pokeapi} volumes: - .:/code links: @@ -53,11 +57,11 @@ services: - "db" restart: always environment: - HASURA_GRAPHQL_DATABASE_URL: postgres://ash:pokemon@db:5432/pokeapi + HASURA_GRAPHQL_DATABASE_URL: postgres://${POSTGRES_USER:-ash}:${POSTGRES_PASSWORD:-pokemon}@db:5432/${POSTGRES_DB:-pokeapi} HASURA_GRAPHQL_ENABLE_CONSOLE: "true" HASURA_GRAPHQL_DEV_MODE: "false" HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log - HASURA_GRAPHQL_ADMIN_SECRET: pokemon + HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-pokemon} HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anon HASURA_GRAPHQL_ENABLE_TELEMETRY: "false" # HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets From 54177a5ea978601a86e65560415b99cffd23b77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 14 May 2021 19:48:59 +0200 Subject: [PATCH 060/113] perf: better docker ignore --- .dockerignore | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index f939117b..dd4e3be5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,14 +1,27 @@ .git .gitignore +.gitmodules CONTRIBUTORS.txt LICENSE.rst README.md -*.pyc +**/*.pyc *media/* *static/* *build/* -*.DS_STORE +**/*.DS_STORE db.* venv* node_modules +Resources +graphql +.vscode +.github +.circleci +docker-compose.yml +.dockerignore +/*.md +/*.js +.env +*pycache* +target \ No newline at end of file From ad0e42e7b710d84eeab52cf442d58a2bd2e5b734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 14 May 2021 19:49:23 +0200 Subject: [PATCH 061/113] chore: run as nobody/expose correct port --- Resources/docker/app/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/docker/app/Dockerfile b/Resources/docker/app/Dockerfile index a859a749..b2f16de0 100644 --- a/Resources/docker/app/Dockerfile +++ b/Resources/docker/app/Dockerfile @@ -15,5 +15,6 @@ RUN \ apk --purge del .build-deps ADD . /code/ +USER nobody CMD gunicorn config.wsgi:application -c gunicorn.py.ini -EXPOSE 8000 +EXPOSE 80 From c159244fbd19caac9c301fe9ff54527d2745d20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 15 May 2021 14:49:16 +0200 Subject: [PATCH 062/113] feat: publish docker images --- .github/workflows/docker-image.yml | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..dcdb2e71 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,50 @@ +name: ci + +on: + push: + branches: + - 'master' + - 'docker-images' + tags: + - '*.*.*' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + submodules: 'true' + - + name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + # list of Docker images to use as base name for tags + images: | + pokeapi/pokeapi + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME_NARAMSIM }} + password: ${{ secrets.DOCKERHUB_TOKEN_NARAMSIM }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + - + name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} From 0faa2e52af70687a21d4c86f2d07be22d75875b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 15 May 2021 14:54:52 +0200 Subject: [PATCH 063/113] fix: use correct syntax for submodules --- .github/workflows/docker-image.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index dcdb2e71..2f4bd20d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,7 +15,8 @@ jobs: - name: Checkout uses: actions/checkout@v2 - submodules: 'true' + with: + submodules: recursive - name: Docker meta id: meta From 3b99db93eb75dfff421e3da2ddc397cf33a3e863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 15 May 2021 15:04:15 +0200 Subject: [PATCH 064/113] fix: pass path --- .github/workflows/docker-image.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2f4bd20d..9819766e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -43,6 +43,8 @@ jobs: id: docker_build uses: docker/build-push-action@v2 with: + context: . + file: ./Resources/docker/app/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 2b15f01380353fcec698d13f204ddf65b93943c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 15 May 2021 15:08:47 +0200 Subject: [PATCH 065/113] feat: disable custom branch/enable staging branch --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9819766e..a9d9c004 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,7 +4,7 @@ on: push: branches: - 'master' - - 'docker-images' + - 'staging' tags: - '*.*.*' From 1a3e61ec0e70758e4c5be412aaa9706c73a4d933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 16 May 2021 20:48:50 +0200 Subject: [PATCH 066/113] fix: allow postgres&redis locaion customization --- Resources/docker/app/README.md | 35 ++++++++++++++++++++++++++++++++++ config/docker-compose.py | 7 +++---- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 Resources/docker/app/README.md diff --git a/Resources/docker/app/README.md b/Resources/docker/app/README.md new file mode 100644 index 00000000..54b5e060 --- /dev/null +++ b/Resources/docker/app/README.md @@ -0,0 +1,35 @@ +# Quick reference + +- **Maintained by**: + [the PokeAPI Contributors](https://github.com/PokeAPI/pokeapi/graphs/contributors) + +- **Where to get help**: + [PokeAPI Slack](http://pokeapi.slack.com/). + +- **Where to file issues**: + [https://github.com/PokeAPI/pokeapi/issues](https://github.com/PokeAPI/pokeapi/issues) + +- **Source of this description**: + [pokeapi repo's `Resources/docker/app/` directory](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/README.md) + +## Supported tags and respective `Dockerfile` links + +- [`latest`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile) + +## What is PokeAPI? + +PokeAPI is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series. + +> [pokeapi.co](https://pokeapi.co/) + +![logo](https://raw.githubusercontent.com/PokeAPI/media/master/logo/pokeapi_256.png) + +## How to use this image + +This container connects to a Postgres database via the environment variables `POSTGRES_DB`, `POSTGRES_USER`, `POSTGRES_PASSWORD`, `POSTGRES_HOST`, `POSTGRES_PORT`. + +The container connects to a Redis cache via the environment variable `REDIS_CONNECTION_STRING`. + +### Run the container using Compose + +The container exposes port `80`. It's recommended to use the provided [docker-compose.yml](https://github.com/PokeAPI/pokeapi/blob/master/docker-compose.yml) to start a container from this image. diff --git a/config/docker-compose.py b/config/docker-compose.py index 185878ce..6ba14aab 100644 --- a/config/docker-compose.py +++ b/config/docker-compose.py @@ -8,16 +8,15 @@ DATABASES = { "NAME": os.environ.get("POSTGRES_DB", "pokeapi"), "USER": os.environ.get("POSTGRES_USER", "ash"), "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "pokemon"), - "HOST": "db", - "PORT": 5432, + "HOST": os.environ.get("POSTGRES_HOST", "db"), + "PORT": os.environ.get("POSTGRES_PORT", 5432) } } - CACHES = { "default": { "BACKEND": "django_redis.cache.RedisCache", - "LOCATION": "redis://cache:6379/1", + "LOCATION": os.environ.get("REDIS_CONNECTION_STRING", "redis://cache:6379/1") , "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", }, From c0dd3004de3d86e6fc8ff9f417eb1fd44af80cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 16 May 2021 22:13:07 +0200 Subject: [PATCH 067/113] chore: lint --- config/docker-compose.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/docker-compose.py b/config/docker-compose.py index 6ba14aab..e1386005 100644 --- a/config/docker-compose.py +++ b/config/docker-compose.py @@ -9,14 +9,14 @@ DATABASES = { "USER": os.environ.get("POSTGRES_USER", "ash"), "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "pokemon"), "HOST": os.environ.get("POSTGRES_HOST", "db"), - "PORT": os.environ.get("POSTGRES_PORT", 5432) + "PORT": os.environ.get("POSTGRES_PORT", 5432), } } CACHES = { "default": { "BACKEND": "django_redis.cache.RedisCache", - "LOCATION": os.environ.get("REDIS_CONNECTION_STRING", "redis://cache:6379/1") , + "LOCATION": os.environ.get("REDIS_CONNECTION_STRING", "redis://cache:6379/1"), "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", }, From 4fa15f979f6938774d0ad7e70b8242c8a14925f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 17 May 2021 16:48:30 +0200 Subject: [PATCH 068/113] sync(sprites) --- data/v2/sprites | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/v2/sprites b/data/v2/sprites index 9e153cef..d41c408f 160000 --- a/data/v2/sprites +++ b/data/v2/sprites @@ -1 +1 @@ -Subproject commit 9e153cefb7822564678646176cf847f64adbc028 +Subproject commit d41c408f7e5be9848260f470e34069c264091a69 From c986e75a089c610ec459689df8adef3e870886d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 17 May 2021 22:08:04 +0200 Subject: [PATCH 069/113] fix: drop nobody for new user pokeapi --- Resources/docker/app/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/docker/app/Dockerfile b/Resources/docker/app/Dockerfile index b2f16de0..f43c4e1b 100644 --- a/Resources/docker/app/Dockerfile +++ b/Resources/docker/app/Dockerfile @@ -15,6 +15,9 @@ RUN \ apk --purge del .build-deps ADD . /code/ -USER nobody +RUN addgroup -g 1000 -S pokeapi && \ + adduser -u 1000 -S pokeapi -G pokeapi + +USER pokeapi CMD gunicorn config.wsgi:application -c gunicorn.py.ini EXPOSE 80 From bb560cc051d5f55e02af0ef04b0e1028e9c1a6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 17 May 2021 22:27:33 +0200 Subject: [PATCH 070/113] ci: allow circleci to run as root --- Resources/scripts/updater.sh | 2 +- docker-compose.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/scripts/updater.sh b/Resources/scripts/updater.sh index a475cb1c..119e1bdb 100644 --- a/Resources/scripts/updater.sh +++ b/Resources/scripts/updater.sh @@ -175,7 +175,7 @@ run_updater() { fi # Run the updater - docker run --privileged -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" pokeapi-updater + docker run --privileged -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" -e RUN_AS=root pokeapi-updater return_code=$? if [ "$return_code" -eq 2 ]; then cleanexit 'no-new-data' "Generated data is the same as old data, skipping deploy" diff --git a/docker-compose.yml b/docker-compose.yml index f2d5814a..a2243b73 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,7 @@ services: build: context: . dockerfile: ./Resources/docker/app/Dockerfile + user: {RUN_AS:-pokeapi} environment: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon} POSTGRES_USER: ${POSTGRES_USER:-ash} From 32060df26de3ad1664feaa0f3bf83827f1ee14bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 17 May 2021 22:33:33 +0200 Subject: [PATCH 071/113] fix: quote user --- Resources/scripts/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/scripts/updater.sh b/Resources/scripts/updater.sh index 119e1bdb..1c4a7568 100644 --- a/Resources/scripts/updater.sh +++ b/Resources/scripts/updater.sh @@ -175,7 +175,7 @@ run_updater() { fi # Run the updater - docker run --privileged -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" -e RUN_AS=root pokeapi-updater + docker run --privileged -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" -e RUN_AS='root' pokeapi-updater return_code=$? if [ "$return_code" -eq 2 ]; then cleanexit 'no-new-data' "Generated data is the same as old data, skipping deploy" From a40cf8d6bb9561fd1b9472854722b2b01c1c7e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 17 May 2021 22:43:01 +0200 Subject: [PATCH 072/113] fix: add $ --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a2243b73..433c8b33 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: build: context: . dockerfile: ./Resources/docker/app/Dockerfile - user: {RUN_AS:-pokeapi} + user: ${RUN_AS:-pokeapi} environment: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon} POSTGRES_USER: ${POSTGRES_USER:-ash} From 53379cff6b2c0cb34b55e44031061c1e56c92128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 19 May 2021 16:24:01 +0200 Subject: [PATCH 073/113] docs: extend docker hub readme --- Resources/docker/app/README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Resources/docker/app/README.md b/Resources/docker/app/README.md index 54b5e060..41d5d7f5 100644 --- a/Resources/docker/app/README.md +++ b/Resources/docker/app/README.md @@ -16,6 +16,8 @@ - [`latest`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile) +> `pokeapi` uses `python:3.7-alpine` as base image. + ## What is PokeAPI? PokeAPI is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series. @@ -30,6 +32,19 @@ This container connects to a Postgres database via the environment variables `PO The container connects to a Redis cache via the environment variable `REDIS_CONNECTION_STRING`. -### Run the container using Compose +### Run the container -The container exposes port `80`. It's recommended to use the provided [docker-compose.yml](https://github.com/PokeAPI/pokeapi/blob/master/docker-compose.yml) to start a container from this image. +The container exposes port `80`. It needs a PostgreSQL and a Redis instance to connect to. Refer to the section [How to use this image](./how-to-use-this-image) for mapping the environment variables. + +It's recommended to use the provided [docker-compose.yml](https://github.com/PokeAPI/pokeapi/blob/master/docker-compose.yml) to start a container from this image. + +### Build the data + +Pokémon data isn't automatically present in this image. All Pokémon data is persisted in a PostgreSQL database and thus needs to be built. + +When the container is up and running, run the following shell commands: + +```sh +docker exec pokeapi python manage.py migrate --settings=config.docker-compose +docker exec pokeapi sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' +``` From 3c888482bbc9367ed1d8ec2a43b97421ffd6b0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Wed, 19 May 2021 17:10:05 +0200 Subject: [PATCH 074/113] ci: comment on PR only when on master --- Resources/scripts/updater.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/scripts/updater.sh b/Resources/scripts/updater.sh index 1c4a7568..f8e039bd 100644 --- a/Resources/scripts/updater.sh +++ b/Resources/scripts/updater.sh @@ -154,7 +154,8 @@ EOF # If the job was started by a Pull Request and not by a cron job, add a comment to notify the users notify_engine_pr() { - if [[ $1 == "start" || $1 == "end_failed" || $1 == "end_success" || $1 == "end_no_deploy" || $1 == "end_no_new_data" ]]; then + local -r allowed_events='start end_failed end_success end_no_deploy end_no_new_data' + if [[ "$allowed_events" == *"$1"* ]] && [[ "$CIRCLE_BRANCH" == 'master' ]]; then engine_repo_pr_number=$(get_invokator_pr_number) if [ "$engine_repo_pr_number" != "null" ] && [ -n "$CIRCLE_USERNAME" ]; then curl -f -H "$auth_header" -X POST --data "$(pr_input_updater_$1)" "https://api.github.com/repos/$org/$engine_repo/issues/$engine_repo_pr_number/comments" From 82b196e52074e5720afec9be102223a5aa62af18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 20 May 2021 15:58:34 +0200 Subject: [PATCH 075/113] docs: list more supported tags --- Resources/docker/app/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/docker/app/README.md b/Resources/docker/app/README.md index 41d5d7f5..c5d5c55d 100644 --- a/Resources/docker/app/README.md +++ b/Resources/docker/app/README.md @@ -15,6 +15,8 @@ ## Supported tags and respective `Dockerfile` links - [`latest`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile) +- [`master`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile) +- [`staging`](https://github.com/PokeAPI/pokeapi/blob/staging/Resources/docker/app/Dockerfile) > `pokeapi` uses `python:3.7-alpine` as base image. From 5b71e1cf6b62b552f15ddf3afbddfca2536d9631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 22 May 2021 19:16:56 +0200 Subject: [PATCH 076/113] sec remove fixed seed --- Resources/docker/app/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/docker/app/Dockerfile b/Resources/docker/app/Dockerfile index f43c4e1b..96dd580b 100644 --- a/Resources/docker/app/Dockerfile +++ b/Resources/docker/app/Dockerfile @@ -2,7 +2,6 @@ FROM python:3.7-alpine ENV PYTHONUNBUFFERED 1 ENV DJANGO_SETTINGS_MODULE 'config.docker-compose' -ENV PYTHONHASHSEED 'random' RUN mkdir /code WORKDIR /code From d2acfaffe50f2a9fec57cdbf1c5e05680ce35eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 22 May 2021 19:20:05 +0200 Subject: [PATCH 077/113] feat: allow config via env --- config/settings.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/config/settings.py b/config/settings.py index 04bb81ab..314673d8 100755 --- a/config/settings.py +++ b/config/settings.py @@ -8,21 +8,21 @@ DEBUG = False TEMPLATE_DEBUG = DEBUG -ADMINS = (("Paul Hallett", "paulandrewhallett@gmail.com"),) +ADMINS = (os.environ.get('ADMINS', "Paul Hallett,paulandrewhallett@gmail.com").split(","),) EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" MANAGERS = ADMINS -BASE_URL = "http://pokeapi.co" +BASE_URL = os.environ.get("BASE_URL", "http://pokeapi.co") # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts -ALLOWED_HOSTS = [".pokeapi.co", "localhost", "127.0.0.1"] +ALLOWED_HOSTS = [os.environ.get("ALLOWED_HOSTS", ".pokeapi.co"), "localhost", "127.0.0.1"] -TIME_ZONE = "Europe/London" +TIME_ZONE = os.environ.get("TIME_ZONE", "Europe/London") -LANGUAGE_CODE = "en-gb" +LANGUAGE_CODE = os.environ.get("LANGUAGE_CODE", "en-gb") SITE_ID = 1 @@ -40,8 +40,6 @@ USE_TZ = True # Explicitly define test runner to avoid warning messages on test execution TEST_RUNNER = "django.test.runner.DiscoverRunner" -SECRET_KEY = "4nksdock439320df*(^x2_scm-o$*py3e@-awu-n^hipkm%2l$sw$&2l#" - MIDDLEWARE = [ "corsheaders.middleware.CorsMiddleware", "django.middleware.common.CommonMiddleware", From 646077a8e3bce27c2db884bfd8e422d10318c7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 23 May 2021 18:03:12 +0200 Subject: [PATCH 078/113] chore: include graphql file in image --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index dd4e3be5..e75c7741 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,7 +14,6 @@ db.* venv* node_modules Resources -graphql .vscode .github .circleci From f92a0301dcbb483bc4c5a6063ddf0026a3f88808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 24 May 2021 19:34:58 +0200 Subject: [PATCH 079/113] fix: use forward slash --- graphql/metadata/databases/databases.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphql/metadata/databases/databases.yaml b/graphql/metadata/databases/databases.yaml index c9409ae7..89e25ec9 100644 --- a/graphql/metadata/databases/databases.yaml +++ b/graphql/metadata/databases/databases.yaml @@ -8,5 +8,5 @@ idle_timeout: 180 max_connections: 50 retries: 1 - tables: "!include default\\tables\\tables.yaml" - functions: "!include default\\functions\\functions.yaml" + tables: "!include default/tables/tables.yaml" + functions: "!include default/functions/functions.yaml" From fb804babeb775ea1ee16700ea25c411cd7158460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 27 May 2021 19:25:40 +0200 Subject: [PATCH 080/113] feat: add kustomize --- .github/workflows/docker-image.yml | 2 +- .github/workflows/kustomize.yml | 24 ++++ Makefile | 12 ++ .../config/haproxy-ingress-configmap.yaml | 9 ++ Resources/k8s/kustomize/config/pokeapi.env | 2 + .../deployments/default-deployment.yaml | 25 ++++ .../deployments/graphql-deployment.yaml | 43 ++++++ .../haproxy-ingress-controller.yaml | 47 +++++++ .../deployments/pokeapi-deployment.yaml | 58 +++++++++ .../deployments/postgres-deployment.yaml | 41 ++++++ .../deployments/redis-deployment.yaml | 29 +++++ Resources/k8s/kustomize/jobs/load-graphql.yml | 18 +++ Resources/k8s/kustomize/kustomization.yaml | 34 +++++ .../other/ingress-controller-rbac.yaml | 123 ++++++++++++++++++ Resources/k8s/kustomize/other/ingress.yaml | 66 ++++++++++ Resources/k8s/kustomize/other/namespace.yaml | 6 + Resources/k8s/kustomize/secrets/postgres.env | 1 + .../k8s/kustomize/secrets/postgres.env.sample | 1 + Resources/k8s/kustomize/services/cloud.yaml | 23 ++++ .../kustomize/services/default-service.yaml | 12 ++ .../kustomize/services/graphql-service.yaml | 12 ++ .../kustomize/services/pokeapi-service.yaml | 14 ++ .../kustomize/services/postgres-service.yaml | 12 ++ .../k8s/kustomize/services/redis-service.yaml | 12 ++ .../postgres-persistentvolumeclaim.yaml | 27 ++++ .../volumes/redis-persistentvolumeclaim.yaml | 27 ++++ 26 files changed, 679 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/kustomize.yml create mode 100644 Resources/k8s/kustomize/config/haproxy-ingress-configmap.yaml create mode 100644 Resources/k8s/kustomize/config/pokeapi.env create mode 100644 Resources/k8s/kustomize/deployments/default-deployment.yaml create mode 100644 Resources/k8s/kustomize/deployments/graphql-deployment.yaml create mode 100644 Resources/k8s/kustomize/deployments/haproxy-ingress-controller.yaml create mode 100644 Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml create mode 100644 Resources/k8s/kustomize/deployments/postgres-deployment.yaml create mode 100644 Resources/k8s/kustomize/deployments/redis-deployment.yaml create mode 100644 Resources/k8s/kustomize/jobs/load-graphql.yml create mode 100644 Resources/k8s/kustomize/kustomization.yaml create mode 100644 Resources/k8s/kustomize/other/ingress-controller-rbac.yaml create mode 100644 Resources/k8s/kustomize/other/ingress.yaml create mode 100644 Resources/k8s/kustomize/other/namespace.yaml create mode 100644 Resources/k8s/kustomize/secrets/postgres.env create mode 100644 Resources/k8s/kustomize/secrets/postgres.env.sample create mode 100644 Resources/k8s/kustomize/services/cloud.yaml create mode 100644 Resources/k8s/kustomize/services/default-service.yaml create mode 100644 Resources/k8s/kustomize/services/graphql-service.yaml create mode 100644 Resources/k8s/kustomize/services/pokeapi-service.yaml create mode 100644 Resources/k8s/kustomize/services/postgres-service.yaml create mode 100644 Resources/k8s/kustomize/services/redis-service.yaml create mode 100644 Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml create mode 100644 Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a9d9c004..5461d275 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: ci +name: docker-image on: push: diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml new file mode 100644 index 00000000..74de914f --- /dev/null +++ b/.github/workflows/kustomize.yml @@ -0,0 +1,24 @@ +name: Create Cluster + +on: + push: + branches: + - 'master' + - 'staging' + +jobs: + create-cluster: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + - name: Create k8s Kind Cluster + uses: helm/kind-action@v1.1.0 + - name: Test + run: | + kubectl cluster-info + kubectl get storageclass standard + cp Resources/k8s/kustomize/secrets/postgres.env.sample Resources/k8s/kustomize/secrets/postgres.env + kubectl apply -k Resources/k8s/kustomize/ \ No newline at end of file diff --git a/Makefile b/Makefile index 12465581..56fb5fcd 100755 --- a/Makefile +++ b/Makefile @@ -100,3 +100,15 @@ hasura-apply: # Apply local Hasura configuration hasura-get-anon-schema: # Dumps GraphQL schema gq http://localhost:8080/v1/graphql --introspect > graphql/schema.graphql + +kustomize-apply: # (Kustomize) Run kubectl apply -k on the connected k8s cluster + kubectl apply -k Resources/k8s/kustomize/ + +k8s-migrate: # (k8s) Run any pending migrations + kubectl exec deployment/pokeapi -- python manage.py migrate --settings=config.docker-compose + +k8s-build-db: # (k8s) Build the database + kubectl exec deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' + +k8s-delete: # (k8s) Delete pokeapi namespace + kubectl delete namespace pokeapi \ No newline at end of file diff --git a/Resources/k8s/kustomize/config/haproxy-ingress-configmap.yaml b/Resources/k8s/kustomize/config/haproxy-ingress-configmap.yaml new file mode 100644 index 00000000..6635fc6b --- /dev/null +++ b/Resources/k8s/kustomize/config/haproxy-ingress-configmap.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: haproxy-ingress-configmap +data: + dynamic-scaling: "true" + ssl-redirect: "false" + app-root: "/" + stats-auth: pokeapi:pokeapi diff --git a/Resources/k8s/kustomize/config/pokeapi.env b/Resources/k8s/kustomize/config/pokeapi.env new file mode 100644 index 00000000..e964f3cf --- /dev/null +++ b/Resources/k8s/kustomize/config/pokeapi.env @@ -0,0 +1,2 @@ +ADMINS=PokeAPI,change.me@pokeapi.co +BASE_URL=http://localhost/ diff --git a/Resources/k8s/kustomize/deployments/default-deployment.yaml b/Resources/k8s/kustomize/deployments/default-deployment.yaml new file mode 100644 index 00000000..b0ad39d1 --- /dev/null +++ b/Resources/k8s/kustomize/deployments/default-deployment.yaml @@ -0,0 +1,25 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: default-backend + labels: + component: default-backend +spec: + replicas: 2 + selector: + matchLabels: + component: default-backend + template: + metadata: + labels: + component: default-backend + spec: + containers: + - name: default-backend + image: gcr.io/google_containers/defaultbackend:1.4 + ports: + - containerPort: 8080 + resources: + limits: + memory: "64Mi" + cpu: "50m" \ No newline at end of file diff --git a/Resources/k8s/kustomize/deployments/graphql-deployment.yaml b/Resources/k8s/kustomize/deployments/graphql-deployment.yaml new file mode 100644 index 00000000..fb86b7cb --- /dev/null +++ b/Resources/k8s/kustomize/deployments/graphql-deployment.yaml @@ -0,0 +1,43 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: graphql + labels: + component: graphql +spec: + replicas: 1 + selector: + matchLabels: + component: graphql + template: + metadata: + labels: + component: graphql + spec: + containers: + - name: graphql-engine + image: hasura/graphql-engine:v2.0.0-alpha.5 + ports: + - containerPort: 8080 + env: + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: postgres-env-secret + key: POSTGRES_PASSWORD + - name: HASURA_GRAPHQL_DATABASE_URL + value: postgres://ash:$(POSTGRES_PASSWORD)@postgresql:5432/pokeapi + - name: HASURA_GRAPHQL_ENABLE_CONSOLE + value: "true" + - name: HASURA_GRAPHQL_DEV_MODE + value: "false" + - name: HASURA_GRAPHQL_ENABLED_LOG_TYPES + value: startup, http-log, webhook-log, websocket-log, query-log + - name: HASURA_GRAPHQL_ADMIN_SECRET + value: pokemon + - name: HASURA_GRAPHQL_UNAUTHORIZED_ROLE + value: anon + - name: HASURA_GRAPHQL_ENABLE_TELEMETRY + value: "false" + resources: {} + diff --git a/Resources/k8s/kustomize/deployments/haproxy-ingress-controller.yaml b/Resources/k8s/kustomize/deployments/haproxy-ingress-controller.yaml new file mode 100644 index 00000000..d9b3e9bd --- /dev/null +++ b/Resources/k8s/kustomize/deployments/haproxy-ingress-controller.yaml @@ -0,0 +1,47 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: haproxy-ingress-controller + labels: + component: haproxy-ingress +spec: + selector: + matchLabels: + component: haproxy-ingress + template: + metadata: + labels: + component: haproxy-ingress + spec: + serviceAccountName: ingress-controller + containers: + - name: haproxy-ingress-controller + image: quay.io/jcmoraisjr/haproxy-ingress:v0.12.3 + resources: + limits: + memory: "256Mi" + cpu: "500m" + args: + - --default-ssl-certificate=$(POD_NAMESPACE)/tls-secret + - --configmap=$(POD_NAMESPACE)/haproxy-ingress-configmap + - --reload-strategy=native + ports: + - name: http + containerPort: 80 + - name: https + containerPort: 443 + - name: stat + containerPort: 1936 + livenessProbe: + httpGet: + path: /healthz + port: 10253 + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace diff --git a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml new file mode 100644 index 00000000..1bbabc02 --- /dev/null +++ b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml @@ -0,0 +1,58 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pokeapi + labels: + component: pokeapi +spec: + replicas: 2 + selector: + matchLabels: + component: pokeapi + template: + metadata: + labels: + component: pokeapi + spec: + initContainers: + - name: postgres-connection-checker + image: postgres:13.3-alpine + command: ['sh', '-c', + 'until pg_isready -h postgresql -p 5432; + do echo waiting for database; sleep 2; done;'] + containers: + - name: pokeapi + image: pokeapi/pokeapi:staging + # imagePullPolicy: Always + ports: + - containerPort: 80 + env: + - name: POSTGRES_HOST + value: postgresql + - name: POSTGRES_USER + value: ash + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: postgres-env-secret + key: POSTGRES_PASSWORD + - name: POSTGRES_DB + value: pokeapi + - name: REDIS_CONNECTION_STRING + value: redis://redis:6379/1 + envFrom: + - configMapRef: + name: pokeapi-configmap + resources: {} + readinessProbe: + periodSeconds: 5 + initialDelaySeconds: 5 + httpGet: + path: /api/v2/ + port: 80 + livenessProbe: + periodSeconds: 5 + initialDelaySeconds: 5 + httpGet: + path: /api/v2/ + port: 80 diff --git a/Resources/k8s/kustomize/deployments/postgres-deployment.yaml b/Resources/k8s/kustomize/deployments/postgres-deployment.yaml new file mode 100644 index 00000000..5ae39a79 --- /dev/null +++ b/Resources/k8s/kustomize/deployments/postgres-deployment.yaml @@ -0,0 +1,41 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: postgresql + labels: + component: postgresql +spec: + replicas: 1 + selector: + matchLabels: + component: postgresql + template: + metadata: + labels: + component: postgresql + spec: + containers: + - name: postgresql + image: postgres:13.3-alpine + ports: + - containerPort: 5432 + env: + - name: POSTGRES_USER + value: ash + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: postgres-env-secret + key: POSTGRES_PASSWORD + - name: PGDATA + value: /var/lib/postgresql/data/pgdata + - name: POSTGRES_DB + value: pokeapi + resources: {} + volumeMounts: + - mountPath: /var/lib/postgresql/data + name: postgres-claim0 + volumes: + - name: postgres-claim0 + persistentVolumeClaim: + claimName: postgres-claim0 diff --git a/Resources/k8s/kustomize/deployments/redis-deployment.yaml b/Resources/k8s/kustomize/deployments/redis-deployment.yaml new file mode 100644 index 00000000..efb54eae --- /dev/null +++ b/Resources/k8s/kustomize/deployments/redis-deployment.yaml @@ -0,0 +1,29 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: redis + labels: + component: redis +spec: + replicas: 1 + selector: + matchLabels: + component: redis + template: + metadata: + labels: + component: redis + spec: + containers: + - name: redis + image: redis:6.2.3-alpine + ports: + - containerPort: 6379 + resources: {} + volumeMounts: + - mountPath: /data + name: redis-claim0 + volumes: + - name: redis-claim0 + persistentVolumeClaim: + claimName: redis-claim0 diff --git a/Resources/k8s/kustomize/jobs/load-graphql.yml b/Resources/k8s/kustomize/jobs/load-graphql.yml new file mode 100644 index 00000000..3cb82cd5 --- /dev/null +++ b/Resources/k8s/kustomize/jobs/load-graphql.yml @@ -0,0 +1,18 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: load-graphql + namespace: pokeapi +spec: + ttlSecondsAfterFinished: 200 + template: + spec: + containers: + - name: load-graphql + image: debian:buster + env: + - name: HASURA_GRAPHQL_ADMIN_SECRET + value: pokemon + command: ["sh", "-c"] + args: ["apt-get update && apt-get install -y git curl && curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash && hasura update-cli --version v2.0.0-alpha.5 && git clone https://github.com/PokeAPI/pokeapi.git && cd pokeapi && git checkout staging && hasura md apply --endpoint http://graphql:8080 --project graphql --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET)"] + restartPolicy: Never diff --git a/Resources/k8s/kustomize/kustomization.yaml b/Resources/k8s/kustomize/kustomization.yaml new file mode 100644 index 00000000..8fed03ee --- /dev/null +++ b/Resources/k8s/kustomize/kustomization.yaml @@ -0,0 +1,34 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: pokeapi + +configMapGenerator: + - name: pokeapi-configmap + files: + - config/pokeapi.env + +secretGenerator: + - name: postgres-env-secret + env: secrets/postgres.env # TODO: change in envs as kustomize release 2.0.4 + type: Opaque + +resources: + - other/namespace.yaml + - other/ingress-controller-rbac.yaml + - config/haproxy-ingress-configmap.yaml + - services/default-service.yaml + - services/pokeapi-service.yaml + - services/postgres-service.yaml + - services/redis-service.yaml + - services/graphql-service.yaml + - services/cloud.yaml + - volumes/postgres-persistentvolumeclaim.yaml + - volumes/redis-persistentvolumeclaim.yaml + - deployments/default-deployment.yaml + - deployments/postgres-deployment.yaml + - deployments/redis-deployment.yaml + - deployments/pokeapi-deployment.yaml + - deployments/graphql-deployment.yaml + - deployments/haproxy-ingress-controller.yaml + - other/ingress.yaml diff --git a/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml b/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml new file mode 100644 index 00000000..d3e21be1 --- /dev/null +++ b/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml @@ -0,0 +1,123 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: ingress-controller +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: ingress-controller +rules: + - apiGroups: + - "" + resources: + - configmaps + - endpoints + - nodes + - pods + - secrets + verbs: + - list + - watch + - apiGroups: + - "" + resources: + - nodes + verbs: + - get + - apiGroups: + - "" + resources: + - services + verbs: + - get + - list + - watch + - apiGroups: + - "extensions" + resources: + - ingresses + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch + - apiGroups: + - "extensions" + resources: + - ingresses/status + verbs: + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: ingress-controller +rules: + - apiGroups: + - "" + resources: + - configmaps + - pods + - secrets + - namespaces + verbs: + - get + - apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - update + - apiGroups: + - "" + resources: + - configmaps + verbs: + - create + - apiGroups: + - "" + resources: + - endpoints + verbs: + - get + - create + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: ingress-controller +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: ingress-controller +subjects: + - kind: ServiceAccount + name: ingress-controller + - apiGroup: rbac.authorization.k8s.io + kind: User + name: ingress-controller +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: ingress-controller +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: ingress-controller +subjects: + - kind: ServiceAccount + name: ingress-controller + - apiGroup: rbac.authorization.k8s.io + kind: User + name: ingress-controller diff --git a/Resources/k8s/kustomize/other/ingress.yaml b/Resources/k8s/kustomize/other/ingress.yaml new file mode 100644 index 00000000..733a911c --- /dev/null +++ b/Resources/k8s/kustomize/other/ingress.yaml @@ -0,0 +1,66 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: pokeapi-ingress + annotations: + kubernetes.io/ingress.class: "haproxy" + ingress.kubernetes.io/config-backend: | + compression algo gzip + compression type application/json +spec: + defaultBackend: + service: + name: default-backend + port: + number: 8080 + rules: + - http: + paths: + - path: /api/v2 + pathType: Prefix + backend: + service: + name: pokeapi + port: + number: 80 +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: graphql-ingress + annotations: + kubernetes.io/ingress.class: "haproxy" + ingress.kubernetes.io/config-backend: | + http-request replace-path /graphql(.*) \1 +spec: + defaultBackend: + service: + name: default-backend + port: + number: 8080 + rules: + - http: + paths: + - path: /graphql + pathType: Prefix + backend: + service: + name: graphql + port: + number: 8080 +# apiVersion: extensions/v1beta1 +# kind: Ingress +# metadata: +# name: auth-ingress +# annotations: +# ingress.kubernetes.io/auth-type: basic +# ingress.kubernetes.io/auth-realm: Default realm +# ingress.kubernetes.io/auth-secret: bugs-frontend-secret +# spec: +# rules: +# - http: +# paths: +# - path: /bugs +# backend: +# serviceName: frontend-bugs +# servicePort: 8080 diff --git a/Resources/k8s/kustomize/other/namespace.yaml b/Resources/k8s/kustomize/other/namespace.yaml new file mode 100644 index 00000000..c8a37685 --- /dev/null +++ b/Resources/k8s/kustomize/other/namespace.yaml @@ -0,0 +1,6 @@ +kind: Namespace +apiVersion: v1 +metadata: + name: pokeapi + labels: + name: pokeapi diff --git a/Resources/k8s/kustomize/secrets/postgres.env b/Resources/k8s/kustomize/secrets/postgres.env new file mode 100644 index 00000000..e89c6d6a --- /dev/null +++ b/Resources/k8s/kustomize/secrets/postgres.env @@ -0,0 +1 @@ +POSTGRES_PASSWORD=pokeapi-change-me \ No newline at end of file diff --git a/Resources/k8s/kustomize/secrets/postgres.env.sample b/Resources/k8s/kustomize/secrets/postgres.env.sample new file mode 100644 index 00000000..e89c6d6a --- /dev/null +++ b/Resources/k8s/kustomize/secrets/postgres.env.sample @@ -0,0 +1 @@ +POSTGRES_PASSWORD=pokeapi-change-me \ No newline at end of file diff --git a/Resources/k8s/kustomize/services/cloud.yaml b/Resources/k8s/kustomize/services/cloud.yaml new file mode 100644 index 00000000..08bc3d98 --- /dev/null +++ b/Resources/k8s/kustomize/services/cloud.yaml @@ -0,0 +1,23 @@ +kind: Service +apiVersion: v1 +metadata: + name: haproxy-ingress + labels: + component: haproxy-ingress +spec: + type: LoadBalancer # TODO: Change to `LoadBalancer` + externalTrafficPolicy: Local + ports: + - name: public-http + port: 80 + targetPort: http + - name: public-https + port: 443 + targetPort: http + - name: public-stat + port: 1936 + targetPort: stat + selector: + component: haproxy-ingress +--- + diff --git a/Resources/k8s/kustomize/services/default-service.yaml b/Resources/k8s/kustomize/services/default-service.yaml new file mode 100644 index 00000000..dc308ba4 --- /dev/null +++ b/Resources/k8s/kustomize/services/default-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: default-backend + labels: + component: default-backend +spec: + selector: + component: default-backend + ports: + - port: 8080 + targetPort: 8080 \ No newline at end of file diff --git a/Resources/k8s/kustomize/services/graphql-service.yaml b/Resources/k8s/kustomize/services/graphql-service.yaml new file mode 100644 index 00000000..e6804782 --- /dev/null +++ b/Resources/k8s/kustomize/services/graphql-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: graphql + labels: + component: graphql +spec: + selector: + component: graphql + ports: + - port: 8080 + targetPort: 8080 diff --git a/Resources/k8s/kustomize/services/pokeapi-service.yaml b/Resources/k8s/kustomize/services/pokeapi-service.yaml new file mode 100644 index 00000000..aca4718a --- /dev/null +++ b/Resources/k8s/kustomize/services/pokeapi-service.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: pokeapi + labels: + component: pokeapi + annotations: + ingress.kubernetes.io/balance-algorithm: leastconn +spec: + selector: + component: pokeapi + ports: + - port: 80 + targetPort: 80 diff --git a/Resources/k8s/kustomize/services/postgres-service.yaml b/Resources/k8s/kustomize/services/postgres-service.yaml new file mode 100644 index 00000000..bb404d29 --- /dev/null +++ b/Resources/k8s/kustomize/services/postgres-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: postgresql + labels: + component: postgresql +spec: + selector: + component: postgresql + ports: + - port: 5432 + targetPort: 5432 diff --git a/Resources/k8s/kustomize/services/redis-service.yaml b/Resources/k8s/kustomize/services/redis-service.yaml new file mode 100644 index 00000000..00933212 --- /dev/null +++ b/Resources/k8s/kustomize/services/redis-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis + labels: + component: redis +spec: + selector: + component: redis + ports: + - port: 6379 + targetPort: 6379 diff --git a/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml b/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml new file mode 100644 index 00000000..4866b63c --- /dev/null +++ b/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml @@ -0,0 +1,27 @@ +kind: PersistentVolume +apiVersion: v1 +metadata: + name: postgres-volume0 + labels: + type: local + component: postgres +spec: + capacity: + storage: 10Gi + accessModes: + - ReadWriteOnce + hostPath: # TODO: change to a cloud-solution + path: "/mnt/data" +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: postgres-claim0 + labels: + component: postgres +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi diff --git a/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml b/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml new file mode 100644 index 00000000..d5f395c2 --- /dev/null +++ b/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml @@ -0,0 +1,27 @@ +kind: PersistentVolume +apiVersion: v1 +metadata: + name: redis-volume0 + labels: + type: local + component: redis +spec: + capacity: + storage: 2Gi + accessModes: + - ReadWriteOnce + hostPath: # TODO: change to a cloud-solution + path: "/mnt/data" +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: redis-claim0 + labels: + component: redis +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 2Gi From 734aa0a9ad67e1fe224b1a05acd8cedddf57d4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Thu, 27 May 2021 20:38:25 +0200 Subject: [PATCH 081/113] test: add wait script/build data --- .github/workflows/kustomize.yml | 8 ++++++-- Resources/scripts/wait.sh | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 Resources/scripts/wait.sh diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index 74de914f..b2c0905e 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -1,4 +1,4 @@ -name: Create Cluster +name: kustomize on: push: @@ -21,4 +21,8 @@ jobs: kubectl cluster-info kubectl get storageclass standard cp Resources/k8s/kustomize/secrets/postgres.env.sample Resources/k8s/kustomize/secrets/postgres.env - kubectl apply -k Resources/k8s/kustomize/ \ No newline at end of file + make kustomize-apply + bash Resources/scripts/wait.sh http://localhost/api/v2/ + make k8s-migrate + make k8s-build-db + bash Resources/scripts/wait.sh http://localhost/api/v2/pal-park-area/5/ diff --git a/Resources/scripts/wait.sh b/Resources/scripts/wait.sh new file mode 100644 index 00000000..e1e92e99 --- /dev/null +++ b/Resources/scripts/wait.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +wait_for_http() { + local url="$1" + local max_seconds=1000 + local end_time=$(( $(date +%s) + max_seconds )) + local success='false' + echo "Waiting for $url" + while [ "$(date +%s)" -lt "$end_time" ]; do # Loop until interval has elapsed. + sleep 2 + if [ "$(curl -s -o /dev/null -L -w '%{http_code}' "$url")" == "200" ]; then + success='true' + break + fi + done + if [ "$success" = 'true' ]; then + exit 0 + else + exit 1 + fi +} + +wait_for_http "${1:-http://localhost/api/v2/}" \ No newline at end of file From 037d1afcbb936e095ba8b5689d309365e083afee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 28 May 2021 09:16:11 +0200 Subject: [PATCH 082/113] debug: add SSH debug --- .github/workflows/kustomize.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index b2c0905e..e3a41203 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -16,6 +16,10 @@ jobs: submodules: recursive - name: Create k8s Kind Cluster uses: helm/kind-action@v1.1.0 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + with: + limit-access-to-actor: true - name: Test run: | kubectl cluster-info From c3926c998330aedb013e8e8a84fc9b6a3a7fc7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 28 May 2021 09:51:30 +0200 Subject: [PATCH 083/113] refactor: format --- config/settings.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/settings.py b/config/settings.py index 314673d8..64cd60be 100755 --- a/config/settings.py +++ b/config/settings.py @@ -8,7 +8,9 @@ DEBUG = False TEMPLATE_DEBUG = DEBUG -ADMINS = (os.environ.get('ADMINS', "Paul Hallett,paulandrewhallett@gmail.com").split(","),) +ADMINS = ( + os.environ.get("ADMINS", "Paul Hallett,paulandrewhallett@gmail.com").split(","), +) EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" @@ -18,7 +20,11 @@ BASE_URL = os.environ.get("BASE_URL", "http://pokeapi.co") # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts -ALLOWED_HOSTS = [os.environ.get("ALLOWED_HOSTS", ".pokeapi.co"), "localhost", "127.0.0.1"] +ALLOWED_HOSTS = [ + os.environ.get("ALLOWED_HOSTS", ".pokeapi.co"), + "localhost", + "127.0.0.1", +] TIME_ZONE = os.environ.get("TIME_ZONE", "Europe/London") From 810510a556257a0d8ca2e41125acd08e71a1e933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 28 May 2021 11:52:40 +0200 Subject: [PATCH 084/113] feat: allow port customization --- Resources/docker/app/Dockerfile | 2 +- gunicorn.py.ini => gunicorn.conf.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename gunicorn.py.ini => gunicorn.conf.py (55%) diff --git a/Resources/docker/app/Dockerfile b/Resources/docker/app/Dockerfile index 96dd580b..2c890f22 100644 --- a/Resources/docker/app/Dockerfile +++ b/Resources/docker/app/Dockerfile @@ -18,5 +18,5 @@ RUN addgroup -g 1000 -S pokeapi && \ adduser -u 1000 -S pokeapi -G pokeapi USER pokeapi -CMD gunicorn config.wsgi:application -c gunicorn.py.ini +CMD gunicorn config.wsgi:application -c gunicorn.conf.py EXPOSE 80 diff --git a/gunicorn.py.ini b/gunicorn.conf.py similarity index 55% rename from gunicorn.py.ini rename to gunicorn.conf.py index 9db1e924..bc8ebaf6 100644 --- a/gunicorn.py.ini +++ b/gunicorn.conf.py @@ -1,5 +1,6 @@ +import os from multiprocessing import cpu_count -bind = '0.0.0.0:80' +bind = "0.0.0.0:{}".format(os.environ.get("SERVER_PORT", "80")) workers = cpu_count() * 2 threads = cpu_count() * 2 From c6844f82500695f937e2ca09d9822cbbbead8c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 28 May 2021 11:53:23 +0200 Subject: [PATCH 085/113] ci: use port 8080 --- .github/workflows/kustomize.yml | 2 ++ Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index e3a41203..406b14ad 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -16,6 +16,8 @@ jobs: submodules: recursive - name: Create k8s Kind Cluster uses: helm/kind-action@v1.1.0 + with: + version: v0.11.1 - name: Setup tmate session uses: mxschmitt/action-tmate@v3 with: diff --git a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml index 1bbabc02..67823b39 100644 --- a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml +++ b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml @@ -23,10 +23,12 @@ spec: containers: - name: pokeapi image: pokeapi/pokeapi:staging - # imagePullPolicy: Always + imagePullPolicy: Always ports: - - containerPort: 80 + - containerPort: 8080 env: + - name: SERVER_PORT + value: 8080 - name: POSTGRES_HOST value: postgresql - name: POSTGRES_USER From d5629937a257672901a9f827d09ee33db40685c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 28 May 2021 15:50:42 +0200 Subject: [PATCH 086/113] ci: use port 8080/use root --- .../k8s/kustomize/deployments/pokeapi-deployment.yaml | 9 ++++++--- .../k8s/kustomize/other/ingress-controller-rbac.yaml | 4 +++- Resources/k8s/kustomize/services/pokeapi-service.yaml | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml index 67823b39..4a7a32ae 100644 --- a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml +++ b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml @@ -26,9 +26,12 @@ spec: imagePullPolicy: Always ports: - containerPort: 8080 + securityContext: + allowPrivilegeEscalation: false + runAsUser: 0 env: - name: SERVER_PORT - value: 8080 + value: "8080" - name: POSTGRES_HOST value: postgresql - name: POSTGRES_USER @@ -51,10 +54,10 @@ spec: initialDelaySeconds: 5 httpGet: path: /api/v2/ - port: 80 + port: 8080 livenessProbe: periodSeconds: 5 initialDelaySeconds: 5 httpGet: path: /api/v2/ - port: 80 + port: 8080 diff --git a/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml b/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml index d3e21be1..e9fde7a1 100644 --- a/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml +++ b/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml @@ -35,9 +35,11 @@ rules: - list - watch - apiGroups: - - "extensions" + - extensions + - networking.k8s.io resources: - ingresses + - ingressclasses verbs: - get - list diff --git a/Resources/k8s/kustomize/services/pokeapi-service.yaml b/Resources/k8s/kustomize/services/pokeapi-service.yaml index aca4718a..ee2b3020 100644 --- a/Resources/k8s/kustomize/services/pokeapi-service.yaml +++ b/Resources/k8s/kustomize/services/pokeapi-service.yaml @@ -11,4 +11,4 @@ spec: component: pokeapi ports: - port: 80 - targetPort: 80 + targetPort: 8080 From faa5c75ac005671c32f738fa433447d9223be58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 28 May 2021 17:06:06 +0200 Subject: [PATCH 087/113] ci: use proxy/load graphql --- .github/workflows/docker-image.yml | 23 ++++++++--------------- .github/workflows/kustomize.yml | 29 ++++++++++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 5461d275..de2eecbd 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: docker-image +name: Build and Push Docker image on: push: @@ -12,34 +12,28 @@ jobs: docker: runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 with: submodules: recursive - - - name: Docker meta + - name: Docker meta id: meta uses: docker/metadata-action@v3 with: # list of Docker images to use as base name for tags images: | pokeapi/pokeapi - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub + - name: Login to DockerHub if: github.event_name != 'pull_request' uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME_NARAMSIM }} password: ${{ secrets.DOCKERHUB_TOKEN_NARAMSIM }} - - - name: Build and push + - name: Build and push id: docker_build uses: docker/build-push-action@v2 with: @@ -48,6 +42,5 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - - name: Image digest + - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index 406b14ad..b905a9ba 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -1,4 +1,4 @@ -name: kustomize +name: Deploy Kustomize k8s cluster on: push: @@ -7,7 +7,7 @@ on: - 'staging' jobs: - create-cluster: + create-kustomize-cluster: runs-on: ubuntu-latest steps: - name: Checkout @@ -18,17 +18,24 @@ jobs: uses: helm/kind-action@v1.1.0 with: version: v0.11.1 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - with: - limit-access-to-actor: true - - name: Test + # - name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 + # with: + # limit-access-to-actor: true + - name: K8s Apply run: | - kubectl cluster-info - kubectl get storageclass standard cp Resources/k8s/kustomize/secrets/postgres.env.sample Resources/k8s/kustomize/secrets/postgres.env make kustomize-apply - bash Resources/scripts/wait.sh http://localhost/api/v2/ + kubectl proxy & + bash Resources/scripts/wait.sh http://localhost:8001/api/v1/namespaces/pokeapi/services/pokeapi/proxy/api/v2/ + - name: Migrate and build data + run: | make k8s-migrate make k8s-build-db - bash Resources/scripts/wait.sh http://localhost/api/v2/pal-park-area/5/ + bash Resources/scripts/wait.sh http://localhost:8001/api/v1/namespaces/pokeapi/services/pokeapi/proxy/api/v2/pal-park-area/5/ + - name: K8s Apply + run: | + kubectl apply -f Resources/k8s/kustomize/jobs/load-graphql.yml + kubectl wait --timeout=120s --for=condition=complete job/load-graphql + last_command=$(kubectl get job -o jsonpath='{.status.succeeded}' load-graphql) + test "$last_command" -eq 1 \ No newline at end of file From f676fec5fca6bdf5c210f6cf57b8cd51e3043589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 28 May 2021 17:11:59 +0200 Subject: [PATCH 088/113] ci: use pokeapi ns --- .github/workflows/kustomize.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index b905a9ba..1c4b0f20 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -28,6 +28,9 @@ jobs: make kustomize-apply kubectl proxy & bash Resources/scripts/wait.sh http://localhost:8001/api/v1/namespaces/pokeapi/services/pokeapi/proxy/api/v2/ + - name: Set default namespace + run: | + kubectl config set-context --current --namespace pokeapi - name: Migrate and build data run: | make k8s-migrate From cfe92e9260bcb9caaf006359d34d23c942f8c4ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 29 May 2021 19:53:49 +0200 Subject: [PATCH 089/113] chore: remove env file --- Resources/k8s/kustomize/secrets/postgres.env | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/k8s/kustomize/secrets/postgres.env diff --git a/Resources/k8s/kustomize/secrets/postgres.env b/Resources/k8s/kustomize/secrets/postgres.env deleted file mode 100644 index e89c6d6a..00000000 --- a/Resources/k8s/kustomize/secrets/postgres.env +++ /dev/null @@ -1 +0,0 @@ -POSTGRES_PASSWORD=pokeapi-change-me \ No newline at end of file From 80d13fb045bd5aca342316a2a6fb0a7a7e697ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 22:03:11 +0200 Subject: [PATCH 090/113] feat: add graphql secret/incorporate job in kustomize --- .github/workflows/kustomize.yml | 6 +--- .gitignore | 2 +- .../deployments/graphql-deployment.yaml | 13 +++++-- .../k8s/kustomize/jobs/load-graphql.yaml | 34 +++++++++++++++++++ Resources/k8s/kustomize/jobs/load-graphql.yml | 18 ---------- Resources/k8s/kustomize/kustomization.yaml | 6 +++- .../k8s/kustomize/secrets/graphql.env.sample | 1 + 7 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 Resources/k8s/kustomize/jobs/load-graphql.yaml delete mode 100644 Resources/k8s/kustomize/jobs/load-graphql.yml create mode 100644 Resources/k8s/kustomize/secrets/graphql.env.sample diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index 1c4b0f20..75fc2503 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -18,13 +18,10 @@ jobs: uses: helm/kind-action@v1.1.0 with: version: v0.11.1 - # - name: Setup tmate session - # uses: mxschmitt/action-tmate@v3 - # with: - # limit-access-to-actor: true - name: K8s Apply run: | cp Resources/k8s/kustomize/secrets/postgres.env.sample Resources/k8s/kustomize/secrets/postgres.env + cp Resources/k8s/kustomize/secrets/graphql.env.sample Resources/k8s/kustomize/secrets/graphql.env make kustomize-apply kubectl proxy & bash Resources/scripts/wait.sh http://localhost:8001/api/v1/namespaces/pokeapi/services/pokeapi/proxy/api/v2/ @@ -38,7 +35,6 @@ jobs: bash Resources/scripts/wait.sh http://localhost:8001/api/v1/namespaces/pokeapi/services/pokeapi/proxy/api/v2/pal-park-area/5/ - name: K8s Apply run: | - kubectl apply -f Resources/k8s/kustomize/jobs/load-graphql.yml kubectl wait --timeout=120s --for=condition=complete job/load-graphql last_command=$(kubectl get job -o jsonpath='{.status.succeeded}' load-graphql) test "$last_command" -eq 1 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 005a535f..c8e6e201 100755 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,6 @@ db.* venv* node_modules .vscode -.env +*.env Resources/nginx/ssl/* !Resources/nginx/ssl/*.sample.* \ No newline at end of file diff --git a/Resources/k8s/kustomize/deployments/graphql-deployment.yaml b/Resources/k8s/kustomize/deployments/graphql-deployment.yaml index fb86b7cb..05977cbc 100644 --- a/Resources/k8s/kustomize/deployments/graphql-deployment.yaml +++ b/Resources/k8s/kustomize/deployments/graphql-deployment.yaml @@ -14,6 +14,12 @@ spec: labels: component: graphql spec: + initContainers: + - name: pokeapi-connection-checker + image: curlimages/curl:latest + command: ['sh', '-c', + 'until curl -f -s --output /dev/null http://pokeapi:80/api/v2/; + do echo waiting for pokeapi; sleep 2; done;'] containers: - name: graphql-engine image: hasura/graphql-engine:v2.0.0-alpha.5 @@ -25,6 +31,11 @@ spec: secretKeyRef: name: postgres-env-secret key: POSTGRES_PASSWORD + - name: HASURA_GRAPHQL_ADMIN_SECRET + valueFrom: + secretKeyRef: + name: graphql-env-secret + key: HASURA_GRAPHQL_ADMIN_SECRET - name: HASURA_GRAPHQL_DATABASE_URL value: postgres://ash:$(POSTGRES_PASSWORD)@postgresql:5432/pokeapi - name: HASURA_GRAPHQL_ENABLE_CONSOLE @@ -33,8 +44,6 @@ spec: value: "false" - name: HASURA_GRAPHQL_ENABLED_LOG_TYPES value: startup, http-log, webhook-log, websocket-log, query-log - - name: HASURA_GRAPHQL_ADMIN_SECRET - value: pokemon - name: HASURA_GRAPHQL_UNAUTHORIZED_ROLE value: anon - name: HASURA_GRAPHQL_ENABLE_TELEMETRY diff --git a/Resources/k8s/kustomize/jobs/load-graphql.yaml b/Resources/k8s/kustomize/jobs/load-graphql.yaml new file mode 100644 index 00000000..0e9ad56a --- /dev/null +++ b/Resources/k8s/kustomize/jobs/load-graphql.yaml @@ -0,0 +1,34 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: load-graphql +spec: + ttlSecondsAfterFinished: 200 + template: + spec: + restartPolicy: Never + initContainers: + - name: pokeapi-last-built-resource-connection-checker + image: curlimages/curl:latest + command: ['sh', '-c', + 'until curl -f -s --output /dev/null http://pokeapi:80/api/v2/pal-park-area/5/; + do echo waiting for pokeapi; sleep 2; done;'] + containers: + - name: load-graphql + image: debian:buster + env: + - name: HASURA_GRAPHQL_ADMIN_SECRET + valueFrom: + secretKeyRef: + name: graphql-env-secret + key: HASURA_GRAPHQL_ADMIN_SECRET + command: ["sh", "-c"] + args: + - apt-get update && + apt-get install -y git curl && + curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash && + hasura update-cli --version v2.0.0-alpha.5 && + git clone https://github.com/PokeAPI/pokeapi.git && + cd pokeapi && + git checkout staging && + hasura md apply --endpoint http://graphql:8080 --project graphql --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET) diff --git a/Resources/k8s/kustomize/jobs/load-graphql.yml b/Resources/k8s/kustomize/jobs/load-graphql.yml deleted file mode 100644 index 3cb82cd5..00000000 --- a/Resources/k8s/kustomize/jobs/load-graphql.yml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: load-graphql - namespace: pokeapi -spec: - ttlSecondsAfterFinished: 200 - template: - spec: - containers: - - name: load-graphql - image: debian:buster - env: - - name: HASURA_GRAPHQL_ADMIN_SECRET - value: pokemon - command: ["sh", "-c"] - args: ["apt-get update && apt-get install -y git curl && curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash && hasura update-cli --version v2.0.0-alpha.5 && git clone https://github.com/PokeAPI/pokeapi.git && cd pokeapi && git checkout staging && hasura md apply --endpoint http://graphql:8080 --project graphql --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET)"] - restartPolicy: Never diff --git a/Resources/k8s/kustomize/kustomization.yaml b/Resources/k8s/kustomize/kustomization.yaml index 8fed03ee..93828994 100644 --- a/Resources/k8s/kustomize/kustomization.yaml +++ b/Resources/k8s/kustomize/kustomization.yaml @@ -10,7 +10,10 @@ configMapGenerator: secretGenerator: - name: postgres-env-secret - env: secrets/postgres.env # TODO: change in envs as kustomize release 2.0.4 + env: secrets/postgres.env + type: Opaque + - name: graphql-env-secret + env: secrets/graphql.env type: Opaque resources: @@ -32,3 +35,4 @@ resources: - deployments/graphql-deployment.yaml - deployments/haproxy-ingress-controller.yaml - other/ingress.yaml + - jobs/load-graphql.yaml diff --git a/Resources/k8s/kustomize/secrets/graphql.env.sample b/Resources/k8s/kustomize/secrets/graphql.env.sample new file mode 100644 index 00000000..e450bdaa --- /dev/null +++ b/Resources/k8s/kustomize/secrets/graphql.env.sample @@ -0,0 +1 @@ +HASURA_GRAPHQL_ADMIN_SECRET=pokeapi-change-me \ No newline at end of file From d9b1f4741adb4cfb06265e5ac28e2c06c7b1ed8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 22:09:35 +0200 Subject: [PATCH 091/113] refactor: add comment/pull image normally --- Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml index 4a7a32ae..d08b434b 100644 --- a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml +++ b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml @@ -23,10 +23,9 @@ spec: containers: - name: pokeapi image: pokeapi/pokeapi:staging - imagePullPolicy: Always ports: - containerPort: 8080 - securityContext: + securityContext: # CI: Github Actions kills this container if not run with root. Otherwise, it's safe to use the default pokeapi/pokeapi user and remove these lines. allowPrivilegeEscalation: false runAsUser: 0 env: From 3ea83d31b524e918b250e02da2a2e421d2f6a81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 22:53:08 +0200 Subject: [PATCH 092/113] docs: add small readme section --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index ba75eb39..51617a7a 100755 --- a/README.md +++ b/README.md @@ -110,6 +110,29 @@ A free public GraphiQL console is browsable at the address https://beta.pokeapi. A set of examples are provided in the directory [/graphql/examples](./graphql/examples) of this repository. +## Kubernetes + +[Kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/) files are provided in the folder https://github.com/PokeAPI/pokeapi/tree/master/Resources/k8s/kustomize/. Create and change your secrets: + +```sh +cp Resources/k8s/kustomize/secrets/postgres.env.sample Resources/k8s/kustomize/secrets/postgres.env +cp Resources/k8s/kustomize/secrets/graphql.env.sample Resources/k8s/kustomize/secrets/graphql.env +# Edit the newly created files +``` + +Configure `kubectl` to point to a cluster and then run the following commands to start a PokéAPI service. + +```sh +kubectl apply -k Resources/k8s/kustomize/ +kubectl config set-context --current --namespace pokeapi # (Optional) Set pokeapi ns as the working ns +# Wait for the cluster to spin up +kubectl exec --namespace pokeapi deployment/pokeapi -- python manage.py migrate --settings=config.docker-compose # Migrate the DB +kubectl exec --namespace pokeapi deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' # Build the db +kubectl wait --namespace pokeapi --timeout=120s --for=condition=complete job/load-graphql # Wait for Graphql configuration job to finish +``` + +This k8s setup creates all k8s resources inside the _Namespace_ `pokeapi`, run `kubectl delete namespace pokeapi` to delete them. It also creates a _Service_ of type `LoadBalancer` which is exposed on port `80` and `443`. Data is persisted on `12Gi` of `ReadWriteOnce` volumes. + ## Official REST Wrappers * Node server-side [PokeAPI/pokedex-promise-v2](https://github.com/PokeAPI/pokedex-promise-v2) | _Auto caching_ From caa946a9891c21a27e1805c3c54b3886ad549c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 22:53:55 +0200 Subject: [PATCH 093/113] fx: run make command in namespace --- Makefile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 56fb5fcd..9f734097 100755 --- a/Makefile +++ b/Makefile @@ -105,10 +105,10 @@ kustomize-apply: # (Kustomize) Run kubectl apply -k on the connected k8s cluste kubectl apply -k Resources/k8s/kustomize/ k8s-migrate: # (k8s) Run any pending migrations - kubectl exec deployment/pokeapi -- python manage.py migrate --settings=config.docker-compose + kubectl exec --namespace pokeapi deployment/pokeapi -- python manage.py migrate --settings=config.docker-compose k8s-build-db: # (k8s) Build the database - kubectl exec deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' + kubectl exec --namespace pokeapi deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' k8s-delete: # (k8s) Delete pokeapi namespace kubectl delete namespace pokeapi \ No newline at end of file diff --git a/README.md b/README.md index 51617a7a..ad949899 100755 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ make wipe_db ## Docker and Compose -There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allows you to deploy a production-like environment, with separate containers for each services and is recommended if you need to simply spin up PokeAPI. +There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allows you to deploy a production-like environment, with separate containers for each services and is recommended if you need to simply spin up PokéAPI. Start everything by @@ -96,7 +96,7 @@ Browse [localhost/api/v2/](http://localhost/api/v2/) or [localhost/api/v2/pokemo -When you start PokeAPI with the above docker-compose setup, an [Hasura Engine](https://github.com/hasura/graphql-engine) server is started as well. It's possible to track all the PokeAPI tables and foreign keys by simply +When you start PokéAPI with the above docker-compose setup, an [Hasura Engine](https://github.com/hasura/graphql-engine) server is started as well. It's possible to track all the PokeAPI tables and foreign keys by simply ```sh # hasura cli needs to be installed and available in your $PATH: https://hasura.io/docs/latest/graphql/core/hasura-cli/install-hasura-cli.html From 1f60ef53189fe8b7d81b73da5a930566a2d2cbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 23:21:25 +0200 Subject: [PATCH 094/113] docs: add badges --- README.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ad949899..da95bb56 100755 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co) > Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql) for more info. -## Setup [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/) +## Setup   [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/) - Download this source code into a working directory, be sure to use the flag `--recurse-submodules` to clone also our submodules. @@ -70,7 +70,7 @@ If you ever need to wipe the database use this command: make wipe_db ``` -## Docker and Compose +## Docker and Compose   [![docker hub](https://img.shields.io/docker/v/pokeapi/pokeapi?label=tag&sort=semver)](https://hub.docker.com/r/pokeapi/pokeapi) There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allows you to deploy a production-like environment, with separate containers for each services and is recommended if you need to simply spin up PokéAPI. @@ -90,11 +90,7 @@ docker-compose exec -T app sh -c 'echo "from data.v2.build import build_all; bui Browse [localhost/api/v2/](http://localhost/api/v2/) or [localhost/api/v2/pokemon/bulbasaur/](http://localhost/api/v2/pokemon/bulbasaur/) on port `80`. -## GraphQL - - - - +## GraphQL   When you start PokéAPI with the above docker-compose setup, an [Hasura Engine](https://github.com/hasura/graphql-engine) server is started as well. It's possible to track all the PokeAPI tables and foreign keys by simply @@ -110,7 +106,7 @@ A free public GraphiQL console is browsable at the address https://beta.pokeapi. A set of examples are provided in the directory [/graphql/examples](./graphql/examples) of this repository. -## Kubernetes +## Kubernetes [![k8s status](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml/badge.svg?branch=master)](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml) [Kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/) files are provided in the folder https://github.com/PokeAPI/pokeapi/tree/master/Resources/k8s/kustomize/. Create and change your secrets: From 3510f04f9f7ce73bf5eb4dd3a7b3061ee8cf01f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 23:21:40 +0200 Subject: [PATCH 095/113] ci: run on PR and schedule --- .github/workflows/kustomize.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index 75fc2503..b8177883 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -1,10 +1,13 @@ name: Deploy Kustomize k8s cluster on: + pull_request: push: branches: - 'master' - 'staging' + schedule: + - cron: '0 0 12 1 1/1 ? *' jobs: create-kustomize-cluster: From d753f0c6713eed94489e3a8c808cbdcf467de4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 23:23:26 +0200 Subject: [PATCH 096/113] docs: add space --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da95bb56..1449b315 100755 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ A free public GraphiQL console is browsable at the address https://beta.pokeapi. A set of examples are provided in the directory [/graphql/examples](./graphql/examples) of this repository. -## Kubernetes [![k8s status](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml/badge.svg?branch=master)](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml) +## Kubernetes   [![k8s status](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml/badge.svg?branch=master)](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml) [Kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/) files are provided in the folder https://github.com/PokeAPI/pokeapi/tree/master/Resources/k8s/kustomize/. Create and change your secrets: From ec36013d2f9e64a650f18f45fe3b0d2df00776d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 30 May 2021 23:32:08 +0200 Subject: [PATCH 097/113] ci: use simpler cron --- .github/workflows/kustomize.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index b8177883..33f202df 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -7,7 +7,7 @@ on: - 'master' - 'staging' schedule: - - cron: '0 0 12 1 1/1 ? *' + - cron: '0 0 1 * *' jobs: create-kustomize-cluster: From 2ecb56e250cbb70df22b984d64355a35100a90a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Mon, 31 May 2021 22:57:19 +0200 Subject: [PATCH 098/113] refactor: remove comments --- Resources/k8s/kustomize/other/ingress.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Resources/k8s/kustomize/other/ingress.yaml b/Resources/k8s/kustomize/other/ingress.yaml index 733a911c..13a62ed7 100644 --- a/Resources/k8s/kustomize/other/ingress.yaml +++ b/Resources/k8s/kustomize/other/ingress.yaml @@ -48,19 +48,3 @@ spec: name: graphql port: number: 8080 -# apiVersion: extensions/v1beta1 -# kind: Ingress -# metadata: -# name: auth-ingress -# annotations: -# ingress.kubernetes.io/auth-type: basic -# ingress.kubernetes.io/auth-realm: Default realm -# ingress.kubernetes.io/auth-secret: bugs-frontend-secret -# spec: -# rules: -# - http: -# paths: -# - path: /bugs -# backend: -# serviceName: frontend-bugs -# servicePort: 8080 From 7d389e502cbdd0a801aacac50db1dd25fe6ada88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 1 Jun 2021 14:37:09 +0200 Subject: [PATCH 099/113] revert: don't ship graphql files in docker image --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index e75c7741..dd4e3be5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,6 +14,7 @@ db.* venv* node_modules Resources +graphql .vscode .github .circleci From 64fd22b611ed1d2b0fc5934ba8f7e53c4913abc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 1 Jun 2021 14:37:49 +0200 Subject: [PATCH 100/113] chore: add newline --- .github/workflows/kustomize.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index 33f202df..b2283d41 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -40,4 +40,4 @@ jobs: run: | kubectl wait --timeout=120s --for=condition=complete job/load-graphql last_command=$(kubectl get job -o jsonpath='{.status.succeeded}' load-graphql) - test "$last_command" -eq 1 \ No newline at end of file + test "$last_command" -eq 1 From d59767971556aebb77935aea20a1f028a762c007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 1 Jun 2021 15:17:54 +0200 Subject: [PATCH 101/113] refactor: lint and enable linting --- .github/workflows/kustomize.yml | 4 +- Resources/k8s/kustomize/.yamllint.yaml | 7 +++ .../deployments/default-deployment.yaml | 4 +- .../deployments/graphql-deployment.yaml | 10 +++-- .../deployments/pokeapi-deployment.yaml | 11 +++-- .../k8s/kustomize/jobs/load-graphql.yaml | 45 ++++++++++--------- Resources/k8s/kustomize/other/ingress.yaml | 36 +++++++-------- Resources/k8s/kustomize/other/namespace.yaml | 2 +- Resources/k8s/kustomize/services/cloud.yaml | 6 +-- .../kustomize/services/default-service.yaml | 4 +- .../postgres-persistentvolumeclaim.yaml | 4 +- .../volumes/redis-persistentvolumeclaim.yaml | 4 +- 12 files changed, 76 insertions(+), 61 deletions(-) create mode 100644 Resources/k8s/kustomize/.yamllint.yaml diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index b2283d41..187a4638 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -7,7 +7,7 @@ on: - 'master' - 'staging' schedule: - - cron: '0 0 1 * *' + - cron: '0 0 1 * *' jobs: create-kustomize-cluster: @@ -17,6 +17,8 @@ jobs: uses: actions/checkout@v2 with: submodules: recursive + - name: Lint + run: (cd Resources/k8s/kustomize && yamllint .) - name: Create k8s Kind Cluster uses: helm/kind-action@v1.1.0 with: diff --git a/Resources/k8s/kustomize/.yamllint.yaml b/Resources/k8s/kustomize/.yamllint.yaml new file mode 100644 index 00000000..77cd8111 --- /dev/null +++ b/Resources/k8s/kustomize/.yamllint.yaml @@ -0,0 +1,7 @@ +--- + +extends: default + +rules: + document-start: disable + line-length: disable diff --git a/Resources/k8s/kustomize/deployments/default-deployment.yaml b/Resources/k8s/kustomize/deployments/default-deployment.yaml index b0ad39d1..da9b9e5d 100644 --- a/Resources/k8s/kustomize/deployments/default-deployment.yaml +++ b/Resources/k8s/kustomize/deployments/default-deployment.yaml @@ -18,8 +18,8 @@ spec: - name: default-backend image: gcr.io/google_containers/defaultbackend:1.4 ports: - - containerPort: 8080 + - containerPort: 8080 resources: limits: memory: "64Mi" - cpu: "50m" \ No newline at end of file + cpu: "50m" diff --git a/Resources/k8s/kustomize/deployments/graphql-deployment.yaml b/Resources/k8s/kustomize/deployments/graphql-deployment.yaml index 05977cbc..12fbde40 100644 --- a/Resources/k8s/kustomize/deployments/graphql-deployment.yaml +++ b/Resources/k8s/kustomize/deployments/graphql-deployment.yaml @@ -17,9 +17,12 @@ spec: initContainers: - name: pokeapi-connection-checker image: curlimages/curl:latest - command: ['sh', '-c', - 'until curl -f -s --output /dev/null http://pokeapi:80/api/v2/; - do echo waiting for pokeapi; sleep 2; done;'] + command: ["sh", "-c"] + args: + - until curl -f -s --output /dev/null http://pokeapi:80/api/v2/; do + echo waiting for pokeapi; + sleep 2; + done; containers: - name: graphql-engine image: hasura/graphql-engine:v2.0.0-alpha.5 @@ -49,4 +52,3 @@ spec: - name: HASURA_GRAPHQL_ENABLE_TELEMETRY value: "false" resources: {} - diff --git a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml index d08b434b..d013f925 100644 --- a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml +++ b/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml @@ -17,15 +17,18 @@ spec: initContainers: - name: postgres-connection-checker image: postgres:13.3-alpine - command: ['sh', '-c', - 'until pg_isready -h postgresql -p 5432; - do echo waiting for database; sleep 2; done;'] + command: ['sh', '-c'] + args: + - until pg_isready -h postgresql -p 5432; do + echo waiting for database; + sleep 2; + done; containers: - name: pokeapi image: pokeapi/pokeapi:staging ports: - containerPort: 8080 - securityContext: # CI: Github Actions kills this container if not run with root. Otherwise, it's safe to use the default pokeapi/pokeapi user and remove these lines. + securityContext: # CI: Github Actions kills this container if not run with root. Otherwise, it's safe to use the default pokeapi/pokeapi user and remove these lines. allowPrivilegeEscalation: false runAsUser: 0 env: diff --git a/Resources/k8s/kustomize/jobs/load-graphql.yaml b/Resources/k8s/kustomize/jobs/load-graphql.yaml index 0e9ad56a..2b0c396e 100644 --- a/Resources/k8s/kustomize/jobs/load-graphql.yaml +++ b/Resources/k8s/kustomize/jobs/load-graphql.yaml @@ -10,25 +10,28 @@ spec: initContainers: - name: pokeapi-last-built-resource-connection-checker image: curlimages/curl:latest - command: ['sh', '-c', - 'until curl -f -s --output /dev/null http://pokeapi:80/api/v2/pal-park-area/5/; - do echo waiting for pokeapi; sleep 2; done;'] + command: ['sh', '-c'] + args: + - until curl -f -s --output /dev/null http://pokeapi:80/api/v2/pal-park-area/5/; + do echo waiting for pokeapi; + sleep 2; + done; containers: - - name: load-graphql - image: debian:buster - env: - - name: HASURA_GRAPHQL_ADMIN_SECRET - valueFrom: - secretKeyRef: - name: graphql-env-secret - key: HASURA_GRAPHQL_ADMIN_SECRET - command: ["sh", "-c"] - args: - - apt-get update && - apt-get install -y git curl && - curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash && - hasura update-cli --version v2.0.0-alpha.5 && - git clone https://github.com/PokeAPI/pokeapi.git && - cd pokeapi && - git checkout staging && - hasura md apply --endpoint http://graphql:8080 --project graphql --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET) + - name: load-graphql + image: debian:buster + env: + - name: HASURA_GRAPHQL_ADMIN_SECRET + valueFrom: + secretKeyRef: + name: graphql-env-secret + key: HASURA_GRAPHQL_ADMIN_SECRET + command: ["sh", "-c"] + args: + - apt-get update && + apt-get install -y git curl && + curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash && + hasura update-cli --version v2.0.0-alpha.5 && + git clone https://github.com/PokeAPI/pokeapi.git && + cd pokeapi && + git checkout staging && + hasura md apply --endpoint http://graphql:8080 --project graphql --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET) diff --git a/Resources/k8s/kustomize/other/ingress.yaml b/Resources/k8s/kustomize/other/ingress.yaml index 13a62ed7..18e3f3d4 100644 --- a/Resources/k8s/kustomize/other/ingress.yaml +++ b/Resources/k8s/kustomize/other/ingress.yaml @@ -14,15 +14,15 @@ spec: port: number: 8080 rules: - - http: - paths: - - path: /api/v2 - pathType: Prefix - backend: - service: - name: pokeapi - port: - number: 80 + - http: + paths: + - path: /api/v2 + pathType: Prefix + backend: + service: + name: pokeapi + port: + number: 80 --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -39,12 +39,12 @@ spec: port: number: 8080 rules: - - http: - paths: - - path: /graphql - pathType: Prefix - backend: - service: - name: graphql - port: - number: 8080 + - http: + paths: + - path: /graphql + pathType: Prefix + backend: + service: + name: graphql + port: + number: 8080 diff --git a/Resources/k8s/kustomize/other/namespace.yaml b/Resources/k8s/kustomize/other/namespace.yaml index c8a37685..5c4c36f8 100644 --- a/Resources/k8s/kustomize/other/namespace.yaml +++ b/Resources/k8s/kustomize/other/namespace.yaml @@ -1,5 +1,5 @@ -kind: Namespace apiVersion: v1 +kind: Namespace metadata: name: pokeapi labels: diff --git a/Resources/k8s/kustomize/services/cloud.yaml b/Resources/k8s/kustomize/services/cloud.yaml index 08bc3d98..ede048a2 100644 --- a/Resources/k8s/kustomize/services/cloud.yaml +++ b/Resources/k8s/kustomize/services/cloud.yaml @@ -1,11 +1,11 @@ -kind: Service apiVersion: v1 +kind: Service metadata: name: haproxy-ingress labels: component: haproxy-ingress spec: - type: LoadBalancer # TODO: Change to `LoadBalancer` + type: LoadBalancer # TODO: Change to `LoadBalancer` externalTrafficPolicy: Local ports: - name: public-http @@ -19,5 +19,3 @@ spec: targetPort: stat selector: component: haproxy-ingress ---- - diff --git a/Resources/k8s/kustomize/services/default-service.yaml b/Resources/k8s/kustomize/services/default-service.yaml index dc308ba4..4475c2cf 100644 --- a/Resources/k8s/kustomize/services/default-service.yaml +++ b/Resources/k8s/kustomize/services/default-service.yaml @@ -8,5 +8,5 @@ spec: selector: component: default-backend ports: - - port: 8080 - targetPort: 8080 \ No newline at end of file + - port: 8080 + targetPort: 8080 diff --git a/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml b/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml index 4866b63c..4be7c28f 100644 --- a/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml +++ b/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml @@ -1,5 +1,5 @@ -kind: PersistentVolume apiVersion: v1 +kind: PersistentVolume metadata: name: postgres-volume0 labels: @@ -10,7 +10,7 @@ spec: storage: 10Gi accessModes: - ReadWriteOnce - hostPath: # TODO: change to a cloud-solution + hostPath: # TODO: change to a cloud-solution path: "/mnt/data" --- apiVersion: v1 diff --git a/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml b/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml index d5f395c2..f0a32582 100644 --- a/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml +++ b/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml @@ -1,5 +1,5 @@ -kind: PersistentVolume apiVersion: v1 +kind: PersistentVolume metadata: name: redis-volume0 labels: @@ -10,7 +10,7 @@ spec: storage: 2Gi accessModes: - ReadWriteOnce - hostPath: # TODO: change to a cloud-solution + hostPath: # TODO: change to a cloud-solution path: "/mnt/data" --- apiVersion: v1 From 333751c4f79469fb96960b547bf3a520f6721a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 5 Jun 2021 11:33:18 +0200 Subject: [PATCH 102/113] ci: build arm64 --- .github/workflows/docker-image.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index de2eecbd..16b9f784 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,6 +33,13 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME_NARAMSIM }} password: ${{ secrets.DOCKERHUB_TOKEN_NARAMSIM }} + - name: Inspect builder + run: | + echo "Name: ${{ steps.buildx.outputs.name }}" + echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" + echo "Status: ${{ steps.buildx.outputs.status }}" + echo "Flags: ${{ steps.buildx.outputs.flags }}" + echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - name: Build and push id: docker_build uses: docker/build-push-action@v2 @@ -40,6 +47,7 @@ jobs: context: . file: ./Resources/docker/app/Dockerfile push: true + platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Image digest From 1a6ac5361cdf431e5e2caf55047816214d573f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 5 Jun 2021 11:47:33 +0200 Subject: [PATCH 103/113] ci: add id to step --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 16b9f784..bd347c32 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -26,6 +26,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx + id: buildx uses: docker/setup-buildx-action@v1 - name: Login to DockerHub if: github.event_name != 'pull_request' From bdfbf8f9ef1db5e4b5ab90ff5faff764681850c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 5 Jun 2021 11:52:53 +0200 Subject: [PATCH 104/113] ci: build all available platforms --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index bd347c32..6894a8a6 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -48,7 +48,7 @@ jobs: context: . file: ./Resources/docker/app/Dockerfile push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Image digest From 19126075a01a7eead3885707f32c99e53385b599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 5 Jun 2021 12:01:07 +0200 Subject: [PATCH 105/113] ci: remove risc build --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6894a8a6..0f5b0a15 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -48,7 +48,7 @@ jobs: context: . file: ./Resources/docker/app/Dockerfile push: true - platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Image digest From fbe39b62c247a632c1ac49e78a599949964cdfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 5 Jun 2021 22:26:39 +0200 Subject: [PATCH 106/113] feat: run kustomize action after image is created --- .github/workflows/kustomize.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index 187a4638..9e0d75ca 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -1,17 +1,18 @@ name: Deploy Kustomize k8s cluster on: - pull_request: - push: - branches: - - 'master' - - 'staging' + workflow_run: + workflows: ["Build and Push Docker image"] + branches: [master, staging] + types: + - completed schedule: - cron: '0 0 1 * *' jobs: create-kustomize-cluster: runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout uses: actions/checkout@v2 From b2ec70d8f74ab5a5c1758a1d1b7dcf6fb85fc62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 5 Jun 2021 22:58:10 +0200 Subject: [PATCH 107/113] feat: allow staging and master deployment --- .github/workflows/kustomize.yml | 10 +++++++--- Makefile | 5 ++++- README.md | 9 +++++---- .../{ => base}/config/haproxy-ingress-configmap.yaml | 0 .../pokeapi.env => base/config/pokeapi.env.sample} | 0 .../{ => base}/deployments/default-deployment.yaml | 0 .../{ => base}/deployments/graphql-deployment.yaml | 0 .../deployments/haproxy-ingress-controller.yaml | 0 .../{ => base}/deployments/pokeapi-deployment.yaml | 2 +- .../{ => base}/deployments/postgres-deployment.yaml | 0 .../{ => base}/deployments/redis-deployment.yaml | 0 .../k8s/kustomize/{ => base}/jobs/load-graphql.yaml | 0 Resources/k8s/kustomize/{ => base}/kustomization.yaml | 0 .../{ => base}/other/ingress-controller-rbac.yaml | 0 Resources/k8s/kustomize/{ => base}/other/ingress.yaml | 0 .../k8s/kustomize/{ => base}/other/namespace.yaml | 0 .../kustomize/{ => base}/secrets/graphql.env.sample | 0 .../kustomize/{ => base}/secrets/postgres.env.sample | 0 Resources/k8s/kustomize/{ => base}/services/cloud.yaml | 0 .../kustomize/{ => base}/services/default-service.yaml | 0 .../kustomize/{ => base}/services/graphql-service.yaml | 0 .../kustomize/{ => base}/services/pokeapi-service.yaml | 0 .../{ => base}/services/postgres-service.yaml | 0 .../kustomize/{ => base}/services/redis-service.yaml | 0 .../volumes/postgres-persistentvolumeclaim.yaml | 0 .../volumes/redis-persistentvolumeclaim.yaml | 0 Resources/k8s/kustomize/staging/kustomization.yaml | 9 +++++++++ 27 files changed, 26 insertions(+), 9 deletions(-) rename Resources/k8s/kustomize/{ => base}/config/haproxy-ingress-configmap.yaml (100%) rename Resources/k8s/kustomize/{config/pokeapi.env => base/config/pokeapi.env.sample} (100%) rename Resources/k8s/kustomize/{ => base}/deployments/default-deployment.yaml (100%) rename Resources/k8s/kustomize/{ => base}/deployments/graphql-deployment.yaml (100%) rename Resources/k8s/kustomize/{ => base}/deployments/haproxy-ingress-controller.yaml (100%) rename Resources/k8s/kustomize/{ => base}/deployments/pokeapi-deployment.yaml (97%) rename Resources/k8s/kustomize/{ => base}/deployments/postgres-deployment.yaml (100%) rename Resources/k8s/kustomize/{ => base}/deployments/redis-deployment.yaml (100%) rename Resources/k8s/kustomize/{ => base}/jobs/load-graphql.yaml (100%) rename Resources/k8s/kustomize/{ => base}/kustomization.yaml (100%) rename Resources/k8s/kustomize/{ => base}/other/ingress-controller-rbac.yaml (100%) rename Resources/k8s/kustomize/{ => base}/other/ingress.yaml (100%) rename Resources/k8s/kustomize/{ => base}/other/namespace.yaml (100%) rename Resources/k8s/kustomize/{ => base}/secrets/graphql.env.sample (100%) rename Resources/k8s/kustomize/{ => base}/secrets/postgres.env.sample (100%) rename Resources/k8s/kustomize/{ => base}/services/cloud.yaml (100%) rename Resources/k8s/kustomize/{ => base}/services/default-service.yaml (100%) rename Resources/k8s/kustomize/{ => base}/services/graphql-service.yaml (100%) rename Resources/k8s/kustomize/{ => base}/services/pokeapi-service.yaml (100%) rename Resources/k8s/kustomize/{ => base}/services/postgres-service.yaml (100%) rename Resources/k8s/kustomize/{ => base}/services/redis-service.yaml (100%) rename Resources/k8s/kustomize/{ => base}/volumes/postgres-persistentvolumeclaim.yaml (100%) rename Resources/k8s/kustomize/{ => base}/volumes/redis-persistentvolumeclaim.yaml (100%) create mode 100644 Resources/k8s/kustomize/staging/kustomization.yaml diff --git a/.github/workflows/kustomize.yml b/.github/workflows/kustomize.yml index 9e0d75ca..f26a3cb2 100644 --- a/.github/workflows/kustomize.yml +++ b/.github/workflows/kustomize.yml @@ -24,12 +24,16 @@ jobs: uses: helm/kind-action@v1.1.0 with: version: v0.11.1 + - name: Create deployment configuration + run: | + cp Resources/k8s/kustomize/base/secrets/postgres.env.sample Resources/k8s/kustomize/base/secrets/postgres.env + cp Resources/k8s/kustomize/base/secrets/graphql.env.sample Resources/k8s/kustomize/base/secrets/graphql.env + cp Resources/k8s/kustomize/base/config/pokeapi.env.sample Resources/k8s/kustomize/base/config/pokeapi.env - name: K8s Apply run: | - cp Resources/k8s/kustomize/secrets/postgres.env.sample Resources/k8s/kustomize/secrets/postgres.env - cp Resources/k8s/kustomize/secrets/graphql.env.sample Resources/k8s/kustomize/secrets/graphql.env - make kustomize-apply + if [ ${GITHUB_REF#refs/heads/} = 'master' ]; then make kustomize-apply; else make kustomize-staging-apply; fi kubectl proxy & + kubectl describe deployment bash Resources/scripts/wait.sh http://localhost:8001/api/v1/namespaces/pokeapi/services/pokeapi/proxy/api/v2/ - name: Set default namespace run: | diff --git a/Makefile b/Makefile index 9f734097..97afba38 100755 --- a/Makefile +++ b/Makefile @@ -102,7 +102,10 @@ hasura-get-anon-schema: # Dumps GraphQL schema gq http://localhost:8080/v1/graphql --introspect > graphql/schema.graphql kustomize-apply: # (Kustomize) Run kubectl apply -k on the connected k8s cluster - kubectl apply -k Resources/k8s/kustomize/ + kubectl apply -k Resources/k8s/kustomize/base/ + +kustomize-staging-apply: # (Kustomize) Run kubectl apply -k on the connected k8s cluster + kubectl apply -k Resources/k8s/kustomize/staging/ k8s-migrate: # (k8s) Run any pending migrations kubectl exec --namespace pokeapi deployment/pokeapi -- python manage.py migrate --settings=config.docker-compose diff --git a/README.md b/README.md index 1449b315..bf2318c9 100755 --- a/README.md +++ b/README.md @@ -108,18 +108,19 @@ A set of examples are provided in the directory [/graphql/examples](./graphql/ex ## Kubernetes   [![k8s status](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml/badge.svg?branch=master)](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml) -[Kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/) files are provided in the folder https://github.com/PokeAPI/pokeapi/tree/master/Resources/k8s/kustomize/. Create and change your secrets: +[Kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/) files are provided in the folder https://github.com/PokeAPI/pokeapi/tree/master/Resources/k8s/kustomize/base/. Create and change your secrets: ```sh -cp Resources/k8s/kustomize/secrets/postgres.env.sample Resources/k8s/kustomize/secrets/postgres.env -cp Resources/k8s/kustomize/secrets/graphql.env.sample Resources/k8s/kustomize/secrets/graphql.env +cp Resources/k8s/kustomize/base/secrets/postgres.env.sample Resources/k8s/kustomize/base/secrets/postgres.env +cp Resources/k8s/kustomize/base/secrets/graphql.env.sample Resources/k8s/kustomize/base/secrets/graphql.env +cp Resources/k8s/kustomize/base/config/pokeapi.env.sample Resources/k8s/kustomize/base/config/pokeapi.env # Edit the newly created files ``` Configure `kubectl` to point to a cluster and then run the following commands to start a PokéAPI service. ```sh -kubectl apply -k Resources/k8s/kustomize/ +kubectl apply -k Resources/k8s/kustomize/base/ kubectl config set-context --current --namespace pokeapi # (Optional) Set pokeapi ns as the working ns # Wait for the cluster to spin up kubectl exec --namespace pokeapi deployment/pokeapi -- python manage.py migrate --settings=config.docker-compose # Migrate the DB diff --git a/Resources/k8s/kustomize/config/haproxy-ingress-configmap.yaml b/Resources/k8s/kustomize/base/config/haproxy-ingress-configmap.yaml similarity index 100% rename from Resources/k8s/kustomize/config/haproxy-ingress-configmap.yaml rename to Resources/k8s/kustomize/base/config/haproxy-ingress-configmap.yaml diff --git a/Resources/k8s/kustomize/config/pokeapi.env b/Resources/k8s/kustomize/base/config/pokeapi.env.sample similarity index 100% rename from Resources/k8s/kustomize/config/pokeapi.env rename to Resources/k8s/kustomize/base/config/pokeapi.env.sample diff --git a/Resources/k8s/kustomize/deployments/default-deployment.yaml b/Resources/k8s/kustomize/base/deployments/default-deployment.yaml similarity index 100% rename from Resources/k8s/kustomize/deployments/default-deployment.yaml rename to Resources/k8s/kustomize/base/deployments/default-deployment.yaml diff --git a/Resources/k8s/kustomize/deployments/graphql-deployment.yaml b/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml similarity index 100% rename from Resources/k8s/kustomize/deployments/graphql-deployment.yaml rename to Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml diff --git a/Resources/k8s/kustomize/deployments/haproxy-ingress-controller.yaml b/Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml similarity index 100% rename from Resources/k8s/kustomize/deployments/haproxy-ingress-controller.yaml rename to Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml diff --git a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml b/Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml similarity index 97% rename from Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml rename to Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml index d013f925..d057b235 100644 --- a/Resources/k8s/kustomize/deployments/pokeapi-deployment.yaml +++ b/Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml @@ -25,7 +25,7 @@ spec: done; containers: - name: pokeapi - image: pokeapi/pokeapi:staging + image: pokeapi/pokeapi:master ports: - containerPort: 8080 securityContext: # CI: Github Actions kills this container if not run with root. Otherwise, it's safe to use the default pokeapi/pokeapi user and remove these lines. diff --git a/Resources/k8s/kustomize/deployments/postgres-deployment.yaml b/Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml similarity index 100% rename from Resources/k8s/kustomize/deployments/postgres-deployment.yaml rename to Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml diff --git a/Resources/k8s/kustomize/deployments/redis-deployment.yaml b/Resources/k8s/kustomize/base/deployments/redis-deployment.yaml similarity index 100% rename from Resources/k8s/kustomize/deployments/redis-deployment.yaml rename to Resources/k8s/kustomize/base/deployments/redis-deployment.yaml diff --git a/Resources/k8s/kustomize/jobs/load-graphql.yaml b/Resources/k8s/kustomize/base/jobs/load-graphql.yaml similarity index 100% rename from Resources/k8s/kustomize/jobs/load-graphql.yaml rename to Resources/k8s/kustomize/base/jobs/load-graphql.yaml diff --git a/Resources/k8s/kustomize/kustomization.yaml b/Resources/k8s/kustomize/base/kustomization.yaml similarity index 100% rename from Resources/k8s/kustomize/kustomization.yaml rename to Resources/k8s/kustomize/base/kustomization.yaml diff --git a/Resources/k8s/kustomize/other/ingress-controller-rbac.yaml b/Resources/k8s/kustomize/base/other/ingress-controller-rbac.yaml similarity index 100% rename from Resources/k8s/kustomize/other/ingress-controller-rbac.yaml rename to Resources/k8s/kustomize/base/other/ingress-controller-rbac.yaml diff --git a/Resources/k8s/kustomize/other/ingress.yaml b/Resources/k8s/kustomize/base/other/ingress.yaml similarity index 100% rename from Resources/k8s/kustomize/other/ingress.yaml rename to Resources/k8s/kustomize/base/other/ingress.yaml diff --git a/Resources/k8s/kustomize/other/namespace.yaml b/Resources/k8s/kustomize/base/other/namespace.yaml similarity index 100% rename from Resources/k8s/kustomize/other/namespace.yaml rename to Resources/k8s/kustomize/base/other/namespace.yaml diff --git a/Resources/k8s/kustomize/secrets/graphql.env.sample b/Resources/k8s/kustomize/base/secrets/graphql.env.sample similarity index 100% rename from Resources/k8s/kustomize/secrets/graphql.env.sample rename to Resources/k8s/kustomize/base/secrets/graphql.env.sample diff --git a/Resources/k8s/kustomize/secrets/postgres.env.sample b/Resources/k8s/kustomize/base/secrets/postgres.env.sample similarity index 100% rename from Resources/k8s/kustomize/secrets/postgres.env.sample rename to Resources/k8s/kustomize/base/secrets/postgres.env.sample diff --git a/Resources/k8s/kustomize/services/cloud.yaml b/Resources/k8s/kustomize/base/services/cloud.yaml similarity index 100% rename from Resources/k8s/kustomize/services/cloud.yaml rename to Resources/k8s/kustomize/base/services/cloud.yaml diff --git a/Resources/k8s/kustomize/services/default-service.yaml b/Resources/k8s/kustomize/base/services/default-service.yaml similarity index 100% rename from Resources/k8s/kustomize/services/default-service.yaml rename to Resources/k8s/kustomize/base/services/default-service.yaml diff --git a/Resources/k8s/kustomize/services/graphql-service.yaml b/Resources/k8s/kustomize/base/services/graphql-service.yaml similarity index 100% rename from Resources/k8s/kustomize/services/graphql-service.yaml rename to Resources/k8s/kustomize/base/services/graphql-service.yaml diff --git a/Resources/k8s/kustomize/services/pokeapi-service.yaml b/Resources/k8s/kustomize/base/services/pokeapi-service.yaml similarity index 100% rename from Resources/k8s/kustomize/services/pokeapi-service.yaml rename to Resources/k8s/kustomize/base/services/pokeapi-service.yaml diff --git a/Resources/k8s/kustomize/services/postgres-service.yaml b/Resources/k8s/kustomize/base/services/postgres-service.yaml similarity index 100% rename from Resources/k8s/kustomize/services/postgres-service.yaml rename to Resources/k8s/kustomize/base/services/postgres-service.yaml diff --git a/Resources/k8s/kustomize/services/redis-service.yaml b/Resources/k8s/kustomize/base/services/redis-service.yaml similarity index 100% rename from Resources/k8s/kustomize/services/redis-service.yaml rename to Resources/k8s/kustomize/base/services/redis-service.yaml diff --git a/Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml b/Resources/k8s/kustomize/base/volumes/postgres-persistentvolumeclaim.yaml similarity index 100% rename from Resources/k8s/kustomize/volumes/postgres-persistentvolumeclaim.yaml rename to Resources/k8s/kustomize/base/volumes/postgres-persistentvolumeclaim.yaml diff --git a/Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml b/Resources/k8s/kustomize/base/volumes/redis-persistentvolumeclaim.yaml similarity index 100% rename from Resources/k8s/kustomize/volumes/redis-persistentvolumeclaim.yaml rename to Resources/k8s/kustomize/base/volumes/redis-persistentvolumeclaim.yaml diff --git a/Resources/k8s/kustomize/staging/kustomization.yaml b/Resources/k8s/kustomize/staging/kustomization.yaml new file mode 100644 index 00000000..ed12b218 --- /dev/null +++ b/Resources/k8s/kustomize/staging/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: + - ../base + +images: + - name: pokeapi/pokeapi + newTag: staging From 11163c4eae540fa4fb3afafee3136de3bbf2ef61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 5 Jun 2021 23:19:03 +0200 Subject: [PATCH 108/113] ci: remove platforns --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0f5b0a15..66d81883 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -48,7 +48,7 @@ jobs: context: . file: ./Resources/docker/app/Dockerfile push: true - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7,linux/arm/v6 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Image digest From a6d6632abd7822f455e52cc8b69dc7364b4403cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 3 Jul 2021 20:03:24 +0200 Subject: [PATCH 109/113] data: remove HP stat change for ancient power --- data/v2/csv/move_meta_stat_changes.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/data/v2/csv/move_meta_stat_changes.csv b/data/v2/csv/move_meta_stat_changes.csv index 9c2421fd..7f3f68b9 100644 --- a/data/v2/csv/move_meta_stat_changes.csv +++ b/data/v2/csv/move_meta_stat_changes.csv @@ -40,7 +40,6 @@ move_id,stat_id,change 231,3,-1 232,2,1 242,3,-1 -246,1,1 246,2,1 246,3,1 246,4,1 From d0a4397d41096562f054fa442dc68bebb877f110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sun, 4 Jul 2021 19:32:41 +0200 Subject: [PATCH 110/113] data: remove hp stat change --- data/v2/csv/move_meta_stat_changes.csv | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/v2/csv/move_meta_stat_changes.csv b/data/v2/csv/move_meta_stat_changes.csv index 7f3f68b9..a3e8348e 100644 --- a/data/v2/csv/move_meta_stat_changes.csv +++ b/data/v2/csv/move_meta_stat_changes.csv @@ -60,7 +60,6 @@ move_id,stat_id,change 313,5,-2 315,4,-2 317,6,-1 -318,1,1 318,2,1 318,3,1 318,4,1 @@ -101,7 +100,6 @@ move_id,stat_id,change 455,3,1 455,5,1 465,5,-2 -466,1,1 466,2,1 466,3,1 466,4,1 From 1ae3964a5ff81b4bf6fdd2f3769dfa43193deee4 Mon Sep 17 00:00:00 2001 From: fissionprime Date: Mon, 5 Jul 2021 21:10:39 -0400 Subject: [PATCH 111/113] fixed 'possible_values' field of characteristic endpoint loop that adds values to 'possible_values' used wrong value in conditional. Created test to verify behavior is as expected. --- .gitignore | 3 ++- pokemon_v2/serializers.py | 2 +- pokemon_v2/tests.py | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c8e6e201..bdc2955a 100755 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ node_modules .vscode *.env Resources/nginx/ssl/* -!Resources/nginx/ssl/*.sample.* \ No newline at end of file +!Resources/nginx/ssl/*.sample.* +.idea* \ No newline at end of file diff --git a/pokemon_v2/serializers.py b/pokemon_v2/serializers.py index fe7d73ef..8fa6ad84 100644 --- a/pokemon_v2/serializers.py +++ b/pokemon_v2/serializers.py @@ -487,7 +487,7 @@ class CharacteristicDetailSerializer(serializers.ModelSerializer): mod = obj.gene_mod_5 values = [] - while mod <= 30: + while mod <= 31: values.append(mod) mod += 5 diff --git a/pokemon_v2/tests.py b/pokemon_v2/tests.py index 6cd2271d..ce947134 100644 --- a/pokemon_v2/tests.py +++ b/pokemon_v2/tests.py @@ -4337,6 +4337,21 @@ class APITests(APIData, APITestCase): "{}{}/stat/{}/".format(TEST_HOST, API_V2, characteristic.stat.pk), ) + def test_characteristic_values(self): + l = [] + # check for all 5 possible values of gene_modulo + for modulo in range(5): + characteristic = self.setup_characteristic_data(gene_mod_5=modulo) + # note that 'possible_values' is computed solely from gene_modulo + # thus it is fine that our test characteristics are indexed 1-5 + result = self.client.get( + "{}/characteristic/{}/".format(API_V2, characteristic.pk)) + for i in range(len(result.data['possible_values'])): + self.assertEqual( + result.data['possible_values'][i], characteristic.gene_mod_5 + i * 5 + ) + + # Nature Tests def test_nature_api(self): From f17a09b15fecaa92ccd8015a744914e80b2566b1 Mon Sep 17 00:00:00 2001 From: fissionprime Date: Tue, 6 Jul 2021 00:58:55 -0400 Subject: [PATCH 112/113] reformatted with black --- pokemon_v2/tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pokemon_v2/tests.py b/pokemon_v2/tests.py index ce947134..50039594 100644 --- a/pokemon_v2/tests.py +++ b/pokemon_v2/tests.py @@ -11,7 +11,7 @@ API_V2 = "/api/v2" class APIData: - """ Data Initializers""" + """Data Initializers""" # Gender Data @classmethod @@ -4345,13 +4345,13 @@ class APITests(APIData, APITestCase): # note that 'possible_values' is computed solely from gene_modulo # thus it is fine that our test characteristics are indexed 1-5 result = self.client.get( - "{}/characteristic/{}/".format(API_V2, characteristic.pk)) - for i in range(len(result.data['possible_values'])): + "{}/characteristic/{}/".format(API_V2, characteristic.pk) + ) + for i in range(len(result.data["possible_values"])): self.assertEqual( - result.data['possible_values'][i], characteristic.gene_mod_5 + i * 5 + result.data["possible_values"][i], characteristic.gene_mod_5 + i * 5 ) - # Nature Tests def test_nature_api(self): From 68745ace037e93989560f4af48f7ab48f2634c8e Mon Sep 17 00:00:00 2001 From: fissionprime Date: Tue, 6 Jul 2021 01:13:28 -0400 Subject: [PATCH 113/113] old variable --- pokemon_v2/tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pokemon_v2/tests.py b/pokemon_v2/tests.py index 50039594..e38e719e 100644 --- a/pokemon_v2/tests.py +++ b/pokemon_v2/tests.py @@ -4338,7 +4338,6 @@ class APITests(APIData, APITestCase): ) def test_characteristic_values(self): - l = [] # check for all 5 possible values of gene_modulo for modulo in range(5): characteristic = self.setup_characteristic_data(gene_mod_5=modulo)