Merge branch 'master' into openapi-nix

This commit is contained in:
A 2024-04-05 00:18:13 -05:00 committed by GitHub
commit 31beff3ec8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 132 additions and 129 deletions

View file

@ -140,10 +140,10 @@ update-graphql-data-prod:
git submodule update --init git submodule update --init
docker compose stop graphql-engine docker compose stop graphql-engine
sync; echo 3 > /proc/sys/vm/drop_caches sync; echo 3 > /proc/sys/vm/drop_caches
docker compose -f docker-compose.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 cache
make docker-migrate make docker-migrate
make docker-build-db make docker-build-db
docker compose stop app docker compose stop app cache
sync; echo 3 > /proc/sys/vm/drop_caches sync; echo 3 > /proc/sys/vm/drop_caches
docker compose exec -T web sh -c 'rm -rf /tmp/cache/*' docker compose exec -T web sh -c 'rm -rf /tmp/cache/*'
docker compose start graphql-engine docker compose start graphql-engine

View file

@ -1,5 +1,8 @@
version: '2.4' version: '2.4'
services: services:
cache:
restart: "no"
db: db:
environment: environment:
POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"

View file

@ -897,133 +897,133 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
896,glastrier,896,22,8000,290,1088,1 896,glastrier,896,22,8000,290,1088,1
897,spectrier,897,20,445,290,1089,1 897,spectrier,897,20,445,290,1089,1
898,calyrex,898,11,77,250,1090,1 898,calyrex,898,11,77,250,1090,1
899,wyrdeer,899,18,951,,,1 899,wyrdeer,899,18,951,263,,1
900,kleavor,900,18,890,,,1 900,kleavor,900,18,890,175,,1
901,ursaluna,901,24,2900,,,1 901,ursaluna,901,24,2900,275,,1
902,basculegion-male,902,30,1100,,,1 902,basculegion-male,902,30,1100,265,,1
903,sneasler,903,13,430,,,1 903,sneasler,903,13,430,102,,1
904,overqwil,904,25,605,,,1 904,overqwil,904,25,605,179,,1
905,enamorus-incarnate,905,16,480,,,1 905,enamorus-incarnate,905,16,480,116,,1
906,sprigatito,906,4,41,,906,1 906,sprigatito,906,4,41,62,906,1
907,floragato,907,9,122,,907,1 907,floragato,907,9,122,144,907,1
908,meowscarada,908,15,312,,908,1 908,meowscarada,908,15,312,265,908,1
909,fuecoco,909,4,98,,909,1 909,fuecoco,909,4,98,62,909,1
910,crocalor,910,10,307,,910,1 910,crocalor,910,10,307,144,910,1
911,skeledirge,911,16,3265,,911,1 911,skeledirge,911,16,3265,265,911,1
912,quaxly,912,5,61,,912,1 912,quaxly,912,5,61,62,912,1
913,quaxwell,913,12,215,,913,1 913,quaxwell,913,12,215,144,913,1
914,quaquaval,914,18,619,,914,1 914,quaquaval,914,18,619,265,914,1
915,lechonk,915,5,102,,915,1 915,lechonk,915,5,102,51,915,1
916,oinkologne,916,10,1200,,916,1 916,oinkologne,916,10,1200,171,916,1
917,tarountula,917,3,40,,918,1 917,tarountula,917,3,40,42,918,1
918,spidops,918,10,165,,919,1 918,spidops,918,10,165,141,919,1
919,nymble,919,2,10,,920,1 919,nymble,919,2,10,42,920,1
920,lokix,920,10,175,,921,1 920,lokix,920,10,175,158,921,1
921,pawmi,921,3,25,,954,1 921,pawmi,921,3,25,48,954,1
922,pawmo,922,4,65,,955,1 922,pawmo,922,4,65,123,955,1
923,pawmot,923,9,410,,956,1 923,pawmot,923,9,410,245,956,1
924,tandemaus,924,3,18,,945,1 924,tandemaus,924,3,18,61,945,1
925,maushold,925,3,23,,946,1 925,maushold,925,3,23,165,946,1
926,fidough,926,3,109,,970,1 926,fidough,926,3,109,62,970,1
927,dachsbun,927,5,149,,971,1 927,dachsbun,927,5,149,167,971,1
928,smoliv,928,3,65,,935,1 928,smoliv,928,3,65,52,935,1
929,dolliv,929,6,119,,936,1 929,dolliv,929,6,119,124,936,1
930,arboliva,930,14,482,,937,1 930,arboliva,930,14,482,255,937,1
931,squawkabilly,931,6,24,,960,1 931,squawkabilly,931,6,24,146,960,1
932,nacli,932,4,160,,963,1 932,nacli,932,4,160,56,963,1
933,naclstack,933,6,1050,,964,1 933,naclstack,933,6,1050,124,964,1
934,garganacl,934,23,2400,,965,1 934,garganacl,934,23,2400,250,965,1
935,charcadet,935,6,105,,1003,1 935,charcadet,935,6,105,51,1003,1
936,armarouge,936,15,850,,1004,1 936,armarouge,936,15,850,263,1004,1
937,ceruledge,937,16,620,,1005,1 937,ceruledge,937,16,620,263,1005,1
938,tadbulb,938,3,4,,940,1 938,tadbulb,938,3,4,54,940,1
939,bellibolt,939,12,1130,,941,1 939,bellibolt,939,12,1130,173,941,1
940,wattrel,940,4,36,,957,1 940,wattrel,940,4,36,56,957,1
941,kilowattrel,941,14,386,,958,1 941,kilowattrel,941,14,386,172,958,1
942,maschiff,942,5,160,,972,1 942,maschiff,942,5,160,68,972,1
943,mabosstiff,943,11,610,,973,1 943,mabosstiff,943,11,610,177,973,1
944,shroodle,944,2,7,,968,1 944,shroodle,944,2,7,58,968,1
945,grafaiai,945,7,272,,969,1 945,grafaiai,945,7,272,170,969,1
946,bramblin,946,6,6,,974,1 946,bramblin,946,6,6,55,974,1
947,brambleghast,947,12,60,,975,1 947,brambleghast,947,12,60,168,975,1
948,toedscool,948,9,330,,1006,1 948,toedscool,948,9,330,67,1006,1
949,toedscruel,949,19,580,,1007,1 949,toedscruel,949,19,580,180,1007,1
950,klawf,950,13,790,,962,1 950,klawf,950,13,790,158,962,1
951,capsakid,951,3,30,,938,1 951,capsakid,951,3,30,61,938,1
952,scovillain,952,9,150,,939,1 952,scovillain,952,9,150,170,939,1
953,rellor,953,2,10,,922,1 953,rellor,953,2,10,54,922,1
954,rabsca,954,3,35,,923,1 954,rabsca,954,3,35,165,923,1
955,flittle,955,2,15,,926,1 955,flittle,955,2,15,51,926,1
956,espathra,956,19,900,,927,1 956,espathra,956,19,900,168,927,1
957,tinkatink,957,4,89,,1000,1 957,tinkatink,957,4,89,59,1000,1
958,tinkatuff,958,7,591,,1001,1 958,tinkatuff,958,7,591,133,1001,1
959,tinkaton,959,7,1128,,1002,1 959,tinkaton,959,7,1128,253,1002,1
960,wiglett,960,12,18,,929,1 960,wiglett,960,12,18,49,929,1
961,wugtrio,961,12,54,,930,1 961,wugtrio,961,12,54,149,930,1
962,bombirdier,962,15,429,,959,1 962,bombirdier,962,15,429,243,959,1
963,finizen,963,13,602,,933,1 963,finizen,963,13,602,63,933,1
964,palafin,964,13,602,,934,1 964,palafin,964,13,602,160,934,1
965,varoom,965,10,350,,942,1 965,varoom,965,10,350,60,942,1
966,revavroom,966,18,1200,,943,1 966,revavroom,966,18,1200,175,943,1
967,cyclizar,967,16,630,,953,1 967,cyclizar,967,16,630,175,953,1
968,orthworm,968,25,3100,,944,1 968,orthworm,968,25,3100,240,944,1
969,glimmet,969,7,80,,966,1 969,glimmet,969,7,80,70,966,1
970,glimmora,970,15,450,,967,1 970,glimmora,970,15,450,184,967,1
971,greavard,971,6,350,,924,1 971,greavard,971,6,350,58,924,1
972,houndstone,972,20,150,,925,1 972,houndstone,972,20,150,171,925,1
973,flamigo,973,16,370,,961,1 973,flamigo,973,16,370,175,961,1
974,cetoddle,974,12,450,,947,1 974,cetoddle,974,12,450,67,947,1
975,cetitan,975,45,7000,,948,1 975,cetitan,975,45,7000,182,948,1
976,veluza,976,25,900,,932,1 976,veluza,976,25,900,167,932,1
977,dondozo,977,120,2200,,931,1 977,dondozo,977,120,2200,265,931,1
978,tatsugiri,978,3,80,,952,1 978,tatsugiri,978,3,80,166,952,1
979,annihilape,979,12,560,,1010,1 979,annihilape,979,12,560,268,1010,1
980,clodsire,980,18,2230,,1009,1 980,clodsire,980,18,2230,151,1009,1
981,farigiraf,981,32,1600,,928,1 981,farigiraf,981,32,1600,260,928,1
982,dudunsparce,982,36,392,,917,1 982,dudunsparce,982,36,392,182,917,1
983,kingambit,983,20,1200,,1008,1 983,kingambit,983,20,1200,275,1008,1
984,great-tusk,984,22,3200,,978,1 984,great-tusk,984,22,3200,285,978,1
985,scream-tail,985,12,80,,982,1 985,scream-tail,985,12,80,285,982,1
986,brute-bonnet,986,12,210,,979,1 986,brute-bonnet,986,12,210,285,979,1
987,flutter-mane,987,14,40,,983,1 987,flutter-mane,987,14,40,285,983,1
988,slither-wing,988,32,920,,984,1 988,slither-wing,988,32,920,285,984,1
989,sandy-shocks,989,23,600,,981,1 989,sandy-shocks,989,23,600,285,981,1
990,iron-treads,990,9,2400,,986,1 990,iron-treads,990,9,2400,285,986,1
991,iron-bundle,991,6,110,,992,1 991,iron-bundle,991,6,110,285,992,1
992,iron-hands,992,18,3807,,989,1 992,iron-hands,992,18,3807,285,989,1
993,iron-jugulis,993,13,1110,,990,1 993,iron-jugulis,993,13,1110,285,990,1
994,iron-moth,994,12,360,,988,1 994,iron-moth,994,12,360,285,988,1
995,iron-thorns,995,16,3030,,991,1 995,iron-thorns,995,16,3030,285,991,1
996,frigibax,996,5,170,,949,1 996,frigibax,996,5,170,64,949,1
997,arctibax,997,8,300,,950,1 997,arctibax,997,8,300,148,950,1
998,baxcalibur,998,21,2100,,951,1 998,baxcalibur,998,21,2100,300,951,1
999,gimmighoul,999,3,50,,976,1 999,gimmighoul,999,3,50,60,976,1
1000,gholdengo,1000,12,300,,977,1 1000,gholdengo,1000,12,300,275,977,1
1001,wo-chien,1001,15,742,,996,1 1001,wo-chien,1001,15,742,285,996,1
1002,chien-pao,1002,19,1522,,995,1 1002,chien-pao,1002,19,1522,285,995,1
1003,ting-lu,1003,27,6997,,994,1 1003,ting-lu,1003,27,6997,285,994,1
1004,chi-yu,1004,4,49,,997,1 1004,chi-yu,1004,4,49,285,997,1
1005,roaring-moon,1005,20,3800,,985,1 1005,roaring-moon,1005,20,3800,295,985,1
1006,iron-valiant,1006,14,350,,993,1 1006,iron-valiant,1006,14,350,295,993,1
1007,koraidon,1007,25,3030,,998,1 1007,koraidon,1007,25,3030,335,998,1
1008,miraidon,1008,35,2400,,999,1 1008,miraidon,1008,35,2400,335,999,1
1009,walking-wake,1009,35,2800,,1093,1 1009,walking-wake,1009,35,2800,295,1093,1
1010,iron-leaves,1010,15,1250,,1094,1 1010,iron-leaves,1010,15,1250,295,1094,1
1011,dipplin,1011,4,97,,1095,1 1011,dipplin,1011,4,97,170,1095,1
1012,poltchageist,1012,1,11,,1096,1 1012,poltchageist,1012,1,11,62,1096,1
1013,sinistcha,1013,2,22,,1097,1 1013,sinistcha,1013,2,22,178,1097,1
1014,okidogi,1014,18,922,,1098,1 1014,okidogi,1014,18,922,278,1098,1
1015,munkidori,1015,10,122,,1099,1 1015,munkidori,1015,10,122,278,1099,1
1016,fezandipiti,1016,14,301,,1100,1 1016,fezandipiti,1016,14,301,278,1100,1
1017,ogerpon,1017,12,398,,1101,1 1017,ogerpon,1017,12,398,275,1101,1
1018,archaludon,1018,20,600,,1102,1 1018,archaludon,1018,20,600,300,1102,1
1019,hydrapple,1019,18,930,,1103,1 1019,hydrapple,1019,18,930,270,1103,1
1020,gouging-fire,1020,35,5900,,1104,1 1020,gouging-fire,1020,35,5900,295,1104,1
1021,raging-bolt,1021,52,4800,,1105,1 1021,raging-bolt,1021,52,4800,295,1105,1
1022,iron-boulder,1022,15,1625,,1106,1 1022,iron-boulder,1022,15,1625,295,1106,1
1023,iron-crown,1023,16,1560,,1107,1 1023,iron-crown,1023,16,1560,295,1107,1
1024,terapagos,1024,2,65,,1108,1 1024,terapagos,1024,2,65,90,1108,1
1025,pecharunt,1025,3,3,,1109,1 1025,pecharunt,1025,3,3,300,1109,1
10001,deoxys-attack,386,17,608,270,515,0 10001,deoxys-attack,386,17,608,270,515,0
10002,deoxys-defense,386,17,608,270,516,0 10002,deoxys-defense,386,17,608,270,516,0
10003,deoxys-speed,386,17,608,270,517,0 10003,deoxys-speed,386,17,608,270,517,0

