Merge branch 'master' into issue1024

This commit is contained in:
Robert Williams 2024-02-18 23:10:31 -06:00 committed by GitHub
commit 567e6a1477
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 43 additions and 15 deletions

View file

@ -1218,7 +1218,7 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10192,beedrill-mega,mega,10090,16,1,1,1,2,20
10193,rattata-alola,alola,10091,17,1,0,0,2,26
10194,raticate-alola,alola,10092,17,1,0,0,2,28
10195,raticate-totem-alola,totem-alola,10093,17,1,1,0,3,29
10195,raticate-totem-alola,totem-alola,10093,17,1,0,0,3,29
10196,pikachu-original-cap,original-cap,10094,17,1,0,0,8,43
10197,pikachu-hoenn-cap,hoenn-cap,10095,17,1,0,0,9,44
10198,pikachu-sinnoh-cap,sinnoh-cap,10096,17,1,0,0,10,45
@ -1245,16 +1245,16 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10219,greninja-ash,ash,10117,17,1,1,0,3,853
10220,zygarde-10-power-construct,10-power-construct,10118,17,1,0,0,3,1002
10221,zygarde-50-power-construct,50-power-construct,10119,17,1,0,0,4,1003
10222,zygarde-complete,complete,10120,17,1,0,0,5,1004
10223,gumshoos-totem,totem,10121,17,1,1,0,2,1024
10224,vikavolt-totem,totem,10122,17,1,1,0,2,1028
10222,zygarde-complete,complete,10120,17,1,1,0,5,1004
10223,gumshoos-totem,totem,10121,17,1,0,0,2,1024
10224,vikavolt-totem,totem,10122,17,1,0,0,2,1028
10225,oricorio-pom-pom,pom-pom,10123,17,1,0,0,2,1032
10226,oricorio-pau,pau,10124,17,1,0,0,3,1033
10227,oricorio-sensu,sensu,10125,17,1,0,0,4,1034
10228,lycanroc-midnight,midnight,10126,17,1,0,0,2,1041
10229,wishiwashi-school,school,10127,17,1,1,0,2,1044
10230,lurantis-totem,totem,10128,17,1,1,0,2,1054
10231,salazzle-totem,totem,10129,17,1,1,0,2,1059
10230,lurantis-totem,totem,10128,17,1,0,0,2,1054
10231,salazzle-totem,totem,10129,17,1,0,0,2,1059
10232,silvally-fighting,fighting,773,17,0,0,0,2,1075
10233,silvally-flying,flying,773,17,0,0,0,3,1076
10234,silvally-poison,poison,773,17,0,0,0,4,1077
@ -1286,9 +1286,9 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10260,minior-indigo,indigo,10141,17,1,0,0,13,1104
10261,minior-violet,violet,10142,17,1,0,0,14,1105
10262,mimikyu-busted,busted,10143,17,1,1,0,2,1111
10263,mimikyu-totem-disguised,totem-disguised,10144,17,1,1,0,3,1112
10263,mimikyu-totem-disguised,totem-disguised,10144,17,1,0,0,3,1112
10264,mimikyu-totem-busted,totem-busted,10145,17,1,1,0,4,1113
10265,kommo-o-totem,totem,10146,17,1,1,0,2,1120
10265,kommo-o-totem,totem,10146,17,1,0,0,2,1120
10266,magearna-original,original,10147,17,1,0,0,2,1141
10267,pikachu-partner-cap,partner-cap,10148,18,1,0,0,14,49
10268,marowak-totem,totem,10149,18,1,0,0,3,167
@ -1360,12 +1360,12 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10334,linoone-galar,galar,10175,20,1,0,0,2,392
10335,darumaka-galar,galar,10176,20,1,0,0,2,725
10336,darmanitan-galar-standard,galar-standard,10177,20,1,0,0,3,728
10337,darmanitan-galar-zen,galar-zen,10178,20,1,0,0,4,729
10337,darmanitan-galar-zen,galar-zen,10178,20,1,1,0,4,729
10338,yamask-galar,galar,10179,20,1,0,0,2,737
10339,stunfisk-galar,galar,10180,20,1,0,0,2,800
10340,zygarde-10,10,10181,17,1,0,0,2,1001
10341,cramorant-gulping,gulping,10182,20,1,0,0,2,1186
10342,cramorant-gorging,gorging,10183,20,1,0,0,3,1187
10341,cramorant-gulping,gulping,10182,20,1,1,0,2,1186
10342,cramorant-gorging,gorging,10183,20,1,1,0,3,1187
10343,toxtricity-low-key,low-key,10184,20,1,0,0,2,1192
10344,sinistea-antique,antique,854,20,0,0,0,2,1198
10345,polteageist-antique,antique,855,20,0,0,0,2,1200
@ -1377,11 +1377,11 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10351,alcremie-ruby-swirl,ruby-swirl,869,20,0,0,0,7,1220
10352,alcremie-caramel-swirl,caramel-swirl,869,20,0,0,0,8,1221
10353,alcremie-rainbow-swirl,rainbow-swirl,869,20,0,0,0,9,1222
10354,eiscue-noice,noice,10185,20,1,0,0,2,1229
10354,eiscue-noice,noice,10185,20,1,1,0,2,1229
10355,indeedee-female,female,10186,20,1,0,0,2,1231
10356,morpeko-hangry,hangry,10187,20,1,0,0,2,1233
10357,zacian-crowned,crowned,10188,20,1,0,0,2,1245
10358,zamazenta-crowned,crowned,10189,20,1,0,0,2,1247
10356,morpeko-hangry,hangry,10187,20,1,1,0,2,1233
10357,zacian-crowned,crowned,10188,20,1,1,0,2,1245
10358,zamazenta-crowned,crowned,10189,20,1,1,0,2,1247
10359,eternatus-eternamax,eternamax,10190,20,1,0,0,2,1249
10360,urshifu-rapid-strike,rapid-strike,10191,20,1,0,0,2,1252
10361,zarude-dada,dada,10192,20,1,0,0,2,1254

