Merge branch 'master' into poltchageist-form-names

Makefile

@@ -1,7 +1,6 @@
 veekun_pokedex_repository = ../pokedex
 local_config = --settings=config.local
 docker_config = --settings=config.docker-compose
-HASURA_GRAPHQL_ADMIN_SECRET=pokemon
 
 .PHONY: help
 .SILENT:
@@ -101,11 +100,11 @@ sync-to-veekun: pull pull-veekun  # Copy data from this repository to ../pokedex
 # read-env-file:  # Exports ./.env into shell environment variables
 # 	export `egrep -v '^#' .env | xargs`
 
-hasura-export:  # Export Hasura configuration
-	hasura md export --project graphql --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET}
+hasura-export:  # Export Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
+	hasura md export --project graphql
 
-hasura-apply:  # Apply local Hasura configuration
-	hasura md apply --project graphql --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET}
+hasura-apply:  # Apply local Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
+	hasura md apply --project graphql
 
 hasura-get-anon-schema:  # Dumps GraphQL schema
 	gq http://localhost:8080/v1/graphql --introspect > graphql/schema.graphql
@@ -128,17 +127,25 @@ k8s-delete:  # (k8s) Delete pokeapi namespace
 start-graphql-prod:
 	git pull origin master
 	git submodule update --init
-	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+	docker compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+	docker compose stop app
+
+down-graphql-prod:
+	docker container rm $(docker container ls -aq) -f
+	docker system prune --all --volumes --force
+	sync; echo 3 > /proc/sys/vm/drop_caches
 
 update-graphql-data-prod:
 	git pull origin master
 	git submodule update --init
-	docker stop pokeapi_graphql-engine_1
+	docker compose stop graphql-engine
 	sync; echo 3 > /proc/sys/vm/drop_caches
-	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d app
+	docker compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d app
 	make docker-migrate
 	make docker-build-db
-	docker stop pokeapi_app_1
+	docker compose stop app
 	sync; echo 3 > /proc/sys/vm/drop_caches
-	docker exec pokeapi_web_1 sh -c 'rm -rf /tmp/cache/*'
-	docker start pokeapi_graphql-engine_1
+	docker compose exec -T web sh -c 'rm -rf /tmp/cache/*'
+	docker compose start graphql-engine
+	sleep 30
+	make hasura-apply

README.md