1 id identifier species_id height weight base_experience order is_default
897 896 glastrier 896 22 8000 290 1088 1
898 897 spectrier 897 20 445 290 1089 1
899 898 calyrex 898 11 77 250 1090 1
900 899 wyrdeer 899 18 951 263 1
901 900 kleavor 900 18 890 175 1
902 901 ursaluna 901 24 2900 275 1
903 902 basculegion-male 902 30 1100 265 1
904 903 sneasler 903 13 430 102 1
905 904 overqwil 904 25 605 179 1
906 905 enamorus-incarnate 905 16 480 116 1
907 906 sprigatito 906 4 41 62 906 1
908 907 floragato 907 9 122 144 907 1
909 908 meowscarada 908 15 312 265 908 1
910 909 fuecoco 909 4 98 62 909 1
911 910 crocalor 910 10 307 144 910 1
912 911 skeledirge 911 16 3265 265 911 1
913 912 quaxly 912 5 61 62 912 1
914 913 quaxwell 913 12 215 144 913 1
915 914 quaquaval 914 18 619 265 914 1
916 915 lechonk 915 5 102 51 915 1
917 916 oinkologne 916 10 1200 171 916 1
918 917 tarountula 917 3 40 42 918 1
919 918 spidops 918 10 165 141 919 1
920 919 nymble 919 2 10 42 920 1
921 920 lokix 920 10 175 158 921 1
922 921 pawmi 921 3 25 48 954 1
923 922 pawmo 922 4 65 123 955 1
924 923 pawmot 923 9 410 245 956 1
925 924 tandemaus 924 3 18 61 945 1
926 925 maushold 925 3 23 165 946 1
927 926 fidough 926 3 109 62 970 1
928 927 dachsbun 927 5 149 167 971 1
929 928 smoliv 928 3 65 52 935 1
930 929 dolliv 929 6 119 124 936 1
931 930 arboliva 930 14 482 255 937 1
932 931 squawkabilly 931 6 24 146 960 1
933 932 nacli 932 4 160 56 963 1
934 933 naclstack 933 6 1050 124 964 1
935 934 garganacl 934 23 2400 250 965 1
936 935 charcadet 935 6 105 51 1003 1
937 936 armarouge 936 15 850 263 1004 1
938 937 ceruledge 937 16 620 263 1005 1
939 938 tadbulb 938 3 4 54 940 1
940 939 bellibolt 939 12 1130 173 941 1
941 940 wattrel 940 4 36 56 957 1
942 941 kilowattrel 941 14 386 172 958 1
943 942 maschiff 942 5 160 68 972 1
944 943 mabosstiff 943 11 610 177 973 1
945 944 shroodle 944 2 7 58 968 1
946 945 grafaiai 945 7 272 170 969 1
947 946 bramblin 946 6 6 55 974 1
948 947 brambleghast 947 12 60 168 975 1
949 948 toedscool 948 9 330 67 1006 1
950 949 toedscruel 949 19 580 180 1007 1
951 950 klawf 950 13 790 158 962 1
952 951 capsakid 951 3 30 61 938 1
953 952 scovillain 952 9 150 170 939 1
954 953 rellor 953 2 10 54 922 1
955 954 rabsca 954 3 35 165 923 1
956 955 flittle 955 2 15 51 926 1
957 956 espathra 956 19 900 168 927 1
958 957 tinkatink 957 4 89 59 1000 1
959 958 tinkatuff 958 7 591 133 1001 1
960 959 tinkaton 959 7 1128 253 1002 1
961 960 wiglett 960 12 18 49 929 1
962 961 wugtrio 961 12 54 149 930 1
963 962 bombirdier 962 15 429 243 959 1
964 963 finizen 963 13 602 63 933 1
965 964 palafin 964 13 602 160 934 1
966 965 varoom 965 10 350 60 942 1
967 966 revavroom 966 18 1200 175 943 1
968 967 cyclizar 967 16 630 175 953 1
969 968 orthworm 968 25 3100 240 944 1
970 969 glimmet 969 7 80 70 966 1
971 970 glimmora 970 15 450 184 967 1
972 971 greavard 971 6 350 58 924 1
973 972 houndstone 972 20 150 171 925 1
974 973 flamigo 973 16 370 175 961 1
975 974 cetoddle 974 12 450 67 947 1
976 975 cetitan 975 45 7000 182 948 1
977 976 veluza 976 25 900 167 932 1
978 977 dondozo 977 120 2200 265 931 1
979 978 tatsugiri 978 3 80 166 952 1
980 979 annihilape 979 12 560 268 1010 1
981 980 clodsire 980 18 2230 151 1009 1
982 981 farigiraf 981 32 1600 260 928 1
983 982 dudunsparce 982 36 392 182 917 1
984 983 kingambit 983 20 1200 275 1008 1
985 984 great-tusk 984 22 3200 285 978 1
986 985 scream-tail 985 12 80 285 982 1
987 986 brute-bonnet 986 12 210 285 979 1
988 987 flutter-mane 987 14 40 285 983 1
989 988 slither-wing 988 32 920 285 984 1
990 989 sandy-shocks 989 23 600 285 981 1
991 990 iron-treads 990 9 2400 285 986 1
992 991 iron-bundle 991 6 110 285 992 1
993 992 iron-hands 992 18 3807 285 989 1
994 993 iron-jugulis 993 13 1110 285 990 1
995 994 iron-moth 994 12 360 285 988 1
996 995 iron-thorns 995 16 3030 285 991 1
997 996 frigibax 996 5 170 64 949 1
998 997 arctibax 997 8 300 148 950 1
999 998 baxcalibur 998 21 2100 300 951 1
1000 999 gimmighoul 999 3 50 60 976 1
1001 1000 gholdengo 1000 12 300 275 977 1
1002 1001 wo-chien 1001 15 742 285 996 1
1003 1002 chien-pao 1002 19 1522 285 995 1
1004 1003 ting-lu 1003 27 6997 285 994 1
1005 1004 chi-yu 1004 4 49 285 997 1
1006 1005 roaring-moon 1005 20 3800 295 985 1
1007 1006 iron-valiant 1006 14 350 295 993 1
1008 1007 koraidon 1007 25 3030 335 998 1
1009 1008 miraidon 1008 35 2400 335 999 1
1010 1009 walking-wake 1009 35 2800 295 1093 1
1011 1010 iron-leaves 1010 15 1250 295 1094 1
1012 1011 dipplin 1011 4 97 170 1095 1
1013 1012 poltchageist 1012 1 11 62 1096 1
1014 1013 sinistcha 1013 2 22 178 1097 1
1015 1014 okidogi 1014 18 922 278 1098 1
1016 1015 munkidori 1015 10 122 278 1099 1
1017 1016 fezandipiti 1016 14 301 278 1100 1
1018 1017 ogerpon 1017 12 398 275 1101 1
1019 1018 archaludon 1018 20 600 300 1102 1
1020 1019 hydrapple 1019 18 930 270 1103 1
1021 1020 gouging-fire 1020 35 5900 295 1104 1
1022 1021 raging-bolt 1021 52 4800 295 1105 1
1023 1022 iron-boulder 1022 15 1625 295 1106 1
1024 1023 iron-crown 1023 16 1560 295 1107 1
1025 1024 terapagos 1024 2 65 90 1108 1
1026 1025 pecharunt 1025 3 3 300 1109 1
1027 10001 deoxys-attack 386 17 608 270 515 0
1028 10002 deoxys-defense 386 17 608 270 516 0
1029 10003 deoxys-speed 386 17 608 270 517 0