1 id identifier form_identifier pokemon_id introduced_in_version_group_id is_default is_battle_only is_mega form_order order
1218 10192 beedrill-mega mega 10090 16 1 1 1 2 20
1219 10193 rattata-alola alola 10091 17 1 0 0 2 26
1220 10194 raticate-alola alola 10092 17 1 0 0 2 28
1221 10195 raticate-totem-alola totem-alola 10093 17 1 1 0 0 3 29
1222 10196 pikachu-original-cap original-cap 10094 17 1 0 0 8 43
1223 10197 pikachu-hoenn-cap hoenn-cap 10095 17 1 0 0 9 44
1224 10198 pikachu-sinnoh-cap sinnoh-cap 10096 17 1 0 0 10 45
1245 10219 greninja-ash ash 10117 17 1 1 0 3 853
1246 10220 zygarde-10-power-construct 10-power-construct 10118 17 1 0 0 3 1002
1247 10221 zygarde-50-power-construct 50-power-construct 10119 17 1 0 0 4 1003
1248 10222 zygarde-complete complete 10120 17 1 0 1 0 5 1004
1249 10223 gumshoos-totem totem 10121 17 1 1 0 0 2 1024
1250 10224 vikavolt-totem totem 10122 17 1 1 0 0 2 1028
1251 10225 oricorio-pom-pom pom-pom 10123 17 1 0 0 2 1032
1252 10226 oricorio-pau pau 10124 17 1 0 0 3 1033
1253 10227 oricorio-sensu sensu 10125 17 1 0 0 4 1034
1254 10228 lycanroc-midnight midnight 10126 17 1 0 0 2 1041
1255 10229 wishiwashi-school school 10127 17 1 1 0 2 1044
1256 10230 lurantis-totem totem 10128 17 1 1 0 0 2 1054
1257 10231 salazzle-totem totem 10129 17 1 1 0 0 2 1059
1258 10232 silvally-fighting fighting 773 17 0 0 0 2 1075
1259 10233 silvally-flying flying 773 17 0 0 0 3 1076
1260 10234 silvally-poison poison 773 17 0 0 0 4 1077
1286 10260 minior-indigo indigo 10141 17 1 0 0 13 1104
1287 10261 minior-violet violet 10142 17 1 0 0 14 1105
1288 10262 mimikyu-busted busted 10143 17 1 1 0 2 1111
1289 10263 mimikyu-totem-disguised totem-disguised 10144 17 1 1 0 0 3 1112
1290 10264 mimikyu-totem-busted totem-busted 10145 17 1 1 0 4 1113
1291 10265 kommo-o-totem totem 10146 17 1 1 0 0 2 1120
1292 10266 magearna-original original 10147 17 1 0 0 2 1141
1293 10267 pikachu-partner-cap partner-cap 10148 18 1 0 0 14 49
1294 10268 marowak-totem totem 10149 18 1 0 0 3 167
1360 10334 linoone-galar galar 10175 20 1 0 0 2 392
1361 10335 darumaka-galar galar 10176 20 1 0 0 2 725
1362 10336 darmanitan-galar-standard galar-standard 10177 20 1 0 0 3 728
1363 10337 darmanitan-galar-zen galar-zen 10178 20 1 0 1 0 4 729
1364 10338 yamask-galar galar 10179 20 1 0 0 2 737
1365 10339 stunfisk-galar galar 10180 20 1 0 0 2 800
1366 10340 zygarde-10 10 10181 17 1 0 0 2 1001
1367 10341 cramorant-gulping gulping 10182 20 1 0 1 0 2 1186
1368 10342 cramorant-gorging gorging 10183 20 1 0 1 0 3 1187
1369 10343 toxtricity-low-key low-key 10184 20 1 0 0 2 1192
1370 10344 sinistea-antique antique 854 20 0 0 0 2 1198
1371 10345 polteageist-antique antique 855 20 0 0 0 2 1200
1377 10351 alcremie-ruby-swirl ruby-swirl 869 20 0 0 0 7 1220
1378 10352 alcremie-caramel-swirl caramel-swirl 869 20 0 0 0 8 1221
1379 10353 alcremie-rainbow-swirl rainbow-swirl 869 20 0 0 0 9 1222
1380 10354 eiscue-noice noice 10185 20 1 0 1 0 2 1229
1381 10355 indeedee-female female 10186 20 1 0 0 2 1231
1382 10356 morpeko-hangry hangry 10187 20 1 0 1 0 2 1233
1383 10357 zacian-crowned crowned 10188 20 1 0 1 0 2 1245
1384 10358 zamazenta-crowned crowned 10189 20 1 0 1 0 2 1247
1385 10359 eternatus-eternamax eternamax 10190 20 1 0 0 2 1249
1386 10360 urshifu-rapid-strike rapid-strike 10191 20 1 0 0 2 1252
1387 10361 zarude-dada dada 10192 20 1 0 0 2 1254

View file

@ -11,3 +11,10 @@ object_relationships:
- name: pokemon_v2_pokemon
using:
foreign_key_constraint_on: pokemon_id
select_permissions:
- role: anon
permission:
columns: '*'
filter: {}
limit: 100000
allow_aggregations: true

View file

@ -0,0 +1,14 @@
table:
name: pokemon_v2_pokemoncries
schema: public
object_relationships:
- name: pokemon_v2_pokemon
using:
foreign_key_constraint_on: pokemon_id
select_permissions:
- role: anon
permission:
columns: '*'
filter: {}
limit: 100000
allow_aggregations: true

View file

@ -11,3 +11,10 @@ object_relationships:
- name: pokemon_v2_type
using:
foreign_key_constraint_on: damage_type_id
select_permissions:
- role: anon
permission:
columns: '*'
filter: {}
limit: 100000
allow_aggregations: true