@@ -87,7 +87,7 @@ When you start PokéAPI with the above docker-compose setup, an [Hasura Engine](
 
 ```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.8
+# hasura cli's version has to greater than v2.0.8
 make hasura-apply
 ```
 

Resources/compose/docker-compose-prod-graphql.yml

@@ -1,9 +1,6 @@
 version: '2.4'
 services:
-  cache:
-    image: redis:7.0.7-alpine
   db:
-    image: postgres:15.1
     environment:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
       POSTGRES_USER: "${POSTGRES_USER}"
@@ -14,12 +11,10 @@ services:
     restart: "no"
 
   web:
-    image: nginx:1.23.3-alpine
     volumes:
       - graphiql:/public-console:ro
 
   graphql-engine:
-    image: hasura/graphql-engine:v2.16.1
     cpus: 0.7
     memswap_limit: 3g
     mem_limit: 700m

Resources/nginx/nginx.conf

@@ -89,6 +89,7 @@ http {
         }
 
         location /graphql/v1beta {
+            include /ssl/cache.conf*;
             # proxy_cache small;
             # proxy_cache_valid 200 10d;
             # proxy_cache_valid any 0;

data/v2/csv/move_names.csv

@@ -8499,10 +8499,26 @@ move_id,local_language_id,name
 874,8,Corsa all'Oro
 874,9,Make It Rain
 874,11,ゴールドラッシュ
-875,8,Botta
+875,1,サイコブレイド 
+875,3,사이코블레이드
+875,4,精神劍
+875,5,Lame Psychique
+875,6,Psychoschneide
+875,7,Psicohojas
+875,8,Psicolama
 875,9,Psyblade
-876,8,Botta
+875,11,サイコブレイド 
+875,12,精神剑
+876,1,ハイドロスチーム
+876,3,하이드로스팀
+876,4,水蒸氣
+876,5,Hydrovapeur
+876,6,Hydrodampf
+876,7,Hidrovapor
+876,8,Idrovapore
 876,9,Hydro Steam
+876,11,ハイドロスチーム
+876,12,水蒸气
 877,1,カタストロフィ
 877,4,大灾难
 877,8,Catastrofe

docker-compose.yml

@@ -1,13 +1,13 @@
 version: '2.4'
 services:
   cache:
-    image: redis:7.0.7-alpine
+    image: redis:7.2.3-alpine
     volumes:
       - redis_data:/data
     restart: always
 
   db:
-    image: postgres:15.1
+    image: postgres:16.1
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
       POSTGRES_USER: ${POSTGRES_USER:-ash}
@@ -33,7 +33,7 @@ services:
     restart: always
 
   web:
-    image: nginx:1.23.3-alpine
+    image: nginx:1.25.3-alpine
     ports:
       - "80:80"
       - "443:443"
@@ -44,7 +44,7 @@ services:
       - ./Resources/nginx/ssl:/ssl:ro
       - graphql_cache:/tmp/cache
   graphql-engine:
-    image: hasura/graphql-engine:v2.16.1
+    image: hasura/graphql-engine:v2.36.1-ce
     ports:
       - "8080:8080"
     depends_on:

graphql/metadata/api_limits.yaml

@@ -0,0 +1 @@
+{}

graphql/metadata/backend_configs.yaml

@@ -0,0 +1 @@
+{}

graphql/metadata/databases/default/tables/public_pokemon_v2_ability.yaml

@@ -49,9 +49,9 @@ array_relationships:
           name: pokemon_v2_pokemonabilitypast
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_abilitychangeeffecttext
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml

@@ -12,9 +12,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: version_group_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berry.yaml

@@ -20,9 +20,9 @@ array_relationships:
           name: pokemon_v2_berryflavormap
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_berryfirmnessname
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml

@@ -35,9 +35,9 @@ array_relationships:
           name: pokemon_v2_nature
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: berry_flavor_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml

@@ -14,9 +14,9 @@ array_relationships:
           name: pokemon_v2_characteristicdescription
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: first_move_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml

@@ -24,9 +24,9 @@ array_relationships:
           name: pokemon_v2_move
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml

@@ -1,6 +1,14 @@
 table:
   name: pokemon_v2_contesttype
   schema: public
+object_relationships:
+  - name: pokemon_v2_berryflavor
+    using:
+      foreign_key_constraint_on:
+        column: contest_type_id
+        table:
+          name: pokemon_v2_berryflavor
+          schema: public
 array_relationships:
   - name: pokemon_v2_berryflavors
     using:
@@ -24,9 +32,9 @@ array_relationships:
           name: pokemon_v2_move
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_pokemonegggroup
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml

@@ -23,9 +23,9 @@ array_relationships:
           name: pokemon_v2_encounterconditionvaluemap
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_encounterconditionvalue
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml

@@ -21,9 +21,9 @@ array_relationships:
           name: pokemon_v2_encounterconditionvaluename
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: encounter_condition_value_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml

@@ -24,9 +24,9 @@ array_relationships:
           name: pokemon_v2_locationareaencounterrate
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_encounter
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml

@@ -14,9 +14,9 @@ array_relationships:
           name: pokemon_v2_pokemonspecies
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_pokemonevolution
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_evolutiontriggername.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_experience.yaml

@@ -6,9 +6,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: growth_rate_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_gender.yaml

@@ -10,9 +10,9 @@ array_relationships:
           name: pokemon_v2_pokemonevolution
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_generation.yaml

@@ -98,9 +98,9 @@ array_relationships:
           name: pokemon_v2_versiongroup
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_generationname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_growthrate.yaml

@@ -31,9 +31,9 @@ array_relationships:
           name: pokemon_v2_pokemonspecies
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_growthratedescription.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_item.yaml

@@ -94,9 +94,9 @@ array_relationships:
           name: pokemon_v2_pokemonitem
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemattribute.yaml

@@ -24,9 +24,9 @@ array_relationships:
           name: pokemon_v2_itemattributename
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributedescription.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributemap.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: item_attribute_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemattributename.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemcategory.yaml

@@ -21,9 +21,9 @@ array_relationships:
           name: pokemon_v2_item
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemcategoryname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemeffecttext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemflavortext.yaml

@@ -12,9 +12,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: version_group_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemflingeffect.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_item
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemflingeffecteffecttext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemgameindex.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: item_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itempocket.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_itempocketname
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itempocketname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_itemsprites.yaml

@@ -6,9 +6,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: item_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_language.yaml

@@ -430,9 +430,9 @@ array_relationships:
           name: pokemon_v2_versionname
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_languagename.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_location.yaml

@@ -35,9 +35,9 @@ array_relationships:
           name: pokemon_v2_pokemonevolution
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_locationarea.yaml

@@ -28,9 +28,9 @@ array_relationships:
           name: pokemon_v2_locationareaname
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_locationareaencounterrate.yaml

@@ -12,9 +12,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: version_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_locationareaname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: location_area_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_locationgameindex.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: location_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_locationname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: location_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_machine.yaml

@@ -15,9 +15,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: version_group_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_move.yaml

@@ -126,9 +126,9 @@ array_relationships:
           name: pokemon_v2_supercontestcombo
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveattribute.yaml

@@ -24,9 +24,9 @@ array_relationships:
           name: pokemon_v2_moveattributename
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributedescription.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_attribute_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributemap.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_attribute_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveattributename.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_attribute_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movebattlestyle.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_naturebattlestylepreference
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movebattlestylename.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_battle_style_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movechange.yaml

@@ -15,9 +15,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: version_group_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclass.yaml

@@ -38,9 +38,9 @@ array_relationships:
           name: pokemon_v2_type
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclassdescription.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_damage_class_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movedamageclassname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_damage_class_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffect.yaml

@@ -31,9 +31,9 @@ array_relationships:
           name: pokemon_v2_move
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffectchange.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_moveeffectchangeeffecttext
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffectchangeeffecttext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_effect_change_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveeffecteffecttext.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_effect_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_moveflavortext.yaml

@@ -12,9 +12,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: version_group_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethod.yaml

@@ -31,9 +31,9 @@ array_relationships:
           name: pokemon_v2_versiongroupmovelearnmethod
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethoddescription.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_learn_method_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movelearnmethodname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_learn_method_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movemeta.yaml

@@ -12,9 +12,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_meta_category_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movemetaailment.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_movemetaailmentname
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movemetaailmentname.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_meta_ailment_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movemetacategory.yaml

@@ -17,9 +17,9 @@ array_relationships:
           name: pokemon_v2_movemetacategorydescription
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movemetacategorydescription.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_meta_category_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movemetastatchange.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: stat_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movename.yaml

@@ -9,9 +9,9 @@ object_relationships:
     using:
       foreign_key_constraint_on: move_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_movetarget.yaml

@@ -24,9 +24,9 @@ array_relationships:
           name: pokemon_v2_movetargetname
           schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
+  - role: anon
+    permission:
+      columns: '*'
       filter: {}
       limit: 100000
-  role: anon
+      allow_aggregations: true