From ba0f7ea62c541232b1242fc735829a6b7c22d6f5 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Mon, 17 Jul 2023 18:34:10 +0200 Subject: [PATCH] Upgrade all Rust dependencies This includes breaking changes of sqlx 0.7.0 --- Cargo.lock | 1357 ++++---- Cargo.toml | 18 + crates/axum-utils/Cargo.toml | 10 +- crates/cli/Cargo.toml | 18 +- crates/cli/src/commands/manage.rs | 8 +- crates/cli/src/util.rs | 4 +- crates/config/Cargo.toml | 12 +- crates/data-model/Cargo.toml | 4 +- crates/email/Cargo.toml | 2 +- crates/graphql/Cargo.toml | 6 +- crates/handlers/Cargo.toml | 28 +- crates/handlers/src/health.rs | 2 +- ...s__passwords__tests__hashing_pbkdf2-2.snap | 2 +- ...ers__passwords__tests__hashing_pbkdf2.snap | 2 +- crates/http/Cargo.toml | 14 +- crates/iana-codegen/Cargo.toml | 6 +- crates/iana/Cargo.toml | 2 +- crates/jose/Cargo.toml | 10 +- crates/keystore/Cargo.toml | 8 +- crates/listener/Cargo.toml | 4 +- crates/matrix-synapse/Cargo.toml | 6 +- crates/matrix/Cargo.toml | 2 +- crates/oauth2-types/Cargo.toml | 10 +- crates/oidc-client/Cargo.toml | 8 +- crates/policy/Cargo.toml | 10 +- crates/router/Cargo.toml | 4 +- crates/spa/Cargo.toml | 6 +- ...fd9af472689d5aef7c1c4b1c594ca57c02237.json | 16 + ...fdd80f596ed433f37f2528c7edbdc88b13646.json | 14 + ...2709c870ead848d6920cdfdb18912d543488e.json | 52 + ...ab041d79ba48528420160e23286369db7af35.json | 40 + ...b93249acc7237b996e8b93cd61b9f69c902ff.json | 14 + ...af3544ea6d6d75d10b432b07dbd0dadd2fa4e.json | 53 + ...0a9b7b920d807a4b6c235e1bee524cd73b266.json | 14 + ...c0b3037c8c4714533a6240c62275332aa58dc.json | 14 + ...0d0e4e9e1fd1f9ea53b7a359c9025d7304223.json | 15 + ...3361bb85911c48f7db6c3873b0f5abf35940b.json | 14 + ...cf0963f92b6d15e6af0e69378a6447dee677c.json | 14 + ...a8e9e5723e4749d339465492b68e072c3a802.json | 29 + ...10a8ca899640e78cc8f5b03168622928ffe94.json | 14 + ...e672f5c35eed7c9a9e57ff52888b1768a5ed6.json | 46 + ...38e94cd5cf8b5c42cb037efb7917c6fc44a1d.json | 46 + ...80eef7de2836e85b078232d143d6712fc2be4.json | 16 + ...726c0a4f89f65b4dc3e33ddad58aabf6b148b.json | 52 + ...b924dc20785c91770ed43d62df2e590e8da71.json | 46 + ...f04dbb8230e4b0b0bcc45f669d7b8d0b91db4.json | 52 + ...2bc504d1b6bd0f5283de53c8c7b1b4b7dafd4.json | 58 + ...362626daebb0121c3c9420b96e2d8157f1e07.json | 130 + ...0cbef28facdfd2e45d1c72c57f47418fbe24b.json | 16 + ...1bd993088526923769a9147281686c2d47591.json | 46 + ...50f3dab1bfc76f35ad488e1560ea37f7ed029.json | 18 + ...d25fe794bc0b69c5938275711faa7a80b811f.json | 14 + ...0255fb8cfb2adaa65f47b78a8fac11d8c91c3.json | 17 + ...5b76ff901c183b314f8ccb5018d70c516abf6.json | 14 + ...6be00683ba0635a13eb7fcd403d3d4a3f90db.json | 22 + ...9ad8a6c1c777d1daea024b8ca2e7f0dd75b0f.json | 19 + ...2fdb0f77340d7a4df642a2942174aba2c6502.json | 70 + ...d10b233d07e863b3a5c776c5db97cff263c8c.json | 76 + ...9bbe6b23a8861c09a7246dc1659c28f12bf8d.json | 15 + ...7be602e2fbc34a5582f31f95b0cc5fa2aeb92.json | 20 + ...6728e6dd275cae745f9c646e3824d859c5384.json | 130 + ...db550dee05c44c9d93f53df95fe3b4a840347.json | 17 + ...39fb7f81015f7ceef61ecaadba64521895cff.json | 19 + ...6d3b130ec71bc592d722eb75b959b80f0b4ff.json | 22 + ...d3313a02886994cfff0690451229fb5ae2f77.json | 46 + ...20d381a254d00dbe39fef1e9652029d51b89b.json | 64 + ...fcb4e3d50c90accdaf22ca1cfeefdc9734300.json | 16 + ...40bf66649742374e3643f1902ae69377fc9b6.json | 14 + ...9521b66eaafa51f73bf2f95e38b8f3b64a229.json | 15 + ...bf119d98cd35ebb52b1064fdb2d9eed78d0e8.json | 116 + ...4c21a158a5762fe220b6bfacd6576be6c613c.json | 40 + ...6914089f6243126a177b365bde37db5f6b33d.json | 118 + ...65bea6b799a43cf4c9264a37d392847e6eff0.json | 14 + ...6f7ae39bc5cb1572e3a2dcfcd67f196a1fa39.json | 23 + ...72f9993216d9b553c2e33a7edec26ffb0fc59.json | 15 + ...fef7d69d6ce0be1f930d9f16c50b921a8b819.json | 17 + ...014c6856229918b972b98946f98b75686ab6c.json | 14 + ...e9cc17a7927e3e5deb58f3917ceeb9ab4dede.json | 15 + ...cf38236766aaf4d894bf768debdff2b59fae2.json | 15 + ...42b37ee751b87b7fcc459602bdf8c46962443.json | 22 + ...2ce7e16bc5df0677c7cd4ecb4fdbc5ee86395.json | 18 + ...f5b8c297d055abe248cc876dbc12c5a7dc920.json | 18 + ...18705276bce41e9b19d5d7e910ad4b767fb5e.json | 18 + ...5c0491829e97db45f3234483872ed38436322.json | 46 + ...2db5b25462fa7669fde1941ccab4712585b20.json | 52 + ...763eed0582264861436eab3f862e3eb12cab1.json | 18 + ...99b7d0b690a2471873c6654b1b6cf2079b95c.json | 15 + ...e15923ba6c6882ded4860ebde4a7641359abb.json | 68 + ...9d378a2f11b2a27bbd86d60558318c87eb698.json | 18 + ...7ca7c55e284c18c5c1d1e78821dd9bc961412.json | 47 + ...edd7be9ba26435ea4a914421483f8ed832537.json | 16 + ...23cc5d8d31cb41287e693dcb82c6e199f7991.json | 18 + ...29341848fce336d339b6bbf425956f5ed5032.json | 15 + ...e34b7e457f857ed37c467c314142877fd5367.json | 15 + ...b0dd6c3b50e82ffbfee356e2cf755d72f00be.json | 23 + ...3df6e24a91775ceb877735508c1d5b2300d64.json | 17 + ...cb47fb628dabd8fadc50e6a5772903f851e1c.json | 14 + ...f76a9ba3e2ed3539ef16accb601fb609c2ec9.json | 15 + ...e451646a9ceeefa6f72b9c4e29b6d05f17641.json | 14 + ...d8a8376459109b6154a2c0c13b28462afa523.json | 28 + ...19e5ede3fa95484033e0312c30d9b6ecc03f0.json | 16 + ...d1f1a1766ff865f2e08a5daa095d2a1ccbd56.json | 15 + ...ffabc1d89202561b736c5d03b501dfcd8d886.json | 18 + ...2ebf14a1ba0d01681c3836366d3f55e7851f4.json | 15 + ...933323f28c6ee260b52cafe337dd3d19e865c.json | 22 + ...56d3688851c36a48a50aa6104e8291e73630d.json | 14 + ...18464f83b927dec620353516c0285b76fcf24.json | 118 + ...2d453ab449017ed492bf6711dc7fceb630880.json | 15 + ...dd3cbd6b65e7a13465552d79cd3c022122fd4.json | 52 + ...48b3d9581d67deea0c168f24e02090082bb82.json | 58 + ...612e4185cef838f105d66f18cb24865e45140.json | 52 + ...75d6f6d7ade64f782697715ac4da077b2e1fc.json | 47 + ...8cc2f5e7bef58a6c2e42a7bb0c1cb8f508671.json | 52 + ...e5febfec2a963ce6eac7b099b761594b1dfaf.json | 30 + ...81183f359771f9f77e5fad759d38d872541d1.json | 52 + crates/storage-pg/Cargo.toml | 10 +- crates/storage-pg/sqlx-data.json | 2744 ----------------- crates/storage/Cargo.toml | 6 +- crates/tasks/Cargo.toml | 12 +- crates/tasks/src/storage/postgres.rs | 40 +- crates/templates/Cargo.toml | 10 +- 121 files changed, 3855 insertions(+), 3447 deletions(-) create mode 100644 crates/storage-pg/.sqlx/query-015f7ad7c8d5403ce4dfb71d598fd9af472689d5aef7c1c4b1c594ca57c02237.json create mode 100644 crates/storage-pg/.sqlx/query-036e9e2cb7271782e48700fecd3fdd80f596ed433f37f2528c7edbdc88b13646.json create mode 100644 crates/storage-pg/.sqlx/query-0469c1d3ad11fd96febacad33302709c870ead848d6920cdfdb18912d543488e.json create mode 100644 crates/storage-pg/.sqlx/query-08d7df347c806ef14b6d0fb031cab041d79ba48528420160e23286369db7af35.json create mode 100644 crates/storage-pg/.sqlx/query-1a8701f5672de052bb766933f60b93249acc7237b996e8b93cd61b9f69c902ff.json create mode 100644 crates/storage-pg/.sqlx/query-1d372f36c382ab16264cea54537af3544ea6d6d75d10b432b07dbd0dadd2fa4e.json create mode 100644 crates/storage-pg/.sqlx/query-1eb829460407fca22b717b88a1a0a9b7b920d807a4b6c235e1bee524cd73b266.json create mode 100644 crates/storage-pg/.sqlx/query-1f6297fb323e9f2fbfa1c9e3225c0b3037c8c4714533a6240c62275332aa58dc.json create mode 100644 crates/storage-pg/.sqlx/query-2564bf6366eb59268c41fb25bb40d0e4e9e1fd1f9ea53b7a359c9025d7304223.json create mode 100644 crates/storage-pg/.sqlx/query-2a0d8d70d21afa9a2c9c1c432853361bb85911c48f7db6c3873b0f5abf35940b.json create mode 100644 crates/storage-pg/.sqlx/query-2ee26886c56f04cd53d4c0968f5cf0963f92b6d15e6af0e69378a6447dee677c.json create mode 100644 crates/storage-pg/.sqlx/query-31cbbd841029812c6d3500cae04a8e9e5723e4749d339465492b68e072c3a802.json create mode 100644 crates/storage-pg/.sqlx/query-3d66f3121b11ce923b9c60609b510a8ca899640e78cc8f5b03168622928ffe94.json create mode 100644 crates/storage-pg/.sqlx/query-4187907bfc770b2c76f741671d5e672f5c35eed7c9a9e57ff52888b1768a5ed6.json create mode 100644 crates/storage-pg/.sqlx/query-4192c1144c0ea530cf1aa77993a38e94cd5cf8b5c42cb037efb7917c6fc44a1d.json create mode 100644 crates/storage-pg/.sqlx/query-41c1aafbd338c24476f27d342cf80eef7de2836e85b078232d143d6712fc2be4.json create mode 100644 crates/storage-pg/.sqlx/query-432e199b0d47fe299d840c91159726c0a4f89f65b4dc3e33ddad58aabf6b148b.json create mode 100644 crates/storage-pg/.sqlx/query-446a8d7bd8532a751810401adfab924dc20785c91770ed43d62df2e590e8da71.json create mode 100644 crates/storage-pg/.sqlx/query-477f79556e5777b38feb85013b4f04dbb8230e4b0b0bcc45f669d7b8d0b91db4.json create mode 100644 crates/storage-pg/.sqlx/query-478f0ad710da8bfd803c6cddd982bc504d1b6bd0f5283de53c8c7b1b4b7dafd4.json create mode 100644 crates/storage-pg/.sqlx/query-496813daf6f8486353e7f509a64362626daebb0121c3c9420b96e2d8157f1e07.json create mode 100644 crates/storage-pg/.sqlx/query-4d79ce892e4595edb8b801e94fb0cbef28facdfd2e45d1c72c57f47418fbe24b.json create mode 100644 crates/storage-pg/.sqlx/query-53ad718642644b47a2d49f768d81bd993088526923769a9147281686c2d47591.json create mode 100644 crates/storage-pg/.sqlx/query-583ae9a0db9cd55fa57a179339550f3dab1bfc76f35ad488e1560ea37f7ed029.json create mode 100644 crates/storage-pg/.sqlx/query-5b697dd7834d33ec55972d3ba43d25fe794bc0b69c5938275711faa7a80b811f.json create mode 100644 crates/storage-pg/.sqlx/query-5f6b7e38ef9bc3b39deabba277d0255fb8cfb2adaa65f47b78a8fac11d8c91c3.json create mode 100644 crates/storage-pg/.sqlx/query-5fe1bb569d13a7d3ff22887b3fc5b76ff901c183b314f8ccb5018d70c516abf6.json create mode 100644 crates/storage-pg/.sqlx/query-6021c1b9e17b0b2e8b511888f8c6be00683ba0635a13eb7fcd403d3d4a3f90db.json create mode 100644 crates/storage-pg/.sqlx/query-64e6ea47c2e877c1ebe4338d64d9ad8a6c1c777d1daea024b8ca2e7f0dd75b0f.json create mode 100644 crates/storage-pg/.sqlx/query-6733c54a8d9ed93a760f365a9362fdb0f77340d7a4df642a2942174aba2c6502.json create mode 100644 crates/storage-pg/.sqlx/query-67ab838035946ddc15b43dd2f79d10b233d07e863b3a5c776c5db97cff263c8c.json create mode 100644 crates/storage-pg/.sqlx/query-689ffbfc5137ec788e89062ad679bbe6b23a8861c09a7246dc1659c28f12bf8d.json create mode 100644 crates/storage-pg/.sqlx/query-68c4cd463e4035ba8384f11818b7be602e2fbc34a5582f31f95b0cc5fa2aeb92.json create mode 100644 crates/storage-pg/.sqlx/query-6a3b543ec53ce242866d1e84de26728e6dd275cae745f9c646e3824d859c5384.json create mode 100644 crates/storage-pg/.sqlx/query-6e21e7d816f806da9bb5176931bdb550dee05c44c9d93f53df95fe3b4a840347.json create mode 100644 crates/storage-pg/.sqlx/query-6f97b5f9ad0d4d15387150bea3839fb7f81015f7ceef61ecaadba64521895cff.json create mode 100644 crates/storage-pg/.sqlx/query-751d549073d77ded84aea1aaba36d3b130ec71bc592d722eb75b959b80f0b4ff.json create mode 100644 crates/storage-pg/.sqlx/query-77dfa9fae1a9c77b70476d7da19d3313a02886994cfff0690451229fb5ae2f77.json create mode 100644 crates/storage-pg/.sqlx/query-79295f3d3a75f831e9469aabfa720d381a254d00dbe39fef1e9652029d51b89b.json create mode 100644 crates/storage-pg/.sqlx/query-7be139553610ace03193a99fe27fcb4e3d50c90accdaf22ca1cfeefdc9734300.json create mode 100644 crates/storage-pg/.sqlx/query-7cd0264707100f5b3cb2582f3f840bf66649742374e3643f1902ae69377fc9b6.json create mode 100644 crates/storage-pg/.sqlx/query-7ce387b1b0aaf10e72adde667b19521b66eaafa51f73bf2f95e38b8f3b64a229.json create mode 100644 crates/storage-pg/.sqlx/query-7e676491b077d4bc8a9cdb4a27ebf119d98cd35ebb52b1064fdb2d9eed78d0e8.json create mode 100644 crates/storage-pg/.sqlx/query-836fb7567d84057fa7f1edaab834c21a158a5762fe220b6bfacd6576be6c613c.json create mode 100644 crates/storage-pg/.sqlx/query-85499663f1adc7b7439592063f06914089f6243126a177b365bde37db5f6b33d.json create mode 100644 crates/storage-pg/.sqlx/query-8acbdc892d44efb53529da1c2df65bea6b799a43cf4c9264a37d392847e6eff0.json create mode 100644 crates/storage-pg/.sqlx/query-8b7297c263336d70c2b647212b16f7ae39bc5cb1572e3a2dcfcd67f196a1fa39.json create mode 100644 crates/storage-pg/.sqlx/query-90b5512c0c9dc3b3eb6500056cc72f9993216d9b553c2e33a7edec26ffb0fc59.json create mode 100644 crates/storage-pg/.sqlx/query-90fe32cb9c88a262a682c0db700fef7d69d6ce0be1f930d9f16c50b921a8b819.json create mode 100644 crates/storage-pg/.sqlx/query-91a3ee5ad64a947b7807a590f6b014c6856229918b972b98946f98b75686ab6c.json create mode 100644 crates/storage-pg/.sqlx/query-921d77c194609615a7e9a6fd806e9cc17a7927e3e5deb58f3917ceeb9ab4dede.json create mode 100644 crates/storage-pg/.sqlx/query-9348d87f9e06b614c7e90bdc93bcf38236766aaf4d894bf768debdff2b59fae2.json create mode 100644 crates/storage-pg/.sqlx/query-94fd96446b237c87bd6bf741f3c42b37ee751b87b7fcc459602bdf8c46962443.json create mode 100644 crates/storage-pg/.sqlx/query-9a6c197ff4ad80217262d48f8792ce7e16bc5df0677c7cd4ecb4fdbc5ee86395.json create mode 100644 crates/storage-pg/.sqlx/query-9f7bdc034c618e47e49c467d0d7f5b8c297d055abe248cc876dbc12c5a7dc920.json create mode 100644 crates/storage-pg/.sqlx/query-a2f7433f06fb4f6a7ad5ac6c1db18705276bce41e9b19d5d7e910ad4b767fb5e.json create mode 100644 crates/storage-pg/.sqlx/query-a300fe99c95679c5664646a6a525c0491829e97db45f3234483872ed38436322.json create mode 100644 crates/storage-pg/.sqlx/query-a6fa7811d0a7c62c7cccff96dc82db5b25462fa7669fde1941ccab4712585b20.json create mode 100644 crates/storage-pg/.sqlx/query-a7f780528882a2ae66c45435215763eed0582264861436eab3f862e3eb12cab1.json create mode 100644 crates/storage-pg/.sqlx/query-ab34912b42a48a8b5c8d63e271b99b7d0b690a2471873c6654b1b6cf2079b95c.json create mode 100644 crates/storage-pg/.sqlx/query-af65441068530b68826561d4308e15923ba6c6882ded4860ebde4a7641359abb.json create mode 100644 crates/storage-pg/.sqlx/query-afa86e79e3de2a83265cb0db8549d378a2f11b2a27bbd86d60558318c87eb698.json create mode 100644 crates/storage-pg/.sqlx/query-aff08a8caabeb62f4929e6e901e7ca7c55e284c18c5c1d1e78821dd9bc961412.json create mode 100644 crates/storage-pg/.sqlx/query-b26ae7dd28f8a756b55a76e80cdedd7be9ba26435ea4a914421483f8ed832537.json create mode 100644 crates/storage-pg/.sqlx/query-b515bbfb331e46acd3c0219f09223cc5d8d31cb41287e693dcb82c6e199f7991.json create mode 100644 crates/storage-pg/.sqlx/query-b6a6f5386dc89e4bc2ce56d578a29341848fce336d339b6bbf425956f5ed5032.json create mode 100644 crates/storage-pg/.sqlx/query-b700dc3f7d0f86f4904725d8357e34b7e457f857ed37c467c314142877fd5367.json create mode 100644 crates/storage-pg/.sqlx/query-b753790eecbbb4bcd87b9e9a1d1b0dd6c3b50e82ffbfee356e2cf755d72f00be.json create mode 100644 crates/storage-pg/.sqlx/query-b9875a270f7e753e48075ccae233df6e24a91775ceb877735508c1d5b2300d64.json create mode 100644 crates/storage-pg/.sqlx/query-b992283a9b43cbb8f86149f3f55cb47fb628dabd8fadc50e6a5772903f851e1c.json create mode 100644 crates/storage-pg/.sqlx/query-bbf62633c561706a762089bbab2f76a9ba3e2ed3539ef16accb601fb609c2ec9.json create mode 100644 crates/storage-pg/.sqlx/query-bd1f6daa5fa1b10250c01f8b3fbe451646a9ceeefa6f72b9c4e29b6d05f17641.json create mode 100644 crates/storage-pg/.sqlx/query-c0ed9d70e496433d8686a499055d8a8376459109b6154a2c0c13b28462afa523.json create mode 100644 crates/storage-pg/.sqlx/query-c1d90a7f2287ec779c81a521fab19e5ede3fa95484033e0312c30d9b6ecc03f0.json create mode 100644 crates/storage-pg/.sqlx/query-c5e7dbb22488aca427b85b3415bd1f1a1766ff865f2e08a5daa095d2a1ccbd56.json create mode 100644 crates/storage-pg/.sqlx/query-cff3ac0fff62ffdc5640fce08c2ffabc1d89202561b736c5d03b501dfcd8d886.json create mode 100644 crates/storage-pg/.sqlx/query-d0b403e9c843ef19fa5ad60bec32ebf14a1ba0d01681c3836366d3f55e7851f4.json create mode 100644 crates/storage-pg/.sqlx/query-d12a513b81b3ef658eae1f0a719933323f28c6ee260b52cafe337dd3d19e865c.json create mode 100644 crates/storage-pg/.sqlx/query-d83421d4a16f4ad084dd0db5abb56d3688851c36a48a50aa6104e8291e73630d.json create mode 100644 crates/storage-pg/.sqlx/query-db90cbc406a399f5447bd2c1d8018464f83b927dec620353516c0285b76fcf24.json create mode 100644 crates/storage-pg/.sqlx/query-dbf4be84eeff9ea51b00185faae2d453ab449017ed492bf6711dc7fceb630880.json create mode 100644 crates/storage-pg/.sqlx/query-dd16942318bf38d9a245b2c86fedd3cbd6b65e7a13465552d79cd3c022122fd4.json create mode 100644 crates/storage-pg/.sqlx/query-ddb22dd9ae9367af65a607e1fdc48b3d9581d67deea0c168f24e02090082bb82.json create mode 100644 crates/storage-pg/.sqlx/query-e35d56de7136d43d0803ec825b0612e4185cef838f105d66f18cb24865e45140.json create mode 100644 crates/storage-pg/.sqlx/query-e6dc63984aced9e19c20e90e9cd75d6f6d7ade64f782697715ac4da077b2e1fc.json create mode 100644 crates/storage-pg/.sqlx/query-e709869c062ac50248b1f9f8f808cc2f5e7bef58a6c2e42a7bb0c1cb8f508671.json create mode 100644 crates/storage-pg/.sqlx/query-e7ce95415bb6b57cd601393c6abe5febfec2a963ce6eac7b099b761594b1dfaf.json create mode 100644 crates/storage-pg/.sqlx/query-f0ace1af3775192a555c4ebb59b81183f359771f9f77e5fad759d38d872541d1.json delete mode 100644 crates/storage-pg/sqlx-data.json diff --git a/Cargo.lock b/Cargo.lock index d88c38cb..e78f6998 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,6 +21,15 @@ dependencies = [ "gimli", ] +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -39,9 +48,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -62,17 +71,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.3" @@ -80,19 +78,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", + "getrandom 0.2.10", "once_cell", "version_check", ] -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.0.2" @@ -104,9 +94,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f263788a35611fba42eb41ff811c5d0360c58b97402570312a350736e2542e" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-tzdata" @@ -140,15 +130,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -174,9 +164,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "apalis-core" @@ -224,20 +214,21 @@ checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" [[package]] name = "argon2" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" +checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" dependencies = [ "base64ct", "blake2", + "cpufeatures", "password-hash", ] [[package]] name = "arrayvec" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868f09ff8cea88b079da74ae569d9b8c62a23c68c746240b704ee6f7525c89c" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii_utils" @@ -263,9 +254,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -348,8 +339,8 @@ dependencies = [ "async-graphql-parser", "darling 0.14.4", "proc-macro-crate", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "syn 1.0.109", "thiserror", ] @@ -392,7 +383,7 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", "socket2", "waker-fn", @@ -420,7 +411,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", ] @@ -469,9 +460,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -486,16 +477,16 @@ version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] @@ -558,7 +549,7 @@ dependencies = [ "fastrand", "http", "hyper", - "time 0.3.22", + "time 0.3.23", "tokio", "tower", "tracing", @@ -691,7 +682,7 @@ dependencies = [ "percent-encoding", "regex", "sha2", - "time 0.3.22", + "time 0.3.23", "tracing", ] @@ -793,7 +784,7 @@ dependencies = [ "itoa", "num-integer", "ryu", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -823,9 +814,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" dependencies = [ "async-trait", "axum-core", @@ -873,9 +864,9 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "febf23ab04509bd7672e6abe76bd8277af31b679e89fa5ffc6087dc289a448a3" +checksum = "cebbcd90f811f93fc2a993024caecc1e8270d9d1eb9d3359edb3069c2096ea6f" dependencies = [ "axum", "axum-core", @@ -896,28 +887,28 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" +checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" dependencies = [ "heck", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ - "addr2line", + "addr2line 0.20.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.31.1", "rustc-demangle", ] @@ -988,6 +979,9 @@ name = "bitflags" version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] [[package]] name = "blake2" @@ -1043,9 +1037,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", "serde", @@ -1094,9 +1088,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] @@ -1172,8 +1166,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" dependencies = [ "chrono", - "chrono-tz-build", - "phf", + "chrono-tz-build 0.0.2", + "phf 0.10.1", +] + +[[package]] +name = "chrono-tz" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +dependencies = [ + "chrono", + "chrono-tz-build 0.2.0", + "phf 0.11.2", ] [[package]] @@ -1183,15 +1188,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069" dependencies = [ "parse-zoneinfo", - "phf", - "phf_codegen", + "phf 0.10.1", + "phf_codegen 0.10.0", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +dependencies = [ + "parse-zoneinfo", + "phf 0.11.2", + "phf_codegen 0.11.2", ] [[package]] name = "chronoutil" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5f90c3470252c073f12e34c9953a26330ab8a2dec6e5b9ffdd72fa254e0bea" +checksum = "154aa5253c981d51e9466afc1e9ce41631197837fd1c41ee931008f229b8a3d7" dependencies = [ "chrono", ] @@ -1209,9 +1225,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "98330784c494e49850cb23b8e2afcca13587d2500b2e3f1f78ae20248059c9be" dependencies = [ "clap_builder", "clap_derive", @@ -1220,9 +1236,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "e182eb5f2562a67dda37e2c57af64d720a9e010c5e860ed87c056586aeafa52e" dependencies = [ "anstream", "anstyle", @@ -1232,14 +1248,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -1286,9 +1302,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" [[package]] name = "convert_case" @@ -1312,7 +1328,7 @@ dependencies = [ "rand 0.8.5", "sha2", "subtle", - "time 0.3.22", + "time 0.3.23", "version_check", ] @@ -1343,27 +1359,27 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "182b82f78049f54d3aee5a19870d356ef754226665a695ce2fcdd5d55379718e" +checksum = "5c289b8eac3a97329a524e953b5fd68a8416ca629e1a37287f12d9e0760aadbc" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c027bf04ecae5b048d3554deb888061bc26f426afff47bf06d6ac933dce0a6" +checksum = "7bf07ba80f53fa7f7dc97b11087ea867f7ae4621cfca21a909eca92c0b96c7d9" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1382,42 +1398,42 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649f70038235e4c81dba5680d7e5ae83e1081f567232425ab98b55b03afd9904" +checksum = "40a7ca088173130c5c033e944756e3e441fbf3f637f32b4f6eb70252580c6dd4" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a1d1c5ee2611c6a0bdc8d42d5d3dc5ce8bf53a8040561e26e88b9b21f966417" +checksum = "0114095ec7d2fbd658ed100bd007006360bc2530f57c6eee3d3838869140dbf9" [[package]] name = "cranelift-control" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da66a68b1f48da863d1d53209b8ddb1a6236411d2d72a280ffa8c2f734f7219e" +checksum = "1d56031683a55a949977e756d21826eb17a1f346143a1badc0e120a15615cd38" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd897422dbb66621fa558f4d9209875530c53e3c8f4b13b2849fbb667c431a6" +checksum = "d6565198b5684367371e2b946ceca721eb36965e75e3592fad12fc2e15f65d7b" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05db883114c98cfcd6959f72278d2fec42e01ea6a6982cfe4f20e88eebe86653" +checksum = "25f28cc44847c8b98cb921e6bfc0f7b228f4d27519376fea724d181da91709a6" dependencies = [ "cranelift-codegen", "log", @@ -1427,15 +1443,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84559de86e2564152c87e299c8b2559f9107e9c6d274b24ebeb04fb0a5f4abf8" +checksum = "80b658177e72178c438f7de5d6645c56d97af38e17fcb0b500459007b4e05cc5" [[package]] name = "cranelift-native" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f40b57f187f0fe1ffaf281df4adba2b4bc623a0f6651954da9f3c184be72761" +checksum = "bf1c7de7221e6afcc5e13ced3b218faab3bc65b47eac67400046a05418aecd6a" dependencies = [ "cranelift-codegen", "libc", @@ -1444,9 +1460,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.96.4" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3eab6084cc789b9dd0b1316241efeb2968199fee709f4bb4fe0fb0923bb468b" +checksum = "76b0d28ebe8edb6b503630c489aa4669f1e2d13b97bec7271a0fcb0e159be3ad" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1503,6 +1519,30 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg 1.1.0", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + [[package]] name = "crossbeam-queue" version = "0.3.8" @@ -1587,12 +1627,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ - "darling_core 0.20.1", - "darling_macro 0.20.1", + "darling_core 0.20.3", + "darling_macro 0.20.3", ] [[package]] @@ -1603,24 +1643,24 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "strsim", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "strsim", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -1630,32 +1670,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", - "quote 1.0.29", + "quote 1.0.31", "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "darling_core 0.20.1", - "quote 1.0.29", - "syn 2.0.23", + "darling_core 0.20.3", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core", ] [[package]] @@ -1690,7 +1730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -1732,26 +1772,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -1792,14 +1812,14 @@ dependencies = [ "rust_decimal", "serde", "thiserror", - "time 0.3.22", + "time 0.3.23", ] [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" [[package]] name = "ecdsa" @@ -1891,9 +1911,9 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -1916,6 +1936,17 @@ dependencies = [ "libc", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -1963,7 +1994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" dependencies = [ "atomic", - "parking_lot 0.12.1", + "parking_lot", "pear", "serde", "serde_yaml", @@ -1974,14 +2005,26 @@ dependencies = [ [[package]] name = "file-per-thread-logger" -version = "0.1.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" +checksum = "8a3cc21c33af89af0930c8cae4ade5e6fdc17b5d2c97b3d2e2edb67a1cf683f3" dependencies = [ "env_logger", "log", ] +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -2053,13 +2096,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -2089,9 +2132,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -2226,9 +2269,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ "fallible-iterator", "indexmap 1.9.3", @@ -2237,11 +2280,11 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", @@ -2295,9 +2338,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes 1.4.0", "fnv", @@ -2338,7 +2381,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash", ] [[package]] @@ -2347,7 +2390,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ - "ahash 0.8.3", + "ahash", "allocator-api2", ] @@ -2415,18 +2458,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -2452,6 +2486,15 @@ dependencies = [ "digest", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -2572,10 +2615,10 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.3", + "rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -2685,9 +2728,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761cde40c27e2a9877f8c928fd248b7eec9dd48623dd514b256858ca593fbba7" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] name = "infer" @@ -2713,9 +2756,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.30.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28491f7753051e5704d4d0ae7860d45fae3238d7d235bc4289dcd45c48d3cec3" +checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" dependencies = [ "console", "lazy_static", @@ -2746,7 +2789,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] @@ -2772,13 +2815,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "hermit-abi 0.3.2", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -2802,9 +2844,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -2898,11 +2940,11 @@ dependencies = [ "nom", "once_cell", "quoted_printable", - "rustls 0.21.3", + "rustls", "rustls-pemfile", "socket2", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "webpki-roots 0.23.1", ] @@ -2919,6 +2961,17 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2931,6 +2984,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + [[package]] name = "listenfd" version = "1.0.1" @@ -2938,7 +2997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" dependencies = [ "libc", - "uuid 1.4.0", + "uuid 1.4.1", "winapi", ] @@ -3055,7 +3114,7 @@ dependencies = [ "prometheus", "rand 0.8.5", "rand_chacha 0.3.1", - "rustls 0.21.3", + "rustls", "sentry", "sentry-tower", "sentry-tracing", @@ -3209,7 +3268,7 @@ dependencies = [ "serde_with", "sqlx", "thiserror", - "time 0.3.22", + "time 0.3.23", "tokio", "tower", "tower-http", @@ -3238,7 +3297,7 @@ dependencies = [ "mas-tower", "once_cell", "opentelemetry", - "rustls 0.21.3", + "rustls", "rustls-native-certs", "serde", "serde_json", @@ -3353,7 +3412,7 @@ dependencies = [ "rustls-pemfile", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-test", "tower-http", "tower-service", @@ -3413,7 +3472,7 @@ dependencies = [ "once_cell", "rand 0.8.5", "rand_chacha 0.3.1", - "rustls 0.21.3", + "rustls", "serde", "serde_json", "serde_urlencoded", @@ -3507,7 +3566,7 @@ dependencies = [ "tracing", "ulid", "url", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -3593,7 +3652,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -3623,7 +3682,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix", + "rustix 0.37.23", ] [[package]] @@ -3635,6 +3694,15 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "mime" version = "0.3.17" @@ -3659,9 +3727,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -3717,9 +3785,9 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" dependencies = [ "byteorder", "lazy_static", @@ -3765,11 +3833,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] @@ -3806,6 +3874,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -3815,13 +3892,13 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opa-wasm" version = "0.1.0" -source = "git+https://github.com/matrix-org/rust-opa-wasm.git#cc49d3fee0199bcc72a84c8aa08f81f2dab603ec" +source = "git+https://github.com/matrix-org/rust-opa-wasm.git#8b2558d499a9a6ac7513c761e170da4be86bc42a" dependencies = [ "anyhow", "base64 0.21.2", "cc", "chrono", - "chrono-tz", + "chrono-tz 0.8.3", "chronoutil", "digest", "duration-str", @@ -4071,17 +4148,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -4089,21 +4155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -4116,14 +4168,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] name = "parse-display" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcac6cdc2aaa03a89780c6681ffb46ac5b4b7dbade8d2a20a6a501f6fd363a8" +checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c" dependencies = [ "once_cell", "parse-display-derive", @@ -4132,17 +4184,17 @@ dependencies = [ [[package]] name = "parse-display-derive" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e503280f7d6dbf7566bc63d903c3b0f595fc11553a7e1f87f81adb8fcbca983" +checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" dependencies = [ "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.7.4", "structmeta", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -4173,27 +4225,28 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", "password-hash", + "rayon", "sha2", ] [[package]] name = "pear" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec95680a7087503575284e5063e14b694b7a9c0b065e5dceec661e0497127e8" +checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c" dependencies = [ "inlinable_string", "pear_codegen", @@ -4202,14 +4255,14 @@ dependencies = [ [[package]] name = "pear_codegen" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9661a3a53f93f09f2ea882018e4d7c88f6ff2956d809a276060476fd8c879d3c" +checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" dependencies = [ - "proc-macro2 1.0.63", + "proc-macro2 1.0.66", "proc-macro2-diagnostics", - "quote 1.0.29", - "syn 2.0.23", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -4229,9 +4282,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" +checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5" dependencies = [ "thiserror", "ucd-trie", @@ -4239,9 +4292,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" +checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3" dependencies = [ "pest", "pest_generator", @@ -4249,22 +4302,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" +checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] name = "pest_meta" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" +checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341" dependencies = [ "once_cell", "pest", @@ -4277,7 +4330,16 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_shared", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", ] [[package]] @@ -4286,8 +4348,18 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -4296,7 +4368,17 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "phf_shared", + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", "rand 0.8.5", ] @@ -4311,23 +4393,32 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "1.1.0" +name = "phf_shared" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -4415,9 +4506,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" dependencies = [ "cfg-if", "cpufeatures", @@ -4461,22 +4552,22 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "proc-macro2-diagnostics" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", "version_check", "yansi", ] @@ -4491,7 +4582,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.1", + "parking_lot", "protobuf", "thiserror", ] @@ -4514,8 +4605,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "syn 1.0.109", ] @@ -4556,11 +4647,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ - "proc-macro2 1.0.63", + "proc-macro2 1.0.66", ] [[package]] @@ -4746,6 +4837,28 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + [[package]] name = "rdrand" version = "0.4.0" @@ -4786,9 +4899,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.8.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a52e724646c6c0800fc456ec43b4165d2f91fba88ceaca06d9e0b400023478" +checksum = "5b4dcbd3a2ae7fb94b5813fa0e957c6ab51bf5d0a8ee1b69e0c2d0f1e6eb8485" dependencies = [ "hashbrown 0.13.2", "log", @@ -4799,13 +4912,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", ] [[package]] @@ -4817,6 +4931,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -4825,9 +4950,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "retain_mut" @@ -4884,9 +5009,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.29.1" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc" +checksum = "d0446843641c69436765a35a5a77088e28c2e6a12da93e84aa3ab1cd4aa5a042" dependencies = [ "arrayvec", "num-traits", @@ -4915,39 +5040,40 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b19faa85ecb5197342b54f987b142fb3e30d0c90da40f80ef4fa9a726e6676ed" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.0", + "rustls-webpki 0.101.1", "sct", ] @@ -4984,9 +5110,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.0" +version = "0.101.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89efed4bd0af2a8de0feb22ba38030244c93db56112b8aa67d27022286852b1c" +checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" dependencies = [ "ring", "untrusted", @@ -4994,15 +5120,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "salsa20" @@ -5024,11 +5150,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -5051,17 +5177,17 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "serde_derive_internals", "syn 1.0.109", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" @@ -5086,9 +5212,9 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -5123,9 +5249,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "sentry" @@ -5228,16 +5354,16 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.22", + "time 0.3.23", "url", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -5257,13 +5383,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -5272,16 +5398,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -5290,10 +5416,11 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ + "itoa", "serde", ] @@ -5333,7 +5460,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -5342,17 +5469,17 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" dependencies = [ - "darling 0.20.1", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "darling 0.20.3", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] name = "serde_yaml" -version = "0.9.22" +version = "0.9.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +checksum = "da6075b41c7e3b079e5f246eb6094a44850d3a4c25a67c581c80796c80134012" dependencies = [ "indexmap 2.0.0", "itoa", @@ -5394,9 +5521,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3" dependencies = [ "libc", "signal-hook-registry", @@ -5459,9 +5586,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -5484,6 +5611,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spki" @@ -5501,6 +5631,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dce67a1f173db2f623678dc914d20870090a4bc8d066e9812e59508af0159aef" +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "sqlformat" version = "0.2.1" @@ -5514,100 +5650,208 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" dependencies = [ - "ahash 0.7.6", + "ahash", "atoi", - "base64 0.13.1", - "bitflags 1.3.2", "byteorder", "bytes 1.4.0", "chrono", "crc", "crossbeam-queue", - "dirs", "dotenvy", "either", "event-listener", "futures-channel", "futures-core", "futures-intrusive", + "futures-io", "futures-util", "hashlink", "hex", - "hkdf", - "hmac", - "indexmap 1.9.3", - "itoa", - "libc", + "indexmap 2.0.0", "log", - "md-5", "memchr", "once_cell", "paste", "percent-encoding", - "rand 0.8.5", - "rustls 0.20.8", + "rustls", "rustls-pemfile", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlformat", - "sqlx-rt", - "stringprep", "thiserror", + "tokio", "tokio-stream", + "tracing", "url", - "uuid 1.4.0", - "webpki-roots 0.22.6", - "whoami", + "uuid 1.4.1", + "webpki-roots 0.24.0", ] [[package]] name = "sqlx-macros" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.31", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" dependencies = [ "dotenvy", "either", "heck", "hex", "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "serde", "serde_json", "sha2", "sqlx-core", - "sqlx-rt", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", "syn 1.0.109", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-rt" -version = "0.6.3" +name = "sqlx-mysql" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "bytes 1.4.0", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", "once_cell", - "tokio", - "tokio-rustls 0.23.4", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid 1.4.1", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid 1.4.1", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "uuid 1.4.1", ] [[package]] @@ -5624,9 +5868,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stringprep" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -5644,10 +5888,10 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "structmeta-derive", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -5656,9 +5900,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -5677,8 +5921,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "rustversion", "syn 1.0.109", ] @@ -5706,19 +5950,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.23" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "unicode-ident", ] @@ -5730,9 +5974,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" @@ -5744,7 +5988,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.23", "windows-sys 0.48.0", ] @@ -5755,7 +5999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5ab29bb4f3e256ae6ad5c3e2775aa1f8829f2c0c101fc407bfd3a6df15c60c5" dependencies = [ "chrono", - "chrono-tz", + "chrono-tz 0.6.1", "globwalk", "humansize", "lazy_static", @@ -5782,22 +6026,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.41" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.41" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -5844,9 +6088,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "serde", @@ -5862,9 +6106,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -5896,7 +6140,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -5920,20 +6164,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -5942,7 +6175,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.3", + "rustls", "tokio", ] @@ -6011,17 +6244,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", "toml_datetime", "winnow", ] @@ -6138,19 +6371,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.22", + "time 0.3.23", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", ] [[package]] @@ -6239,8 +6472,8 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6179333b981641242a768f30f371c9baccbfcc03749627000c500ab88bf4528b" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "syn 1.0.109", ] @@ -6252,9 +6485,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "ulid" @@ -6263,7 +6496,7 @@ source = "git+https://github.com/dylanhart/ulid-rs.git?rev=0b9295c2db2114cd87aa1 dependencies = [ "rand 0.8.5", "serde", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -6351,9 +6584,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -6400,9 +6633,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" @@ -6445,9 +6678,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", "serde", @@ -6461,9 +6694,15 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -6495,11 +6734,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -6540,9 +6778,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", "wasm-bindgen-shared", ] @@ -6564,7 +6802,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.29", + "quote 1.0.31", "wasm-bindgen-macro-support", ] @@ -6574,9 +6812,9 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.23", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6589,19 +6827,19 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasmparser" -version = "0.103.0" +version = "0.107.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c437373cac5ea84f1113d648d51f71751ffbe3d90c00ae67618cf20d0b5ee7b" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" dependencies = [ "indexmap 1.9.3", - "url", + "semver", ] [[package]] name = "wasmtime" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634357e8668774b24c80b210552f3f194e2342a065d6d83845ba22c5817d0770" +checksum = "cd02b992d828b91efaf2a7499b21205fe4ab3002e401e3fe0f227aaeb4001d93" dependencies = [ "anyhow", "async-trait", @@ -6612,7 +6850,7 @@ dependencies = [ "indexmap 1.9.3", "libc", "log", - "object", + "object 0.30.4", "once_cell", "paste", "psm", @@ -6632,18 +6870,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d33c73c24ce79b0483a3b091a9acf88871f4490b88998e8974b22236264d304c" +checksum = "284466ef356ce2d909bc0ad470b60c4d0df5df2de9084457e118131b3c779b92" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6107809b2d9f5b2fd3ddbaddb3bb92ff8048b62f4030debf1408119ffd38c6cb" +checksum = "efc78cfe1a758d1336f447a47af6ec05e0df2c03c93440d70faf80e17fbb001e" dependencies = [ "anyhow", "base64 0.21.2", @@ -6651,7 +6889,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.37.23", "serde", "sha2", "toml", @@ -6661,13 +6899,13 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ba489850d9c91c6c5b9e1696ee89e7a69d9796236a005f7e9131b6746e13b6" +checksum = "b8e916103436a6d84faa4c2083e2e98612a323c2cc6147ec419124f67c764c9c" dependencies = [ "anyhow", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.31", "syn 1.0.109", "wasmtime-component-util", "wasmtime-wit-bindgen", @@ -6676,15 +6914,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa88f9e77d80f828c9d684741a9da649366c6d1cceb814755dd9cab7112d1d1" +checksum = "f20a5135ec5ef01080e674979b02d6fa5eebaa2b0c2d6660513ee9956a1bf624" [[package]] name = "wasmtime-cranelift" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5800616a28ed6bd5e8b99ea45646c956d798ae030494ac0689bc3e45d3b689c1" +checksum = "8e1aa99cbf3f8edb5ad8408ba380f5ab481528ecd8a5053acf758e006d6727fd" dependencies = [ "anyhow", "cranelift-codegen", @@ -6695,7 +6933,7 @@ dependencies = [ "cranelift-wasm", "gimli", "log", - "object", + "object 0.30.4", "target-lexicon", "thiserror", "wasmparser", @@ -6705,32 +6943,32 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e4030b959ac5c5d6ee500078977e813f8768fa2b92fc12be01856cd0c76c55" +checksum = "cce31fd55978601acc103acbb8a26f81c89a6eae12d3a1c59f34151dfa609484" dependencies = [ "anyhow", "cranelift-codegen", "cranelift-control", "cranelift-native", "gimli", - "object", + "object 0.30.4", "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec815d01a8d38aceb7ed4678f9ba551ae6b8a568a63810ac3ad9293b0fd01c8" +checksum = "41f9e58e0ee7d43ff13e75375c726b16bce022db798d3a099a65eeaa7d7a544b" dependencies = [ "anyhow", "cranelift-entity", "gimli", "indexmap 1.9.3", "log", - "object", + "object 0.30.4", "serde", "target-lexicon", "thiserror", @@ -6740,32 +6978,33 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c5127908fdf720614891ec741c13dd70c844e102caa393e2faca1ee68e9bfb" +checksum = "14309cbdf2c395258b124a24757c727403070c0465a28bcc780c4f82f4bca5ff" dependencies = [ "cc", "cfg-if", - "rustix", + "rustix 0.37.23", "wasmtime-asm-macros", "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2712eafe829778b426cad0e1769fef944898923dd29f0039e34e0d53ba72b234" +checksum = "5f0f2eaeb01bb67266416507829bd8e0bb60278444e4cbd048e280833ebeaa02" dependencies = [ - "addr2line", + "addr2line 0.19.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", "gimli", "log", - "object", + "object 0.30.4", "rustc-demangle", + "rustix 0.37.23", "serde", "target-lexicon", "wasmtime-environ", @@ -6776,18 +7015,18 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fb78eacf4a6e47260d8ef8cc81ea8ddb91397b2e848b3fb01567adebfe89b5" +checksum = "f42e59d62542bfb73ce30672db7eaf4084a60b434b688ac4f05b287d497de082" dependencies = [ "once_cell", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1364900b05f7d6008516121e8e62767ddb3e176bdf4c84dfa85da1734aeab79" +checksum = "2b49ceb7e2105a8ebe5614d7bbab6f6ef137a284e371633af60b34925493081f" dependencies = [ "cfg-if", "libc", @@ -6796,9 +7035,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a16ffe4de9ac9669175c0ea5c6c51ffc596dfb49320aaa6f6c57eff58cef069" +checksum = "3a5de4762421b0b2b19e02111ca403632852b53e506e03b4b227ffb0fbfa63c2" dependencies = [ "anyhow", "cc", @@ -6808,10 +7047,11 @@ dependencies = [ "log", "mach", "memfd", - "memoffset", + "memoffset 0.8.0", "paste", "rand 0.8.5", - "rustix", + "rustix 0.37.23", + "sptr", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", @@ -6821,9 +7061,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19961c9a3b04d5e766875a5c467f6f5d693f508b3e81f8dc4a1444aa94f041c9" +checksum = "dcbb7c138f797192f46afdd3ec16f85ef007c3bb45fa8e5174031f17b0be4c4a" dependencies = [ "cranelift-entity", "serde", @@ -6833,9 +7073,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "9.0.4" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421f0d16cc5c612b35ae53a0be3d3124c72296f18e5be3468263c745d56d37ab" +checksum = "d3334b0466a4d340de345cda83474d1d2c429770c3d667877971407672bc618a" dependencies = [ "anyhow", "heck", @@ -6880,15 +7120,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.23.1" @@ -6904,18 +7135,14 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.0", + "rustls-webpki 0.101.1", ] [[package]] name = "whoami" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" -dependencies = [ - "wasm-bindgen", - "web-sys", -] +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" [[package]] name = "winapi" @@ -6954,22 +7181,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.1", ] [[package]] @@ -6987,7 +7199,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -7007,9 +7219,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -7106,9 +7318,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] @@ -7137,15 +7349,16 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca2581061573ef6d1754983d7a9b3ed5871ef859d52708ea9a0f5af32919172" +checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" dependencies = [ "anyhow", "id-arena", "indexmap 1.9.3", "log", "pulldown-cmark", + "semver", "unicode-xid 0.2.4", "url", ] @@ -7167,9 +7380,9 @@ dependencies = [ [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "9ee746ad3851dd3bc40e4a028ab3b00b99278d929e48957bcb2d111874a7e43e" [[package]] name = "zeroize" diff --git a/Cargo.toml b/Cargo.toml index 049eb711..81af65ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,24 @@ opt-level = 3 [profile.dev.package.argon2] opt-level = 3 +[profile.dev.package.pbkdf2] +opt-level = 3 + +[profile.dev.package.bcrypt] +opt-level = 3 + +[profile.dev.package.sha2] +opt-level = 3 + +[profile.dev.package.digest] +opt-level = 3 + +[profile.dev.package.block-buffer] +opt-level = 3 + +[profile.dev.package.generic-array] +opt-level = 3 + # Until https://github.com/dylanhart/ulid-rs/pull/56 gets released [patch.crates-io.ulid] diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index ef8c30e7..db3537eb 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -7,8 +7,8 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.71" -axum = { version = "0.6.18", features = ["headers"] } -axum-extra = { version = "0.7.4", features = ["cookie-private"] } +axum = { version = "0.6.19", features = ["headers"] } +axum-extra = { version = "0.7.5", features = ["cookie-private"] } chrono = "0.4.26" data-encoding = "2.4.0" futures-util = "0.3.28" @@ -18,11 +18,11 @@ http-body = "0.4.5" mime = "0.3.17" rand = "0.8.5" sentry = { version = "0.31.5", default-features = false } -serde = "1.0.166" +serde = "1.0.171" serde_with = "3.0.0" serde_urlencoded = "0.7.1" -serde_json = "1.0.100" -thiserror = "1.0.41" +serde_json = "1.0.103" +thiserror = "1.0.43" tokio = "1.29.1" tower = { version = "0.4.13", features = ["util"] } tracing = "0.1.37" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index c26b8234..a65e1c4b 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -7,11 +7,11 @@ license = "Apache-2.0" [dependencies] apalis-core = "0.4.2" -anyhow = "1.0.71" +anyhow = "1.0.72" atty = "0.2.14" -axum = "0.6.18" -camino = "1.1.4" -clap = { version = "4.3.11", features = ["derive"] } +axum = "0.6.19" +camino = "1.1.6" +clap = { version = "4.3.14", features = ["derive"] } dotenv = "0.15.0" httpdate = "1.0.2" hyper = { version = "0.14.27", features = ["full"] } @@ -19,10 +19,10 @@ itertools = "0.11.0" listenfd = "1.0.1" rand = "0.8.5" rand_chacha = "0.3.1" -rustls = "0.21.3" -serde_json = "1.0.100" -serde_yaml = "0.9.22" -sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] } +rustls = "0.21.5" +serde_json = "1.0.103" +serde_yaml = "0.9.23" +sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] } tokio = { version = "1.29.1", features = ["full"] } tower = { version = "0.4.13", features = ["full"] } tower-http = { version = "0.4.1", features = ["fs"] } @@ -66,7 +66,7 @@ mas-tower = { path = "../tower" } oauth2-types = { path = "../oauth2-types" } [dev-dependencies] -indoc = "2.0.2" +indoc = "2.0.3" [features] default = ["jaeger", "zipkin", "webpki-roots", "policy-cache"] diff --git a/crates/cli/src/commands/manage.rs b/crates/cli/src/commands/manage.rs index 5f37ac93..c2c41e28 100644 --- a/crates/cli/src/commands/manage.rs +++ b/crates/cli/src/commands/manage.rs @@ -198,7 +198,7 @@ impl Options { // TODO: do some pagination here let ids: Vec = sqlx::query_scalar("SELECT user_id FROM users") - .fetch_all(&mut conn) + .fetch_all(&mut *conn) .await?; drop(conn); @@ -235,7 +235,7 @@ impl Options { "#, ) .bind(Uuid::from(user.id)) - .fetch_all(&mut conn) + .fetch_all(&mut *conn) .await?; for id in compat_sessions_ids { @@ -265,7 +265,7 @@ impl Options { "#, ) .bind(Uuid::from(user.id)) - .fetch_all(&mut conn) + .fetch_all(&mut *conn) .await?; for id in oauth2_sessions_ids { @@ -300,7 +300,7 @@ impl Options { "#, ) .bind(Uuid::from(user.id)) - .fetch_all(&mut conn) + .fetch_all(&mut *conn) .await?; for id in user_sessions_ids { diff --git a/crates/cli/src/util.rs b/crates/cli/src/util.rs index 994a4045..b257a52b 100644 --- a/crates/cli/src/util.rs +++ b/crates/cli/src/util.rs @@ -121,7 +121,7 @@ pub async fn templates_from_config( #[tracing::instrument(name = "db.connect", skip_all, err(Debug))] pub async fn database_from_config(config: &DatabaseConfig) -> Result { - let mut options = match &config.options { + let options = match &config.options { DatabaseConnectConfig::Uri { uri } => uri .parse() .context("could not parse database connection string")?, @@ -164,7 +164,7 @@ pub async fn database_from_config(config: &DatabaseConfig) -> Result) -> Result\"\n FROM upstream_oauth_providers\n WHERE upstream_oauth_provider_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "upstream_oauth_provider_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "issuer", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "scope", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "client_id", + "type_info": "Text" + }, + { + "ordinal": 4, + "name": "encrypted_client_secret", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "token_endpoint_signing_alg", + "type_info": "Text" + }, + { + "ordinal": 6, + "name": "token_endpoint_auth_method", + "type_info": "Text" + }, + { + "ordinal": 7, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 8, + "name": "claims_imports: Json", + "type_info": "Jsonb" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + true, + false, + false, + false + ] + }, + "hash": "6733c54a8d9ed93a760f365a9362fdb0f77340d7a4df642a2942174aba2c6502" +} diff --git a/crates/storage-pg/.sqlx/query-67ab838035946ddc15b43dd2f79d10b233d07e863b3a5c776c5db97cff263c8c.json b/crates/storage-pg/.sqlx/query-67ab838035946ddc15b43dd2f79d10b233d07e863b3a5c776c5db97cff263c8c.json new file mode 100644 index 00000000..0b378d38 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-67ab838035946ddc15b43dd2f79d10b233d07e863b3a5c776c5db97cff263c8c.json @@ -0,0 +1,76 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n upstream_oauth_authorization_session_id,\n upstream_oauth_provider_id,\n upstream_oauth_link_id,\n state,\n code_challenge_verifier,\n nonce,\n id_token,\n created_at,\n completed_at,\n consumed_at\n FROM upstream_oauth_authorization_sessions\n WHERE upstream_oauth_authorization_session_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "upstream_oauth_authorization_session_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "upstream_oauth_provider_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "upstream_oauth_link_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "state", + "type_info": "Text" + }, + { + "ordinal": 4, + "name": "code_challenge_verifier", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "nonce", + "type_info": "Text" + }, + { + "ordinal": 6, + "name": "id_token", + "type_info": "Text" + }, + { + "ordinal": 7, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 8, + "name": "completed_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 9, + "name": "consumed_at", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + true, + false, + true, + false, + true, + false, + true, + true + ] + }, + "hash": "67ab838035946ddc15b43dd2f79d10b233d07e863b3a5c776c5db97cff263c8c" +} diff --git a/crates/storage-pg/.sqlx/query-689ffbfc5137ec788e89062ad679bbe6b23a8861c09a7246dc1659c28f12bf8d.json b/crates/storage-pg/.sqlx/query-689ffbfc5137ec788e89062ad679bbe6b23a8861c09a7246dc1659c28f12bf8d.json new file mode 100644 index 00000000..b122c5a4 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-689ffbfc5137ec788e89062ad679bbe6b23a8861c09a7246dc1659c28f12bf8d.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE upstream_oauth_authorization_sessions\n SET consumed_at = $1\n WHERE upstream_oauth_authorization_session_id = $2\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Timestamptz", + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "689ffbfc5137ec788e89062ad679bbe6b23a8861c09a7246dc1659c28f12bf8d" +} diff --git a/crates/storage-pg/.sqlx/query-68c4cd463e4035ba8384f11818b7be602e2fbc34a5582f31f95b0cc5fa2aeb92.json b/crates/storage-pg/.sqlx/query-68c4cd463e4035ba8384f11818b7be602e2fbc34a5582f31f95b0cc5fa2aeb92.json new file mode 100644 index 00000000..d278e6a2 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-68c4cd463e4035ba8384f11818b7be602e2fbc34a5582f31f95b0cc5fa2aeb92.json @@ -0,0 +1,20 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO oauth2_clients\n ( oauth2_client_id\n , encrypted_client_secret\n , grant_type_authorization_code\n , grant_type_refresh_token\n , token_endpoint_auth_method\n , jwks\n , jwks_uri\n , is_static\n )\n VALUES\n ($1, $2, $3, $4, $5, $6, $7, TRUE)\n ON CONFLICT (oauth2_client_id)\n DO\n UPDATE SET encrypted_client_secret = EXCLUDED.encrypted_client_secret\n , grant_type_authorization_code = EXCLUDED.grant_type_authorization_code\n , grant_type_refresh_token = EXCLUDED.grant_type_refresh_token\n , token_endpoint_auth_method = EXCLUDED.token_endpoint_auth_method\n , jwks = EXCLUDED.jwks\n , jwks_uri = EXCLUDED.jwks_uri\n , is_static = TRUE\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Text", + "Bool", + "Bool", + "Text", + "Jsonb", + "Text" + ] + }, + "nullable": [] + }, + "hash": "68c4cd463e4035ba8384f11818b7be602e2fbc34a5582f31f95b0cc5fa2aeb92" +} diff --git a/crates/storage-pg/.sqlx/query-6a3b543ec53ce242866d1e84de26728e6dd275cae745f9c646e3824d859c5384.json b/crates/storage-pg/.sqlx/query-6a3b543ec53ce242866d1e84de26728e6dd275cae745f9c646e3824d859c5384.json new file mode 100644 index 00000000..e49f70b0 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-6a3b543ec53ce242866d1e84de26728e6dd275cae745f9c646e3824d859c5384.json @@ -0,0 +1,130 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_authorization_grant_id\n , created_at\n , cancelled_at\n , fulfilled_at\n , exchanged_at\n , scope\n , state\n , redirect_uri\n , response_mode\n , nonce\n , max_age\n , oauth2_client_id\n , authorization_code\n , response_type_code\n , response_type_id_token\n , code_challenge\n , code_challenge_method\n , requires_consent\n , oauth2_session_id\n FROM\n oauth2_authorization_grants\n\n WHERE authorization_code = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_authorization_grant_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 2, + "name": "cancelled_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 3, + "name": "fulfilled_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "exchanged_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 5, + "name": "scope", + "type_info": "Text" + }, + { + "ordinal": 6, + "name": "state", + "type_info": "Text" + }, + { + "ordinal": 7, + "name": "redirect_uri", + "type_info": "Text" + }, + { + "ordinal": 8, + "name": "response_mode", + "type_info": "Text" + }, + { + "ordinal": 9, + "name": "nonce", + "type_info": "Text" + }, + { + "ordinal": 10, + "name": "max_age", + "type_info": "Int4" + }, + { + "ordinal": 11, + "name": "oauth2_client_id", + "type_info": "Uuid" + }, + { + "ordinal": 12, + "name": "authorization_code", + "type_info": "Text" + }, + { + "ordinal": 13, + "name": "response_type_code", + "type_info": "Bool" + }, + { + "ordinal": 14, + "name": "response_type_id_token", + "type_info": "Bool" + }, + { + "ordinal": 15, + "name": "code_challenge", + "type_info": "Text" + }, + { + "ordinal": 16, + "name": "code_challenge_method", + "type_info": "Text" + }, + { + "ordinal": 17, + "name": "requires_consent", + "type_info": "Bool" + }, + { + "ordinal": 18, + "name": "oauth2_session_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false, + false, + true, + true, + true, + false, + true, + false, + false, + true, + true, + false, + true, + false, + false, + true, + true, + false, + true + ] + }, + "hash": "6a3b543ec53ce242866d1e84de26728e6dd275cae745f9c646e3824d859c5384" +} diff --git a/crates/storage-pg/.sqlx/query-6e21e7d816f806da9bb5176931bdb550dee05c44c9d93f53df95fe3b4a840347.json b/crates/storage-pg/.sqlx/query-6e21e7d816f806da9bb5176931bdb550dee05c44c9d93f53df95fe3b4a840347.json new file mode 100644 index 00000000..225baae3 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-6e21e7d816f806da9bb5176931bdb550dee05c44c9d93f53df95fe3b4a840347.json @@ -0,0 +1,17 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO compat_sso_logins\n (compat_sso_login_id, login_token, redirect_uri, created_at)\n VALUES ($1, $2, $3, $4)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Text", + "Text", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "6e21e7d816f806da9bb5176931bdb550dee05c44c9d93f53df95fe3b4a840347" +} diff --git a/crates/storage-pg/.sqlx/query-6f97b5f9ad0d4d15387150bea3839fb7f81015f7ceef61ecaadba64521895cff.json b/crates/storage-pg/.sqlx/query-6f97b5f9ad0d4d15387150bea3839fb7f81015f7ceef61ecaadba64521895cff.json new file mode 100644 index 00000000..88398615 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-6f97b5f9ad0d4d15387150bea3839fb7f81015f7ceef61ecaadba64521895cff.json @@ -0,0 +1,19 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO user_passwords\n (user_password_id, user_id, hashed_password, version, upgraded_from_id, created_at)\n VALUES ($1, $2, $3, $4, $5, $6)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Text", + "Int4", + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "6f97b5f9ad0d4d15387150bea3839fb7f81015f7ceef61ecaadba64521895cff" +} diff --git a/crates/storage-pg/.sqlx/query-751d549073d77ded84aea1aaba36d3b130ec71bc592d722eb75b959b80f0b4ff.json b/crates/storage-pg/.sqlx/query-751d549073d77ded84aea1aaba36d3b130ec71bc592d722eb75b959b80f0b4ff.json new file mode 100644 index 00000000..bd74f740 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-751d549073d77ded84aea1aaba36d3b130ec71bc592d722eb75b959b80f0b4ff.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT COUNT(*) as \"count!\"\n FROM user_sessions s\n WHERE s.user_id = $1 AND s.finished_at IS NULL\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "count!", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + null + ] + }, + "hash": "751d549073d77ded84aea1aaba36d3b130ec71bc592d722eb75b959b80f0b4ff" +} diff --git a/crates/storage-pg/.sqlx/query-77dfa9fae1a9c77b70476d7da19d3313a02886994cfff0690451229fb5ae2f77.json b/crates/storage-pg/.sqlx/query-77dfa9fae1a9c77b70476d7da19d3313a02886994cfff0690451229fb5ae2f77.json new file mode 100644 index 00000000..d48d5572 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-77dfa9fae1a9c77b70476d7da19d3313a02886994cfff0690451229fb5ae2f77.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT compat_access_token_id\n , access_token\n , created_at\n , expires_at\n , compat_session_id\n\n FROM compat_access_tokens\n\n WHERE compat_access_token_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "compat_access_token_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "access_token", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 3, + "name": "expires_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "compat_session_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + true, + false + ] + }, + "hash": "77dfa9fae1a9c77b70476d7da19d3313a02886994cfff0690451229fb5ae2f77" +} diff --git a/crates/storage-pg/.sqlx/query-79295f3d3a75f831e9469aabfa720d381a254d00dbe39fef1e9652029d51b89b.json b/crates/storage-pg/.sqlx/query-79295f3d3a75f831e9469aabfa720d381a254d00dbe39fef1e9652029d51b89b.json new file mode 100644 index 00000000..b0f702f1 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-79295f3d3a75f831e9469aabfa720d381a254d00dbe39fef1e9652029d51b89b.json @@ -0,0 +1,64 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT s.user_session_id\n , s.created_at AS \"user_session_created_at\"\n , s.finished_at AS \"user_session_finished_at\"\n , u.user_id\n , u.username AS \"user_username\"\n , u.primary_user_email_id AS \"user_primary_user_email_id\"\n , a.user_session_authentication_id AS \"last_authentication_id?\"\n , a.created_at AS \"last_authd_at?\"\n FROM user_sessions s\n INNER JOIN users u\n USING (user_id)\n LEFT JOIN user_session_authentications a\n USING (user_session_id)\n WHERE s.user_session_id = $1\n ORDER BY a.created_at DESC\n LIMIT 1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "user_session_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "user_session_created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 2, + "name": "user_session_finished_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 3, + "name": "user_id", + "type_info": "Uuid" + }, + { + "ordinal": 4, + "name": "user_username", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "user_primary_user_email_id", + "type_info": "Uuid" + }, + { + "ordinal": 6, + "name": "last_authentication_id?", + "type_info": "Uuid" + }, + { + "ordinal": 7, + "name": "last_authd_at?", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + true, + false, + false, + true, + false, + false + ] + }, + "hash": "79295f3d3a75f831e9469aabfa720d381a254d00dbe39fef1e9652029d51b89b" +} diff --git a/crates/storage-pg/.sqlx/query-7be139553610ace03193a99fe27fcb4e3d50c90accdaf22ca1cfeefdc9734300.json b/crates/storage-pg/.sqlx/query-7be139553610ace03193a99fe27fcb4e3d50c90accdaf22ca1cfeefdc9734300.json new file mode 100644 index 00000000..9236607a --- /dev/null +++ b/crates/storage-pg/.sqlx/query-7be139553610ace03193a99fe27fcb4e3d50c90accdaf22ca1cfeefdc9734300.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO oauth2_client_redirect_uris\n (oauth2_client_redirect_uri_id, oauth2_client_id, redirect_uri)\n SELECT id, $2, redirect_uri\n FROM UNNEST($1::uuid[], $3::text[]) r(id, redirect_uri)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "UuidArray", + "Uuid", + "TextArray" + ] + }, + "nullable": [] + }, + "hash": "7be139553610ace03193a99fe27fcb4e3d50c90accdaf22ca1cfeefdc9734300" +} diff --git a/crates/storage-pg/.sqlx/query-7cd0264707100f5b3cb2582f3f840bf66649742374e3643f1902ae69377fc9b6.json b/crates/storage-pg/.sqlx/query-7cd0264707100f5b3cb2582f3f840bf66649742374e3643f1902ae69377fc9b6.json new file mode 100644 index 00000000..2f590fe1 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-7cd0264707100f5b3cb2582f3f840bf66649742374e3643f1902ae69377fc9b6.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n DELETE FROM oauth2_client_redirect_uris\n WHERE oauth2_client_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "7cd0264707100f5b3cb2582f3f840bf66649742374e3643f1902ae69377fc9b6" +} diff --git a/crates/storage-pg/.sqlx/query-7ce387b1b0aaf10e72adde667b19521b66eaafa51f73bf2f95e38b8f3b64a229.json b/crates/storage-pg/.sqlx/query-7ce387b1b0aaf10e72adde667b19521b66eaafa51f73bf2f95e38b8f3b64a229.json new file mode 100644 index 00000000..464d6eda --- /dev/null +++ b/crates/storage-pg/.sqlx/query-7ce387b1b0aaf10e72adde667b19521b66eaafa51f73bf2f95e38b8f3b64a229.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE upstream_oauth_links\n SET user_id = $1\n WHERE upstream_oauth_link_id = $2\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "7ce387b1b0aaf10e72adde667b19521b66eaafa51f73bf2f95e38b8f3b64a229" +} diff --git a/crates/storage-pg/.sqlx/query-7e676491b077d4bc8a9cdb4a27ebf119d98cd35ebb52b1064fdb2d9eed78d0e8.json b/crates/storage-pg/.sqlx/query-7e676491b077d4bc8a9cdb4a27ebf119d98cd35ebb52b1064fdb2d9eed78d0e8.json new file mode 100644 index 00000000..65e997b5 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-7e676491b077d4bc8a9cdb4a27ebf119d98cd35ebb52b1064fdb2d9eed78d0e8.json @@ -0,0 +1,116 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_client_id\n , encrypted_client_secret\n , ARRAY(\n SELECT redirect_uri\n FROM oauth2_client_redirect_uris r\n WHERE r.oauth2_client_id = c.oauth2_client_id\n ) AS \"redirect_uris!\"\n , grant_type_authorization_code\n , grant_type_refresh_token\n , client_name\n , logo_uri\n , client_uri\n , policy_uri\n , tos_uri\n , jwks_uri\n , jwks\n , id_token_signed_response_alg\n , userinfo_signed_response_alg\n , token_endpoint_auth_method\n , token_endpoint_auth_signing_alg\n , initiate_login_uri\n FROM oauth2_clients c\n WHERE is_static = TRUE\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_client_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "encrypted_client_secret", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "redirect_uris!", + "type_info": "TextArray" + }, + { + "ordinal": 3, + "name": "grant_type_authorization_code", + "type_info": "Bool" + }, + { + "ordinal": 4, + "name": "grant_type_refresh_token", + "type_info": "Bool" + }, + { + "ordinal": 5, + "name": "client_name", + "type_info": "Text" + }, + { + "ordinal": 6, + "name": "logo_uri", + "type_info": "Text" + }, + { + "ordinal": 7, + "name": "client_uri", + "type_info": "Text" + }, + { + "ordinal": 8, + "name": "policy_uri", + "type_info": "Text" + }, + { + "ordinal": 9, + "name": "tos_uri", + "type_info": "Text" + }, + { + "ordinal": 10, + "name": "jwks_uri", + "type_info": "Text" + }, + { + "ordinal": 11, + "name": "jwks", + "type_info": "Jsonb" + }, + { + "ordinal": 12, + "name": "id_token_signed_response_alg", + "type_info": "Text" + }, + { + "ordinal": 13, + "name": "userinfo_signed_response_alg", + "type_info": "Text" + }, + { + "ordinal": 14, + "name": "token_endpoint_auth_method", + "type_info": "Text" + }, + { + "ordinal": 15, + "name": "token_endpoint_auth_signing_alg", + "type_info": "Text" + }, + { + "ordinal": 16, + "name": "initiate_login_uri", + "type_info": "Text" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + true, + null, + false, + false, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true + ] + }, + "hash": "7e676491b077d4bc8a9cdb4a27ebf119d98cd35ebb52b1064fdb2d9eed78d0e8" +} diff --git a/crates/storage-pg/.sqlx/query-836fb7567d84057fa7f1edaab834c21a158a5762fe220b6bfacd6576be6c613c.json b/crates/storage-pg/.sqlx/query-836fb7567d84057fa7f1edaab834c21a158a5762fe220b6bfacd6576be6c613c.json new file mode 100644 index 00000000..aa1a90fe --- /dev/null +++ b/crates/storage-pg/.sqlx/query-836fb7567d84057fa7f1edaab834c21a158a5762fe220b6bfacd6576be6c613c.json @@ -0,0 +1,40 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT user_id\n , username\n , primary_user_email_id\n , created_at\n FROM users\n WHERE username = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "user_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "username", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "primary_user_email_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "created_at", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false, + false, + true, + false + ] + }, + "hash": "836fb7567d84057fa7f1edaab834c21a158a5762fe220b6bfacd6576be6c613c" +} diff --git a/crates/storage-pg/.sqlx/query-85499663f1adc7b7439592063f06914089f6243126a177b365bde37db5f6b33d.json b/crates/storage-pg/.sqlx/query-85499663f1adc7b7439592063f06914089f6243126a177b365bde37db5f6b33d.json new file mode 100644 index 00000000..e3d1c855 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-85499663f1adc7b7439592063f06914089f6243126a177b365bde37db5f6b33d.json @@ -0,0 +1,118 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_client_id\n , encrypted_client_secret\n , ARRAY(\n SELECT redirect_uri\n FROM oauth2_client_redirect_uris r\n WHERE r.oauth2_client_id = c.oauth2_client_id\n ) AS \"redirect_uris!\"\n , grant_type_authorization_code\n , grant_type_refresh_token\n , client_name\n , logo_uri\n , client_uri\n , policy_uri\n , tos_uri\n , jwks_uri\n , jwks\n , id_token_signed_response_alg\n , userinfo_signed_response_alg\n , token_endpoint_auth_method\n , token_endpoint_auth_signing_alg\n , initiate_login_uri\n FROM oauth2_clients c\n\n WHERE oauth2_client_id = ANY($1::uuid[])\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_client_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "encrypted_client_secret", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "redirect_uris!", + "type_info": "TextArray" + }, + { + "ordinal": 3, + "name": "grant_type_authorization_code", + "type_info": "Bool" + }, + { + "ordinal": 4, + "name": "grant_type_refresh_token", + "type_info": "Bool" + }, + { + "ordinal": 5, + "name": "client_name", + "type_info": "Text" + }, + { + "ordinal": 6, + "name": "logo_uri", + "type_info": "Text" + }, + { + "ordinal": 7, + "name": "client_uri", + "type_info": "Text" + }, + { + "ordinal": 8, + "name": "policy_uri", + "type_info": "Text" + }, + { + "ordinal": 9, + "name": "tos_uri", + "type_info": "Text" + }, + { + "ordinal": 10, + "name": "jwks_uri", + "type_info": "Text" + }, + { + "ordinal": 11, + "name": "jwks", + "type_info": "Jsonb" + }, + { + "ordinal": 12, + "name": "id_token_signed_response_alg", + "type_info": "Text" + }, + { + "ordinal": 13, + "name": "userinfo_signed_response_alg", + "type_info": "Text" + }, + { + "ordinal": 14, + "name": "token_endpoint_auth_method", + "type_info": "Text" + }, + { + "ordinal": 15, + "name": "token_endpoint_auth_signing_alg", + "type_info": "Text" + }, + { + "ordinal": 16, + "name": "initiate_login_uri", + "type_info": "Text" + } + ], + "parameters": { + "Left": [ + "UuidArray" + ] + }, + "nullable": [ + false, + true, + null, + false, + false, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true + ] + }, + "hash": "85499663f1adc7b7439592063f06914089f6243126a177b365bde37db5f6b33d" +} diff --git a/crates/storage-pg/.sqlx/query-8acbdc892d44efb53529da1c2df65bea6b799a43cf4c9264a37d392847e6eff0.json b/crates/storage-pg/.sqlx/query-8acbdc892d44efb53529da1c2df65bea6b799a43cf4c9264a37d392847e6eff0.json new file mode 100644 index 00000000..7cf1c4f6 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-8acbdc892d44efb53529da1c2df65bea6b799a43cf4c9264a37d392847e6eff0.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n DELETE FROM oauth2_sessions\n WHERE oauth2_client_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "8acbdc892d44efb53529da1c2df65bea6b799a43cf4c9264a37d392847e6eff0" +} diff --git a/crates/storage-pg/.sqlx/query-8b7297c263336d70c2b647212b16f7ae39bc5cb1572e3a2dcfcd67f196a1fa39.json b/crates/storage-pg/.sqlx/query-8b7297c263336d70c2b647212b16f7ae39bc5cb1572e3a2dcfcd67f196a1fa39.json new file mode 100644 index 00000000..0389ab03 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-8b7297c263336d70c2b647212b16f7ae39bc5cb1572e3a2dcfcd67f196a1fa39.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT scope_token\n FROM oauth2_consents\n WHERE user_id = $1 AND oauth2_client_id = $2\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "scope_token", + "type_info": "Text" + } + ], + "parameters": { + "Left": [ + "Uuid", + "Uuid" + ] + }, + "nullable": [ + false + ] + }, + "hash": "8b7297c263336d70c2b647212b16f7ae39bc5cb1572e3a2dcfcd67f196a1fa39" +} diff --git a/crates/storage-pg/.sqlx/query-90b5512c0c9dc3b3eb6500056cc72f9993216d9b553c2e33a7edec26ffb0fc59.json b/crates/storage-pg/.sqlx/query-90b5512c0c9dc3b3eb6500056cc72f9993216d9b553c2e33a7edec26ffb0fc59.json new file mode 100644 index 00000000..6740c5af --- /dev/null +++ b/crates/storage-pg/.sqlx/query-90b5512c0c9dc3b3eb6500056cc72f9993216d9b553c2e33a7edec26ffb0fc59.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE user_emails\n SET confirmed_at = $2\n WHERE user_email_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "90b5512c0c9dc3b3eb6500056cc72f9993216d9b553c2e33a7edec26ffb0fc59" +} diff --git a/crates/storage-pg/.sqlx/query-90fe32cb9c88a262a682c0db700fef7d69d6ce0be1f930d9f16c50b921a8b819.json b/crates/storage-pg/.sqlx/query-90fe32cb9c88a262a682c0db700fef7d69d6ce0be1f930d9f16c50b921a8b819.json new file mode 100644 index 00000000..a9d19cac --- /dev/null +++ b/crates/storage-pg/.sqlx/query-90fe32cb9c88a262a682c0db700fef7d69d6ce0be1f930d9f16c50b921a8b819.json @@ -0,0 +1,17 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO user_emails (user_email_id, user_id, email, created_at)\n VALUES ($1, $2, $3, $4)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Text", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "90fe32cb9c88a262a682c0db700fef7d69d6ce0be1f930d9f16c50b921a8b819" +} diff --git a/crates/storage-pg/.sqlx/query-91a3ee5ad64a947b7807a590f6b014c6856229918b972b98946f98b75686ab6c.json b/crates/storage-pg/.sqlx/query-91a3ee5ad64a947b7807a590f6b014c6856229918b972b98946f98b75686ab6c.json new file mode 100644 index 00000000..51193254 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-91a3ee5ad64a947b7807a590f6b014c6856229918b972b98946f98b75686ab6c.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n DELETE FROM upstream_oauth_providers\n WHERE upstream_oauth_provider_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "91a3ee5ad64a947b7807a590f6b014c6856229918b972b98946f98b75686ab6c" +} diff --git a/crates/storage-pg/.sqlx/query-921d77c194609615a7e9a6fd806e9cc17a7927e3e5deb58f3917ceeb9ab4dede.json b/crates/storage-pg/.sqlx/query-921d77c194609615a7e9a6fd806e9cc17a7927e3e5deb58f3917ceeb9ab4dede.json new file mode 100644 index 00000000..2e49564f --- /dev/null +++ b/crates/storage-pg/.sqlx/query-921d77c194609615a7e9a6fd806e9cc17a7927e3e5deb58f3917ceeb9ab4dede.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE user_email_confirmation_codes\n SET consumed_at = $2\n WHERE user_email_confirmation_code_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "921d77c194609615a7e9a6fd806e9cc17a7927e3e5deb58f3917ceeb9ab4dede" +} diff --git a/crates/storage-pg/.sqlx/query-9348d87f9e06b614c7e90bdc93bcf38236766aaf4d894bf768debdff2b59fae2.json b/crates/storage-pg/.sqlx/query-9348d87f9e06b614c7e90bdc93bcf38236766aaf4d894bf768debdff2b59fae2.json new file mode 100644 index 00000000..81df8967 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-9348d87f9e06b614c7e90bdc93bcf38236766aaf4d894bf768debdff2b59fae2.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE compat_sso_logins\n SET\n exchanged_at = $2\n WHERE\n compat_sso_login_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "9348d87f9e06b614c7e90bdc93bcf38236766aaf4d894bf768debdff2b59fae2" +} diff --git a/crates/storage-pg/.sqlx/query-94fd96446b237c87bd6bf741f3c42b37ee751b87b7fcc459602bdf8c46962443.json b/crates/storage-pg/.sqlx/query-94fd96446b237c87bd6bf741f3c42b37ee751b87b7fcc459602bdf8c46962443.json new file mode 100644 index 00000000..f415823c --- /dev/null +++ b/crates/storage-pg/.sqlx/query-94fd96446b237c87bd6bf741f3c42b37ee751b87b7fcc459602bdf8c46962443.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT EXISTS(\n SELECT 1 FROM users WHERE username = $1\n ) AS \"exists!\"\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "exists!", + "type_info": "Bool" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + null + ] + }, + "hash": "94fd96446b237c87bd6bf741f3c42b37ee751b87b7fcc459602bdf8c46962443" +} diff --git a/crates/storage-pg/.sqlx/query-9a6c197ff4ad80217262d48f8792ce7e16bc5df0677c7cd4ecb4fdbc5ee86395.json b/crates/storage-pg/.sqlx/query-9a6c197ff4ad80217262d48f8792ce7e16bc5df0677c7cd4ecb4fdbc5ee86395.json new file mode 100644 index 00000000..07d5aa55 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-9a6c197ff4ad80217262d48f8792ce7e16bc5df0677c7cd4ecb4fdbc5ee86395.json @@ -0,0 +1,18 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO oauth2_consents\n (oauth2_consent_id, user_id, oauth2_client_id, scope_token, created_at)\n SELECT id, $2, $3, scope_token, $5 FROM UNNEST($1::uuid[], $4::text[]) u(id, scope_token)\n ON CONFLICT (user_id, oauth2_client_id, scope_token) DO UPDATE SET refreshed_at = $5\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "UuidArray", + "Uuid", + "Uuid", + "TextArray", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "9a6c197ff4ad80217262d48f8792ce7e16bc5df0677c7cd4ecb4fdbc5ee86395" +} diff --git a/crates/storage-pg/.sqlx/query-9f7bdc034c618e47e49c467d0d7f5b8c297d055abe248cc876dbc12c5a7dc920.json b/crates/storage-pg/.sqlx/query-9f7bdc034c618e47e49c467d0d7f5b8c297d055abe248cc876dbc12c5a7dc920.json new file mode 100644 index 00000000..55b4058e --- /dev/null +++ b/crates/storage-pg/.sqlx/query-9f7bdc034c618e47e49c467d0d7f5b8c297d055abe248cc876dbc12c5a7dc920.json @@ -0,0 +1,18 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO compat_refresh_tokens\n (compat_refresh_token_id, compat_session_id,\n compat_access_token_id, refresh_token, created_at)\n VALUES ($1, $2, $3, $4, $5)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Uuid", + "Text", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "9f7bdc034c618e47e49c467d0d7f5b8c297d055abe248cc876dbc12c5a7dc920" +} diff --git a/crates/storage-pg/.sqlx/query-a2f7433f06fb4f6a7ad5ac6c1db18705276bce41e9b19d5d7e910ad4b767fb5e.json b/crates/storage-pg/.sqlx/query-a2f7433f06fb4f6a7ad5ac6c1db18705276bce41e9b19d5d7e910ad4b767fb5e.json new file mode 100644 index 00000000..e87c3586 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-a2f7433f06fb4f6a7ad5ac6c1db18705276bce41e9b19d5d7e910ad4b767fb5e.json @@ -0,0 +1,18 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO oauth2_refresh_tokens\n (oauth2_refresh_token_id, oauth2_session_id, oauth2_access_token_id,\n refresh_token, created_at)\n VALUES\n ($1, $2, $3, $4, $5)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Uuid", + "Text", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "a2f7433f06fb4f6a7ad5ac6c1db18705276bce41e9b19d5d7e910ad4b767fb5e" +} diff --git a/crates/storage-pg/.sqlx/query-a300fe99c95679c5664646a6a525c0491829e97db45f3234483872ed38436322.json b/crates/storage-pg/.sqlx/query-a300fe99c95679c5664646a6a525c0491829e97db45f3234483872ed38436322.json new file mode 100644 index 00000000..c10ed0e5 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-a300fe99c95679c5664646a6a525c0491829e97db45f3234483872ed38436322.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT user_email_id\n , user_id\n , email\n , created_at\n , confirmed_at\n FROM user_emails\n\n WHERE user_id = $1\n\n ORDER BY email ASC\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "user_email_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "user_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "email", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "confirmed_at", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + false, + true + ] + }, + "hash": "a300fe99c95679c5664646a6a525c0491829e97db45f3234483872ed38436322" +} diff --git a/crates/storage-pg/.sqlx/query-a6fa7811d0a7c62c7cccff96dc82db5b25462fa7669fde1941ccab4712585b20.json b/crates/storage-pg/.sqlx/query-a6fa7811d0a7c62c7cccff96dc82db5b25462fa7669fde1941ccab4712585b20.json new file mode 100644 index 00000000..bfa6485e --- /dev/null +++ b/crates/storage-pg/.sqlx/query-a6fa7811d0a7c62c7cccff96dc82db5b25462fa7669fde1941ccab4712585b20.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_refresh_token_id\n , refresh_token\n , created_at\n , consumed_at\n , oauth2_access_token_id\n , oauth2_session_id\n FROM oauth2_refresh_tokens\n\n WHERE oauth2_refresh_token_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_refresh_token_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "refresh_token", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 3, + "name": "consumed_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "oauth2_access_token_id", + "type_info": "Uuid" + }, + { + "ordinal": 5, + "name": "oauth2_session_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + true, + true, + false + ] + }, + "hash": "a6fa7811d0a7c62c7cccff96dc82db5b25462fa7669fde1941ccab4712585b20" +} diff --git a/crates/storage-pg/.sqlx/query-a7f780528882a2ae66c45435215763eed0582264861436eab3f862e3eb12cab1.json b/crates/storage-pg/.sqlx/query-a7f780528882a2ae66c45435215763eed0582264861436eab3f862e3eb12cab1.json new file mode 100644 index 00000000..3b74f39d --- /dev/null +++ b/crates/storage-pg/.sqlx/query-a7f780528882a2ae66c45435215763eed0582264861436eab3f862e3eb12cab1.json @@ -0,0 +1,18 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO compat_access_tokens\n (compat_access_token_id, compat_session_id, access_token, created_at, expires_at)\n VALUES ($1, $2, $3, $4, $5)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Text", + "Timestamptz", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "a7f780528882a2ae66c45435215763eed0582264861436eab3f862e3eb12cab1" +} diff --git a/crates/storage-pg/.sqlx/query-ab34912b42a48a8b5c8d63e271b99b7d0b690a2471873c6654b1b6cf2079b95c.json b/crates/storage-pg/.sqlx/query-ab34912b42a48a8b5c8d63e271b99b7d0b690a2471873c6654b1b6cf2079b95c.json new file mode 100644 index 00000000..85b99b33 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-ab34912b42a48a8b5c8d63e271b99b7d0b690a2471873c6654b1b6cf2079b95c.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE compat_sessions cs\n SET finished_at = $2\n WHERE compat_session_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "ab34912b42a48a8b5c8d63e271b99b7d0b690a2471873c6654b1b6cf2079b95c" +} diff --git a/crates/storage-pg/.sqlx/query-af65441068530b68826561d4308e15923ba6c6882ded4860ebde4a7641359abb.json b/crates/storage-pg/.sqlx/query-af65441068530b68826561d4308e15923ba6c6882ded4860ebde4a7641359abb.json new file mode 100644 index 00000000..c7a581d1 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-af65441068530b68826561d4308e15923ba6c6882ded4860ebde4a7641359abb.json @@ -0,0 +1,68 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n upstream_oauth_provider_id,\n issuer,\n scope,\n client_id,\n encrypted_client_secret,\n token_endpoint_signing_alg,\n token_endpoint_auth_method,\n created_at,\n claims_imports as \"claims_imports: Json\"\n FROM upstream_oauth_providers\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "upstream_oauth_provider_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "issuer", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "scope", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "client_id", + "type_info": "Text" + }, + { + "ordinal": 4, + "name": "encrypted_client_secret", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "token_endpoint_signing_alg", + "type_info": "Text" + }, + { + "ordinal": 6, + "name": "token_endpoint_auth_method", + "type_info": "Text" + }, + { + "ordinal": 7, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 8, + "name": "claims_imports: Json", + "type_info": "Jsonb" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + true, + true, + false, + false, + false + ] + }, + "hash": "af65441068530b68826561d4308e15923ba6c6882ded4860ebde4a7641359abb" +} diff --git a/crates/storage-pg/.sqlx/query-afa86e79e3de2a83265cb0db8549d378a2f11b2a27bbd86d60558318c87eb698.json b/crates/storage-pg/.sqlx/query-afa86e79e3de2a83265cb0db8549d378a2f11b2a27bbd86d60558318c87eb698.json new file mode 100644 index 00000000..d6fa5341 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-afa86e79e3de2a83265cb0db8549d378a2f11b2a27bbd86d60558318c87eb698.json @@ -0,0 +1,18 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO oauth2_access_tokens\n (oauth2_access_token_id, oauth2_session_id, access_token, created_at, expires_at)\n VALUES\n ($1, $2, $3, $4, $5)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Text", + "Timestamptz", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "afa86e79e3de2a83265cb0db8549d378a2f11b2a27bbd86d60558318c87eb698" +} diff --git a/crates/storage-pg/.sqlx/query-aff08a8caabeb62f4929e6e901e7ca7c55e284c18c5c1d1e78821dd9bc961412.json b/crates/storage-pg/.sqlx/query-aff08a8caabeb62f4929e6e901e7ca7c55e284c18c5c1d1e78821dd9bc961412.json new file mode 100644 index 00000000..d235cab3 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-aff08a8caabeb62f4929e6e901e7ca7c55e284c18c5c1d1e78821dd9bc961412.json @@ -0,0 +1,47 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT user_email_id\n , user_id\n , email\n , created_at\n , confirmed_at\n FROM user_emails\n\n WHERE user_id = $1 AND email = $2\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "user_email_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "user_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "email", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "confirmed_at", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Uuid", + "Text" + ] + }, + "nullable": [ + false, + false, + false, + false, + true + ] + }, + "hash": "aff08a8caabeb62f4929e6e901e7ca7c55e284c18c5c1d1e78821dd9bc961412" +} diff --git a/crates/storage-pg/.sqlx/query-b26ae7dd28f8a756b55a76e80cdedd7be9ba26435ea4a914421483f8ed832537.json b/crates/storage-pg/.sqlx/query-b26ae7dd28f8a756b55a76e80cdedd7be9ba26435ea4a914421483f8ed832537.json new file mode 100644 index 00000000..accc70f5 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-b26ae7dd28f8a756b55a76e80cdedd7be9ba26435ea4a914421483f8ed832537.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO users (user_id, username, created_at)\n VALUES ($1, $2, $3)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Text", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "b26ae7dd28f8a756b55a76e80cdedd7be9ba26435ea4a914421483f8ed832537" +} diff --git a/crates/storage-pg/.sqlx/query-b515bbfb331e46acd3c0219f09223cc5d8d31cb41287e693dcb82c6e199f7991.json b/crates/storage-pg/.sqlx/query-b515bbfb331e46acd3c0219f09223cc5d8d31cb41287e693dcb82c6e199f7991.json new file mode 100644 index 00000000..8f0424c9 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-b515bbfb331e46acd3c0219f09223cc5d8d31cb41287e693dcb82c6e199f7991.json @@ -0,0 +1,18 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO user_email_confirmation_codes\n (user_email_confirmation_code_id, user_email_id, code, created_at, expires_at)\n VALUES ($1, $2, $3, $4, $5)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Text", + "Timestamptz", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "b515bbfb331e46acd3c0219f09223cc5d8d31cb41287e693dcb82c6e199f7991" +} diff --git a/crates/storage-pg/.sqlx/query-b6a6f5386dc89e4bc2ce56d578a29341848fce336d339b6bbf425956f5ed5032.json b/crates/storage-pg/.sqlx/query-b6a6f5386dc89e4bc2ce56d578a29341848fce336d339b6bbf425956f5ed5032.json new file mode 100644 index 00000000..30aa4caf --- /dev/null +++ b/crates/storage-pg/.sqlx/query-b6a6f5386dc89e4bc2ce56d578a29341848fce336d339b6bbf425956f5ed5032.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE oauth2_refresh_tokens\n SET consumed_at = $2\n WHERE oauth2_refresh_token_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "b6a6f5386dc89e4bc2ce56d578a29341848fce336d339b6bbf425956f5ed5032" +} diff --git a/crates/storage-pg/.sqlx/query-b700dc3f7d0f86f4904725d8357e34b7e457f857ed37c467c314142877fd5367.json b/crates/storage-pg/.sqlx/query-b700dc3f7d0f86f4904725d8357e34b7e457f857ed37c467c314142877fd5367.json new file mode 100644 index 00000000..ff538757 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-b700dc3f7d0f86f4904725d8357e34b7e457f857ed37c467c314142877fd5367.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE oauth2_sessions\n SET finished_at = $2\n WHERE oauth2_session_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "b700dc3f7d0f86f4904725d8357e34b7e457f857ed37c467c314142877fd5367" +} diff --git a/crates/storage-pg/.sqlx/query-b753790eecbbb4bcd87b9e9a1d1b0dd6c3b50e82ffbfee356e2cf755d72f00be.json b/crates/storage-pg/.sqlx/query-b753790eecbbb4bcd87b9e9a1d1b0dd6c3b50e82ffbfee356e2cf755d72f00be.json new file mode 100644 index 00000000..1858b964 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-b753790eecbbb4bcd87b9e9a1d1b0dd6c3b50e82ffbfee356e2cf755d72f00be.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT id as \"id!\"\n FROM apalis.push_job($1::text, $2::json, 'Pending', now(), 25)\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id!", + "type_info": "Text" + } + ], + "parameters": { + "Left": [ + "Text", + "Json" + ] + }, + "nullable": [ + null + ] + }, + "hash": "b753790eecbbb4bcd87b9e9a1d1b0dd6c3b50e82ffbfee356e2cf755d72f00be" +} diff --git a/crates/storage-pg/.sqlx/query-b9875a270f7e753e48075ccae233df6e24a91775ceb877735508c1d5b2300d64.json b/crates/storage-pg/.sqlx/query-b9875a270f7e753e48075ccae233df6e24a91775ceb877735508c1d5b2300d64.json new file mode 100644 index 00000000..3a448360 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-b9875a270f7e753e48075ccae233df6e24a91775ceb877735508c1d5b2300d64.json @@ -0,0 +1,17 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE upstream_oauth_authorization_sessions\n SET upstream_oauth_link_id = $1,\n completed_at = $2,\n id_token = $3\n WHERE upstream_oauth_authorization_session_id = $4\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz", + "Text", + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "b9875a270f7e753e48075ccae233df6e24a91775ceb877735508c1d5b2300d64" +} diff --git a/crates/storage-pg/.sqlx/query-b992283a9b43cbb8f86149f3f55cb47fb628dabd8fadc50e6a5772903f851e1c.json b/crates/storage-pg/.sqlx/query-b992283a9b43cbb8f86149f3f55cb47fb628dabd8fadc50e6a5772903f851e1c.json new file mode 100644 index 00000000..1f7ec952 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-b992283a9b43cbb8f86149f3f55cb47fb628dabd8fadc50e6a5772903f851e1c.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n DELETE FROM upstream_oauth_authorization_sessions\n WHERE upstream_oauth_provider_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "b992283a9b43cbb8f86149f3f55cb47fb628dabd8fadc50e6a5772903f851e1c" +} diff --git a/crates/storage-pg/.sqlx/query-bbf62633c561706a762089bbab2f76a9ba3e2ed3539ef16accb601fb609c2ec9.json b/crates/storage-pg/.sqlx/query-bbf62633c561706a762089bbab2f76a9ba3e2ed3539ef16accb601fb609c2ec9.json new file mode 100644 index 00000000..b79260d8 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-bbf62633c561706a762089bbab2f76a9ba3e2ed3539ef16accb601fb609c2ec9.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE compat_access_tokens\n SET expires_at = $2\n WHERE compat_access_token_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "bbf62633c561706a762089bbab2f76a9ba3e2ed3539ef16accb601fb609c2ec9" +} diff --git a/crates/storage-pg/.sqlx/query-bd1f6daa5fa1b10250c01f8b3fbe451646a9ceeefa6f72b9c4e29b6d05f17641.json b/crates/storage-pg/.sqlx/query-bd1f6daa5fa1b10250c01f8b3fbe451646a9ceeefa6f72b9c4e29b6d05f17641.json new file mode 100644 index 00000000..f2a4a2c7 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-bd1f6daa5fa1b10250c01f8b3fbe451646a9ceeefa6f72b9c4e29b6d05f17641.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE users\n SET primary_user_email_id = user_emails.user_email_id\n FROM user_emails\n WHERE user_emails.user_email_id = $1\n AND users.user_id = user_emails.user_id\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "bd1f6daa5fa1b10250c01f8b3fbe451646a9ceeefa6f72b9c4e29b6d05f17641" +} diff --git a/crates/storage-pg/.sqlx/query-c0ed9d70e496433d8686a499055d8a8376459109b6154a2c0c13b28462afa523.json b/crates/storage-pg/.sqlx/query-c0ed9d70e496433d8686a499055d8a8376459109b6154a2c0c13b28462afa523.json new file mode 100644 index 00000000..3de6ec93 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-c0ed9d70e496433d8686a499055d8a8376459109b6154a2c0c13b28462afa523.json @@ -0,0 +1,28 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO oauth2_authorization_grants (\n oauth2_authorization_grant_id,\n oauth2_client_id,\n redirect_uri,\n scope,\n state,\n nonce,\n max_age,\n response_mode,\n code_challenge,\n code_challenge_method,\n response_type_code,\n response_type_id_token,\n authorization_code,\n requires_consent,\n created_at\n )\n VALUES\n ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Text", + "Text", + "Text", + "Text", + "Int4", + "Text", + "Text", + "Text", + "Bool", + "Bool", + "Text", + "Bool", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "c0ed9d70e496433d8686a499055d8a8376459109b6154a2c0c13b28462afa523" +} diff --git a/crates/storage-pg/.sqlx/query-c1d90a7f2287ec779c81a521fab19e5ede3fa95484033e0312c30d9b6ecc03f0.json b/crates/storage-pg/.sqlx/query-c1d90a7f2287ec779c81a521fab19e5ede3fa95484033e0312c30d9b6ecc03f0.json new file mode 100644 index 00000000..e148ad91 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-c1d90a7f2287ec779c81a521fab19e5ede3fa95484033e0312c30d9b6ecc03f0.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO user_sessions (user_session_id, user_id, created_at)\n VALUES ($1, $2, $3)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "c1d90a7f2287ec779c81a521fab19e5ede3fa95484033e0312c30d9b6ecc03f0" +} diff --git a/crates/storage-pg/.sqlx/query-c5e7dbb22488aca427b85b3415bd1f1a1766ff865f2e08a5daa095d2a1ccbd56.json b/crates/storage-pg/.sqlx/query-c5e7dbb22488aca427b85b3415bd1f1a1766ff865f2e08a5daa095d2a1ccbd56.json new file mode 100644 index 00000000..9bec3027 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-c5e7dbb22488aca427b85b3415bd1f1a1766ff865f2e08a5daa095d2a1ccbd56.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE oauth2_authorization_grants\n SET exchanged_at = $2\n WHERE oauth2_authorization_grant_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "c5e7dbb22488aca427b85b3415bd1f1a1766ff865f2e08a5daa095d2a1ccbd56" +} diff --git a/crates/storage-pg/.sqlx/query-cff3ac0fff62ffdc5640fce08c2ffabc1d89202561b736c5d03b501dfcd8d886.json b/crates/storage-pg/.sqlx/query-cff3ac0fff62ffdc5640fce08c2ffabc1d89202561b736c5d03b501dfcd8d886.json new file mode 100644 index 00000000..8b850720 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-cff3ac0fff62ffdc5640fce08c2ffabc1d89202561b736c5d03b501dfcd8d886.json @@ -0,0 +1,18 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO compat_sessions (compat_session_id, user_id, device_id, created_at, is_synapse_admin)\n VALUES ($1, $2, $3, $4, $5)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Text", + "Timestamptz", + "Bool" + ] + }, + "nullable": [] + }, + "hash": "cff3ac0fff62ffdc5640fce08c2ffabc1d89202561b736c5d03b501dfcd8d886" +} diff --git a/crates/storage-pg/.sqlx/query-d0b403e9c843ef19fa5ad60bec32ebf14a1ba0d01681c3836366d3f55e7851f4.json b/crates/storage-pg/.sqlx/query-d0b403e9c843ef19fa5ad60bec32ebf14a1ba0d01681c3836366d3f55e7851f4.json new file mode 100644 index 00000000..fc2a0d3a --- /dev/null +++ b/crates/storage-pg/.sqlx/query-d0b403e9c843ef19fa5ad60bec32ebf14a1ba0d01681c3836366d3f55e7851f4.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE compat_refresh_tokens\n SET consumed_at = $2\n WHERE compat_refresh_token_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "d0b403e9c843ef19fa5ad60bec32ebf14a1ba0d01681c3836366d3f55e7851f4" +} diff --git a/crates/storage-pg/.sqlx/query-d12a513b81b3ef658eae1f0a719933323f28c6ee260b52cafe337dd3d19e865c.json b/crates/storage-pg/.sqlx/query-d12a513b81b3ef658eae1f0a719933323f28c6ee260b52cafe337dd3d19e865c.json new file mode 100644 index 00000000..5a447ffe --- /dev/null +++ b/crates/storage-pg/.sqlx/query-d12a513b81b3ef658eae1f0a719933323f28c6ee260b52cafe337dd3d19e865c.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT COUNT(*)\n FROM user_emails\n WHERE user_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "count", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + null + ] + }, + "hash": "d12a513b81b3ef658eae1f0a719933323f28c6ee260b52cafe337dd3d19e865c" +} diff --git a/crates/storage-pg/.sqlx/query-d83421d4a16f4ad084dd0db5abb56d3688851c36a48a50aa6104e8291e73630d.json b/crates/storage-pg/.sqlx/query-d83421d4a16f4ad084dd0db5abb56d3688851c36a48a50aa6104e8291e73630d.json new file mode 100644 index 00000000..2d671aa5 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-d83421d4a16f4ad084dd0db5abb56d3688851c36a48a50aa6104e8291e73630d.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE oauth2_authorization_grants AS og\n SET\n requires_consent = 'f'\n WHERE\n og.oauth2_authorization_grant_id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "d83421d4a16f4ad084dd0db5abb56d3688851c36a48a50aa6104e8291e73630d" +} diff --git a/crates/storage-pg/.sqlx/query-db90cbc406a399f5447bd2c1d8018464f83b927dec620353516c0285b76fcf24.json b/crates/storage-pg/.sqlx/query-db90cbc406a399f5447bd2c1d8018464f83b927dec620353516c0285b76fcf24.json new file mode 100644 index 00000000..57ad2759 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-db90cbc406a399f5447bd2c1d8018464f83b927dec620353516c0285b76fcf24.json @@ -0,0 +1,118 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_client_id\n , encrypted_client_secret\n , ARRAY(\n SELECT redirect_uri\n FROM oauth2_client_redirect_uris r\n WHERE r.oauth2_client_id = c.oauth2_client_id\n ) AS \"redirect_uris!\"\n , grant_type_authorization_code\n , grant_type_refresh_token\n , client_name\n , logo_uri\n , client_uri\n , policy_uri\n , tos_uri\n , jwks_uri\n , jwks\n , id_token_signed_response_alg\n , userinfo_signed_response_alg\n , token_endpoint_auth_method\n , token_endpoint_auth_signing_alg\n , initiate_login_uri\n FROM oauth2_clients c\n\n WHERE oauth2_client_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_client_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "encrypted_client_secret", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "redirect_uris!", + "type_info": "TextArray" + }, + { + "ordinal": 3, + "name": "grant_type_authorization_code", + "type_info": "Bool" + }, + { + "ordinal": 4, + "name": "grant_type_refresh_token", + "type_info": "Bool" + }, + { + "ordinal": 5, + "name": "client_name", + "type_info": "Text" + }, + { + "ordinal": 6, + "name": "logo_uri", + "type_info": "Text" + }, + { + "ordinal": 7, + "name": "client_uri", + "type_info": "Text" + }, + { + "ordinal": 8, + "name": "policy_uri", + "type_info": "Text" + }, + { + "ordinal": 9, + "name": "tos_uri", + "type_info": "Text" + }, + { + "ordinal": 10, + "name": "jwks_uri", + "type_info": "Text" + }, + { + "ordinal": 11, + "name": "jwks", + "type_info": "Jsonb" + }, + { + "ordinal": 12, + "name": "id_token_signed_response_alg", + "type_info": "Text" + }, + { + "ordinal": 13, + "name": "userinfo_signed_response_alg", + "type_info": "Text" + }, + { + "ordinal": 14, + "name": "token_endpoint_auth_method", + "type_info": "Text" + }, + { + "ordinal": 15, + "name": "token_endpoint_auth_signing_alg", + "type_info": "Text" + }, + { + "ordinal": 16, + "name": "initiate_login_uri", + "type_info": "Text" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + true, + null, + false, + false, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true, + true + ] + }, + "hash": "db90cbc406a399f5447bd2c1d8018464f83b927dec620353516c0285b76fcf24" +} diff --git a/crates/storage-pg/.sqlx/query-dbf4be84eeff9ea51b00185faae2d453ab449017ed492bf6711dc7fceb630880.json b/crates/storage-pg/.sqlx/query-dbf4be84eeff9ea51b00185faae2d453ab449017ed492bf6711dc7fceb630880.json new file mode 100644 index 00000000..943c31fb --- /dev/null +++ b/crates/storage-pg/.sqlx/query-dbf4be84eeff9ea51b00185faae2d453ab449017ed492bf6711dc7fceb630880.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE user_sessions\n SET finished_at = $1\n WHERE user_session_id = $2\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Timestamptz", + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "dbf4be84eeff9ea51b00185faae2d453ab449017ed492bf6711dc7fceb630880" +} diff --git a/crates/storage-pg/.sqlx/query-dd16942318bf38d9a245b2c86fedd3cbd6b65e7a13465552d79cd3c022122fd4.json b/crates/storage-pg/.sqlx/query-dd16942318bf38d9a245b2c86fedd3cbd6b65e7a13465552d79cd3c022122fd4.json new file mode 100644 index 00000000..ea706b41 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-dd16942318bf38d9a245b2c86fedd3cbd6b65e7a13465552d79cd3c022122fd4.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_access_token_id\n , access_token\n , created_at\n , expires_at\n , revoked_at\n , oauth2_session_id\n\n FROM oauth2_access_tokens\n\n WHERE oauth2_access_token_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_access_token_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "access_token", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 3, + "name": "expires_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "revoked_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 5, + "name": "oauth2_session_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "dd16942318bf38d9a245b2c86fedd3cbd6b65e7a13465552d79cd3c022122fd4" +} diff --git a/crates/storage-pg/.sqlx/query-ddb22dd9ae9367af65a607e1fdc48b3d9581d67deea0c168f24e02090082bb82.json b/crates/storage-pg/.sqlx/query-ddb22dd9ae9367af65a607e1fdc48b3d9581d67deea0c168f24e02090082bb82.json new file mode 100644 index 00000000..058df6f6 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-ddb22dd9ae9367af65a607e1fdc48b3d9581d67deea0c168f24e02090082bb82.json @@ -0,0 +1,58 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT compat_sso_login_id\n , login_token\n , redirect_uri\n , created_at\n , fulfilled_at\n , exchanged_at\n , compat_session_id\n\n FROM compat_sso_logins\n WHERE compat_sso_login_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "compat_sso_login_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "login_token", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "redirect_uri", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "fulfilled_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 5, + "name": "exchanged_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 6, + "name": "compat_session_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + true, + true + ] + }, + "hash": "ddb22dd9ae9367af65a607e1fdc48b3d9581d67deea0c168f24e02090082bb82" +} diff --git a/crates/storage-pg/.sqlx/query-e35d56de7136d43d0803ec825b0612e4185cef838f105d66f18cb24865e45140.json b/crates/storage-pg/.sqlx/query-e35d56de7136d43d0803ec825b0612e4185cef838f105d66f18cb24865e45140.json new file mode 100644 index 00000000..89922c4a --- /dev/null +++ b/crates/storage-pg/.sqlx/query-e35d56de7136d43d0803ec825b0612e4185cef838f105d66f18cb24865e45140.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT compat_refresh_token_id\n , refresh_token\n , created_at\n , consumed_at\n , compat_session_id\n , compat_access_token_id\n\n FROM compat_refresh_tokens\n\n WHERE compat_refresh_token_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "compat_refresh_token_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "refresh_token", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 3, + "name": "consumed_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "compat_session_id", + "type_info": "Uuid" + }, + { + "ordinal": 5, + "name": "compat_access_token_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + true, + false, + false + ] + }, + "hash": "e35d56de7136d43d0803ec825b0612e4185cef838f105d66f18cb24865e45140" +} diff --git a/crates/storage-pg/.sqlx/query-e6dc63984aced9e19c20e90e9cd75d6f6d7ade64f782697715ac4da077b2e1fc.json b/crates/storage-pg/.sqlx/query-e6dc63984aced9e19c20e90e9cd75d6f6d7ade64f782697715ac4da077b2e1fc.json new file mode 100644 index 00000000..f76d4937 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-e6dc63984aced9e19c20e90e9cd75d6f6d7ade64f782697715ac4da077b2e1fc.json @@ -0,0 +1,47 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n upstream_oauth_link_id,\n upstream_oauth_provider_id,\n user_id,\n subject,\n created_at\n FROM upstream_oauth_links\n WHERE upstream_oauth_provider_id = $1\n AND subject = $2\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "upstream_oauth_link_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "upstream_oauth_provider_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "user_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "subject", + "type_info": "Text" + }, + { + "ordinal": 4, + "name": "created_at", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Uuid", + "Text" + ] + }, + "nullable": [ + false, + false, + true, + false, + false + ] + }, + "hash": "e6dc63984aced9e19c20e90e9cd75d6f6d7ade64f782697715ac4da077b2e1fc" +} diff --git a/crates/storage-pg/.sqlx/query-e709869c062ac50248b1f9f8f808cc2f5e7bef58a6c2e42a7bb0c1cb8f508671.json b/crates/storage-pg/.sqlx/query-e709869c062ac50248b1f9f8f808cc2f5e7bef58a6c2e42a7bb0c1cb8f508671.json new file mode 100644 index 00000000..411b02cb --- /dev/null +++ b/crates/storage-pg/.sqlx/query-e709869c062ac50248b1f9f8f808cc2f5e7bef58a6c2e42a7bb0c1cb8f508671.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_refresh_token_id\n , refresh_token\n , created_at\n , consumed_at\n , oauth2_access_token_id\n , oauth2_session_id\n FROM oauth2_refresh_tokens\n\n WHERE refresh_token = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_refresh_token_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "refresh_token", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 3, + "name": "consumed_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 4, + "name": "oauth2_access_token_id", + "type_info": "Uuid" + }, + { + "ordinal": 5, + "name": "oauth2_session_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false, + false, + false, + true, + true, + false + ] + }, + "hash": "e709869c062ac50248b1f9f8f808cc2f5e7bef58a6c2e42a7bb0c1cb8f508671" +} diff --git a/crates/storage-pg/.sqlx/query-e7ce95415bb6b57cd601393c6abe5febfec2a963ce6eac7b099b761594b1dfaf.json b/crates/storage-pg/.sqlx/query-e7ce95415bb6b57cd601393c6abe5febfec2a963ce6eac7b099b761594b1dfaf.json new file mode 100644 index 00000000..ba9a58a8 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-e7ce95415bb6b57cd601393c6abe5febfec2a963ce6eac7b099b761594b1dfaf.json @@ -0,0 +1,30 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO upstream_oauth_providers (\n upstream_oauth_provider_id,\n issuer,\n scope,\n token_endpoint_auth_method,\n token_endpoint_signing_alg,\n client_id,\n encrypted_client_secret,\n created_at,\n claims_imports\n ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)\n ON CONFLICT (upstream_oauth_provider_id) \n DO UPDATE\n SET\n issuer = EXCLUDED.issuer,\n scope = EXCLUDED.scope,\n token_endpoint_auth_method = EXCLUDED.token_endpoint_auth_method,\n token_endpoint_signing_alg = EXCLUDED.token_endpoint_signing_alg,\n client_id = EXCLUDED.client_id,\n encrypted_client_secret = EXCLUDED.encrypted_client_secret,\n claims_imports = EXCLUDED.claims_imports\n RETURNING created_at\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "created_at", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Uuid", + "Text", + "Text", + "Text", + "Text", + "Text", + "Text", + "Timestamptz", + "Jsonb" + ] + }, + "nullable": [ + false + ] + }, + "hash": "e7ce95415bb6b57cd601393c6abe5febfec2a963ce6eac7b099b761594b1dfaf" +} diff --git a/crates/storage-pg/.sqlx/query-f0ace1af3775192a555c4ebb59b81183f359771f9f77e5fad759d38d872541d1.json b/crates/storage-pg/.sqlx/query-f0ace1af3775192a555c4ebb59b81183f359771f9f77e5fad759d38d872541d1.json new file mode 100644 index 00000000..0073a4b3 --- /dev/null +++ b/crates/storage-pg/.sqlx/query-f0ace1af3775192a555c4ebb59b81183f359771f9f77e5fad759d38d872541d1.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT oauth2_session_id\n , user_session_id\n , oauth2_client_id\n , scope\n , created_at\n , finished_at\n FROM oauth2_sessions\n\n WHERE oauth2_session_id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "oauth2_session_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "user_session_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "oauth2_client_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "scope", + "type_info": "Text" + }, + { + "ordinal": 4, + "name": "created_at", + "type_info": "Timestamptz" + }, + { + "ordinal": 5, + "name": "finished_at", + "type_info": "Timestamptz" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false, + false, + false, + false, + true + ] + }, + "hash": "f0ace1af3775192a555c4ebb59b81183f359771f9f77e5fad759d38d872541d1" +} diff --git a/crates/storage-pg/Cargo.toml b/crates/storage-pg/Cargo.toml index 5a8c64f4..a2ecda4c 100644 --- a/crates/storage-pg/Cargo.toml +++ b/crates/storage-pg/Cargo.toml @@ -7,18 +7,18 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.71" -sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json", "uuid"] } +sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "json", "uuid"] } chrono = { version = "0.4.26", features = ["serde"] } -serde = { version = "1.0.166", features = ["derive"] } -serde_json = "1.0.100" -thiserror = "1.0.41" +serde = { version = "1.0.171", features = ["derive"] } +serde_json = "1.0.103" +thiserror = "1.0.43" tracing = "0.1.37" futures-util = "0.3.28" rand = "0.8.5" rand_chacha = "0.3.1" url = { version = "2.4.0", features = ["serde"] } -uuid = "1.4.0" +uuid = "1.4.1" ulid = { version = "1.0.0", features = ["uuid", "serde"] } oauth2-types = { path = "../oauth2-types" } diff --git a/crates/storage-pg/sqlx-data.json b/crates/storage-pg/sqlx-data.json deleted file mode 100644 index cc4ed673..00000000 --- a/crates/storage-pg/sqlx-data.json +++ /dev/null @@ -1,2744 +0,0 @@ -{ - "db": "PostgreSQL", - "015f7ad7c8d5403ce4dfb71d598fd9af472689d5aef7c1c4b1c594ca57c02237": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz", - "Uuid" - ] - } - }, - "query": "\n UPDATE oauth2_authorization_grants\n SET fulfilled_at = $2\n , oauth2_session_id = $3\n WHERE oauth2_authorization_grant_id = $1\n " - }, - "036e9e2cb7271782e48700fecd3fdd80f596ed433f37f2528c7edbdc88b13646": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM oauth2_consents\n WHERE oauth2_client_id = $1\n " - }, - "0469c1d3ad11fd96febacad33302709c870ead848d6920cdfdb18912d543488e": { - "describe": { - "columns": [ - { - "name": "compat_session_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "device_id", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "user_id", - "ordinal": 2, - "type_info": "Uuid" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "finished_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "is_synapse_admin", - "ordinal": 5, - "type_info": "Bool" - } - ], - "nullable": [ - false, - false, - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT compat_session_id\n , device_id\n , user_id\n , created_at\n , finished_at\n , is_synapse_admin\n FROM compat_sessions\n WHERE compat_session_id = $1\n " - }, - "08d7df347c806ef14b6d0fb031cab041d79ba48528420160e23286369db7af35": { - "describe": { - "columns": [ - { - "name": "user_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "username", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "primary_user_email_id", - "ordinal": 2, - "type_info": "Uuid" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT user_id\n , username\n , primary_user_email_id\n , created_at\n FROM users\n WHERE user_id = $1\n " - }, - "1a8701f5672de052bb766933f60b93249acc7237b996e8b93cd61b9f69c902ff": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Timestamptz" - ] - } - }, - "query": "\n DELETE FROM oauth2_access_tokens\n WHERE expires_at < $1\n " - }, - "1d372f36c382ab16264cea54537af3544ea6d6d75d10b432b07dbd0dadd2fa4e": { - "describe": { - "columns": [ - { - "name": "user_email_confirmation_code_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "user_email_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "code", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "expires_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "consumed_at", - "ordinal": 5, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - false, - false, - false, - true - ], - "parameters": { - "Left": [ - "Text", - "Uuid" - ] - } - }, - "query": "\n SELECT user_email_confirmation_code_id\n , user_email_id\n , code\n , created_at\n , expires_at\n , consumed_at\n FROM user_email_confirmation_codes\n WHERE code = $1\n AND user_email_id = $2\n " - }, - "1eb829460407fca22b717b88a1a0a9b7b920d807a4b6c235e1bee524cd73b266": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM upstream_oauth_links\n WHERE upstream_oauth_provider_id = $1\n " - }, - "1f6297fb323e9f2fbfa1c9e3225c0b3037c8c4714533a6240c62275332aa58dc": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM user_email_confirmation_codes\n WHERE user_email_id = $1\n " - }, - "2564bf6366eb59268c41fb25bb40d0e4e9e1fd1f9ea53b7a359c9025d7304223": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE oauth2_access_tokens\n SET revoked_at = $2\n WHERE oauth2_access_token_id = $1\n " - }, - "2a0d8d70d21afa9a2c9c1c432853361bb85911c48f7db6c3873b0f5abf35940b": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM oauth2_authorization_grants\n WHERE oauth2_client_id = $1\n " - }, - "2ee26886c56f04cd53d4c0968f5cf0963f92b6d15e6af0e69378a6447dee677c": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM oauth2_access_tokens\n WHERE oauth2_session_id IN (\n SELECT oauth2_session_id\n FROM oauth2_sessions\n WHERE oauth2_client_id = $1\n )\n " - }, - "31cbbd841029812c6d3500cae04a8e9e5723e4749d339465492b68e072c3a802": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Text", - "Bool", - "Bool", - "Text", - "Text", - "Text", - "Text", - "Text", - "Text", - "Jsonb", - "Text", - "Text", - "Text", - "Text", - "Text" - ] - } - }, - "query": "\n INSERT INTO oauth2_clients\n ( oauth2_client_id\n , encrypted_client_secret\n , grant_type_authorization_code\n , grant_type_refresh_token\n , client_name\n , logo_uri\n , client_uri\n , policy_uri\n , tos_uri\n , jwks_uri\n , jwks\n , id_token_signed_response_alg\n , userinfo_signed_response_alg\n , token_endpoint_auth_method\n , token_endpoint_auth_signing_alg\n , initiate_login_uri\n , is_static\n )\n VALUES\n ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, FALSE)\n " - }, - "3d66f3121b11ce923b9c60609b510a8ca899640e78cc8f5b03168622928ffe94": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM user_emails\n WHERE user_email_id = $1\n " - }, - "4187907bfc770b2c76f741671d5e672f5c35eed7c9a9e57ff52888b1768a5ed6": { - "describe": { - "columns": [ - { - "name": "upstream_oauth_link_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "upstream_oauth_provider_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "user_id", - "ordinal": 2, - "type_info": "Uuid" - }, - { - "name": "subject", - "ordinal": 3, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 4, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - true, - false, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT\n upstream_oauth_link_id,\n upstream_oauth_provider_id,\n user_id,\n subject,\n created_at\n FROM upstream_oauth_links\n WHERE upstream_oauth_link_id = $1\n " - }, - "4192c1144c0ea530cf1aa77993a38e94cd5cf8b5c42cb037efb7917c6fc44a1d": { - "describe": { - "columns": [ - { - "name": "user_email_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "user_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "email", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "confirmed_at", - "ordinal": 4, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - false, - false, - true - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT user_email_id\n , user_id\n , email\n , created_at\n , confirmed_at\n FROM user_emails\n\n WHERE user_email_id = $1\n " - }, - "41c1aafbd338c24476f27d342cf80eef7de2836e85b078232d143d6712fc2be4": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO user_session_authentications\n (user_session_authentication_id, user_session_id, created_at)\n VALUES ($1, $2, $3)\n " - }, - "432e199b0d47fe299d840c91159726c0a4f89f65b4dc3e33ddad58aabf6b148b": { - "describe": { - "columns": [ - { - "name": "compat_refresh_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "refresh_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "consumed_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "compat_session_id", - "ordinal": 4, - "type_info": "Uuid" - }, - { - "name": "compat_access_token_id", - "ordinal": 5, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - true, - false, - false - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT compat_refresh_token_id\n , refresh_token\n , created_at\n , consumed_at\n , compat_session_id\n , compat_access_token_id\n\n FROM compat_refresh_tokens\n\n WHERE refresh_token = $1\n " - }, - "446a8d7bd8532a751810401adfab924dc20785c91770ed43d62df2e590e8da71": { - "describe": { - "columns": [ - { - "name": "user_password_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "hashed_password", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "version", - "ordinal": 2, - "type_info": "Int4" - }, - { - "name": "upgraded_from_id", - "ordinal": 3, - "type_info": "Uuid" - }, - { - "name": "created_at", - "ordinal": 4, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT up.user_password_id\n , up.hashed_password\n , up.version\n , up.upgraded_from_id\n , up.created_at\n FROM user_passwords up\n WHERE up.user_id = $1\n ORDER BY up.created_at DESC\n LIMIT 1\n " - }, - "477f79556e5777b38feb85013b4f04dbb8230e4b0b0bcc45f669d7b8d0b91db4": { - "describe": { - "columns": [ - { - "name": "oauth2_access_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "access_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "expires_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "revoked_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "oauth2_session_id", - "ordinal": 5, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT oauth2_access_token_id\n , access_token\n , created_at\n , expires_at\n , revoked_at\n , oauth2_session_id\n\n FROM oauth2_access_tokens\n\n WHERE access_token = $1\n " - }, - "478f0ad710da8bfd803c6cddd982bc504d1b6bd0f5283de53c8c7b1b4b7dafd4": { - "describe": { - "columns": [ - { - "name": "compat_sso_login_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "login_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "redirect_uri", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "fulfilled_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "exchanged_at", - "ordinal": 5, - "type_info": "Timestamptz" - }, - { - "name": "compat_session_id", - "ordinal": 6, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - false, - true, - true, - true - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT compat_sso_login_id\n , login_token\n , redirect_uri\n , created_at\n , fulfilled_at\n , exchanged_at\n , compat_session_id\n\n FROM compat_sso_logins\n WHERE login_token = $1\n " - }, - "496813daf6f8486353e7f509a64362626daebb0121c3c9420b96e2d8157f1e07": { - "describe": { - "columns": [ - { - "name": "oauth2_authorization_grant_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "created_at", - "ordinal": 1, - "type_info": "Timestamptz" - }, - { - "name": "cancelled_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "fulfilled_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "exchanged_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "scope", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "state", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "redirect_uri", - "ordinal": 7, - "type_info": "Text" - }, - { - "name": "response_mode", - "ordinal": 8, - "type_info": "Text" - }, - { - "name": "nonce", - "ordinal": 9, - "type_info": "Text" - }, - { - "name": "max_age", - "ordinal": 10, - "type_info": "Int4" - }, - { - "name": "oauth2_client_id", - "ordinal": 11, - "type_info": "Uuid" - }, - { - "name": "authorization_code", - "ordinal": 12, - "type_info": "Text" - }, - { - "name": "response_type_code", - "ordinal": 13, - "type_info": "Bool" - }, - { - "name": "response_type_id_token", - "ordinal": 14, - "type_info": "Bool" - }, - { - "name": "code_challenge", - "ordinal": 15, - "type_info": "Text" - }, - { - "name": "code_challenge_method", - "ordinal": 16, - "type_info": "Text" - }, - { - "name": "requires_consent", - "ordinal": 17, - "type_info": "Bool" - }, - { - "name": "oauth2_session_id", - "ordinal": 18, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - true, - true, - true, - false, - true, - false, - false, - true, - true, - false, - true, - false, - false, - true, - true, - false, - true - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT oauth2_authorization_grant_id\n , created_at\n , cancelled_at\n , fulfilled_at\n , exchanged_at\n , scope\n , state\n , redirect_uri\n , response_mode\n , nonce\n , max_age\n , oauth2_client_id\n , authorization_code\n , response_type_code\n , response_type_id_token\n , code_challenge\n , code_challenge_method\n , requires_consent\n , oauth2_session_id\n FROM\n oauth2_authorization_grants\n\n WHERE oauth2_authorization_grant_id = $1\n " - }, - "4d79ce892e4595edb8b801e94fb0cbef28facdfd2e45d1c72c57f47418fbe24b": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE compat_sso_logins\n SET\n compat_session_id = $2,\n fulfilled_at = $3\n WHERE\n compat_sso_login_id = $1\n " - }, - "53ad718642644b47a2d49f768d81bd993088526923769a9147281686c2d47591": { - "describe": { - "columns": [ - { - "name": "compat_access_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "access_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "expires_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "compat_session_id", - "ordinal": 4, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT compat_access_token_id\n , access_token\n , created_at\n , expires_at\n , compat_session_id\n\n FROM compat_access_tokens\n\n WHERE access_token = $1\n " - }, - "583ae9a0db9cd55fa57a179339550f3dab1bfc76f35ad488e1560ea37f7ed029": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Uuid", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO oauth2_sessions\n ( oauth2_session_id\n , user_session_id\n , oauth2_client_id\n , scope\n , created_at\n )\n VALUES ($1, $2, $3, $4, $5)\n " - }, - "5b697dd7834d33ec55972d3ba43d25fe794bc0b69c5938275711faa7a80b811f": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM oauth2_refresh_tokens\n WHERE oauth2_session_id IN (\n SELECT oauth2_session_id\n FROM oauth2_sessions\n WHERE oauth2_client_id = $1\n )\n " - }, - "5f6b7e38ef9bc3b39deabba277d0255fb8cfb2adaa65f47b78a8fac11d8c91c3": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO upstream_oauth_links (\n upstream_oauth_link_id,\n upstream_oauth_provider_id,\n user_id,\n subject,\n created_at\n ) VALUES ($1, $2, NULL, $3, $4)\n " - }, - "5fe1bb569d13a7d3ff22887b3fc5b76ff901c183b314f8ccb5018d70c516abf6": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM oauth2_clients\n WHERE oauth2_client_id = $1\n " - }, - "6021c1b9e17b0b2e8b511888f8c6be00683ba0635a13eb7fcd403d3d4a3f90db": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Text", - "Text", - "Text", - "Text", - "Text", - "Text", - "Timestamptz", - "Jsonb" - ] - } - }, - "query": "\n INSERT INTO upstream_oauth_providers (\n upstream_oauth_provider_id,\n issuer,\n scope,\n token_endpoint_auth_method,\n token_endpoint_signing_alg,\n client_id,\n encrypted_client_secret,\n created_at,\n claims_imports\n ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)\n " - }, - "64e6ea47c2e877c1ebe4338d64d9ad8a6c1c777d1daea024b8ca2e7f0dd75b0f": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Text", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO upstream_oauth_authorization_sessions (\n upstream_oauth_authorization_session_id,\n upstream_oauth_provider_id,\n state,\n code_challenge_verifier,\n nonce,\n created_at,\n completed_at,\n consumed_at,\n id_token\n ) VALUES ($1, $2, $3, $4, $5, $6, NULL, NULL, NULL)\n " - }, - "6733c54a8d9ed93a760f365a9362fdb0f77340d7a4df642a2942174aba2c6502": { - "describe": { - "columns": [ - { - "name": "upstream_oauth_provider_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "issuer", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "scope", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "client_id", - "ordinal": 3, - "type_info": "Text" - }, - { - "name": "encrypted_client_secret", - "ordinal": 4, - "type_info": "Text" - }, - { - "name": "token_endpoint_signing_alg", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_method", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 7, - "type_info": "Timestamptz" - }, - { - "name": "claims_imports: Json", - "ordinal": 8, - "type_info": "Jsonb" - } - ], - "nullable": [ - false, - false, - false, - false, - true, - true, - false, - false, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT\n upstream_oauth_provider_id,\n issuer,\n scope,\n client_id,\n encrypted_client_secret,\n token_endpoint_signing_alg,\n token_endpoint_auth_method,\n created_at,\n claims_imports as \"claims_imports: Json\"\n FROM upstream_oauth_providers\n WHERE upstream_oauth_provider_id = $1\n " - }, - "67ab838035946ddc15b43dd2f79d10b233d07e863b3a5c776c5db97cff263c8c": { - "describe": { - "columns": [ - { - "name": "upstream_oauth_authorization_session_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "upstream_oauth_provider_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "upstream_oauth_link_id", - "ordinal": 2, - "type_info": "Uuid" - }, - { - "name": "state", - "ordinal": 3, - "type_info": "Text" - }, - { - "name": "code_challenge_verifier", - "ordinal": 4, - "type_info": "Text" - }, - { - "name": "nonce", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "id_token", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 7, - "type_info": "Timestamptz" - }, - { - "name": "completed_at", - "ordinal": 8, - "type_info": "Timestamptz" - }, - { - "name": "consumed_at", - "ordinal": 9, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - true, - false, - true, - false, - true, - false, - true, - true - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT\n upstream_oauth_authorization_session_id,\n upstream_oauth_provider_id,\n upstream_oauth_link_id,\n state,\n code_challenge_verifier,\n nonce,\n id_token,\n created_at,\n completed_at,\n consumed_at\n FROM upstream_oauth_authorization_sessions\n WHERE upstream_oauth_authorization_session_id = $1\n " - }, - "689ffbfc5137ec788e89062ad679bbe6b23a8861c09a7246dc1659c28f12bf8d": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Timestamptz", - "Uuid" - ] - } - }, - "query": "\n UPDATE upstream_oauth_authorization_sessions\n SET consumed_at = $1\n WHERE upstream_oauth_authorization_session_id = $2\n " - }, - "68c4cd463e4035ba8384f11818b7be602e2fbc34a5582f31f95b0cc5fa2aeb92": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Text", - "Bool", - "Bool", - "Text", - "Jsonb", - "Text" - ] - } - }, - "query": "\n INSERT INTO oauth2_clients\n ( oauth2_client_id\n , encrypted_client_secret\n , grant_type_authorization_code\n , grant_type_refresh_token\n , token_endpoint_auth_method\n , jwks\n , jwks_uri\n , is_static\n )\n VALUES\n ($1, $2, $3, $4, $5, $6, $7, TRUE)\n ON CONFLICT (oauth2_client_id)\n DO\n UPDATE SET encrypted_client_secret = EXCLUDED.encrypted_client_secret\n , grant_type_authorization_code = EXCLUDED.grant_type_authorization_code\n , grant_type_refresh_token = EXCLUDED.grant_type_refresh_token\n , token_endpoint_auth_method = EXCLUDED.token_endpoint_auth_method\n , jwks = EXCLUDED.jwks\n , jwks_uri = EXCLUDED.jwks_uri\n , is_static = TRUE\n " - }, - "6a3b543ec53ce242866d1e84de26728e6dd275cae745f9c646e3824d859c5384": { - "describe": { - "columns": [ - { - "name": "oauth2_authorization_grant_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "created_at", - "ordinal": 1, - "type_info": "Timestamptz" - }, - { - "name": "cancelled_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "fulfilled_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "exchanged_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "scope", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "state", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "redirect_uri", - "ordinal": 7, - "type_info": "Text" - }, - { - "name": "response_mode", - "ordinal": 8, - "type_info": "Text" - }, - { - "name": "nonce", - "ordinal": 9, - "type_info": "Text" - }, - { - "name": "max_age", - "ordinal": 10, - "type_info": "Int4" - }, - { - "name": "oauth2_client_id", - "ordinal": 11, - "type_info": "Uuid" - }, - { - "name": "authorization_code", - "ordinal": 12, - "type_info": "Text" - }, - { - "name": "response_type_code", - "ordinal": 13, - "type_info": "Bool" - }, - { - "name": "response_type_id_token", - "ordinal": 14, - "type_info": "Bool" - }, - { - "name": "code_challenge", - "ordinal": 15, - "type_info": "Text" - }, - { - "name": "code_challenge_method", - "ordinal": 16, - "type_info": "Text" - }, - { - "name": "requires_consent", - "ordinal": 17, - "type_info": "Bool" - }, - { - "name": "oauth2_session_id", - "ordinal": 18, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - true, - true, - true, - false, - true, - false, - false, - true, - true, - false, - true, - false, - false, - true, - true, - false, - true - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT oauth2_authorization_grant_id\n , created_at\n , cancelled_at\n , fulfilled_at\n , exchanged_at\n , scope\n , state\n , redirect_uri\n , response_mode\n , nonce\n , max_age\n , oauth2_client_id\n , authorization_code\n , response_type_code\n , response_type_id_token\n , code_challenge\n , code_challenge_method\n , requires_consent\n , oauth2_session_id\n FROM\n oauth2_authorization_grants\n\n WHERE authorization_code = $1\n " - }, - "6e21e7d816f806da9bb5176931bdb550dee05c44c9d93f53df95fe3b4a840347": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Text", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO compat_sso_logins\n (compat_sso_login_id, login_token, redirect_uri, created_at)\n VALUES ($1, $2, $3, $4)\n " - }, - "6f97b5f9ad0d4d15387150bea3839fb7f81015f7ceef61ecaadba64521895cff": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Int4", - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO user_passwords\n (user_password_id, user_id, hashed_password, version, upgraded_from_id, created_at)\n VALUES ($1, $2, $3, $4, $5, $6)\n " - }, - "751d549073d77ded84aea1aaba36d3b130ec71bc592d722eb75b959b80f0b4ff": { - "describe": { - "columns": [ - { - "name": "count!", - "ordinal": 0, - "type_info": "Int8" - } - ], - "nullable": [ - null - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT COUNT(*) as \"count!\"\n FROM user_sessions s\n WHERE s.user_id = $1 AND s.finished_at IS NULL\n " - }, - "77dfa9fae1a9c77b70476d7da19d3313a02886994cfff0690451229fb5ae2f77": { - "describe": { - "columns": [ - { - "name": "compat_access_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "access_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "expires_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "compat_session_id", - "ordinal": 4, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT compat_access_token_id\n , access_token\n , created_at\n , expires_at\n , compat_session_id\n\n FROM compat_access_tokens\n\n WHERE compat_access_token_id = $1\n " - }, - "79295f3d3a75f831e9469aabfa720d381a254d00dbe39fef1e9652029d51b89b": { - "describe": { - "columns": [ - { - "name": "user_session_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "user_session_created_at", - "ordinal": 1, - "type_info": "Timestamptz" - }, - { - "name": "user_session_finished_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "user_id", - "ordinal": 3, - "type_info": "Uuid" - }, - { - "name": "user_username", - "ordinal": 4, - "type_info": "Text" - }, - { - "name": "user_primary_user_email_id", - "ordinal": 5, - "type_info": "Uuid" - }, - { - "name": "last_authentication_id?", - "ordinal": 6, - "type_info": "Uuid" - }, - { - "name": "last_authd_at?", - "ordinal": 7, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - true, - false, - false, - true, - false, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT s.user_session_id\n , s.created_at AS \"user_session_created_at\"\n , s.finished_at AS \"user_session_finished_at\"\n , u.user_id\n , u.username AS \"user_username\"\n , u.primary_user_email_id AS \"user_primary_user_email_id\"\n , a.user_session_authentication_id AS \"last_authentication_id?\"\n , a.created_at AS \"last_authd_at?\"\n FROM user_sessions s\n INNER JOIN users u\n USING (user_id)\n LEFT JOIN user_session_authentications a\n USING (user_session_id)\n WHERE s.user_session_id = $1\n ORDER BY a.created_at DESC\n LIMIT 1\n " - }, - "7be139553610ace03193a99fe27fcb4e3d50c90accdaf22ca1cfeefdc9734300": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "UuidArray", - "Uuid", - "TextArray" - ] - } - }, - "query": "\n INSERT INTO oauth2_client_redirect_uris\n (oauth2_client_redirect_uri_id, oauth2_client_id, redirect_uri)\n SELECT id, $2, redirect_uri\n FROM UNNEST($1::uuid[], $3::text[]) r(id, redirect_uri)\n " - }, - "7cd0264707100f5b3cb2582f3f840bf66649742374e3643f1902ae69377fc9b6": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM oauth2_client_redirect_uris\n WHERE oauth2_client_id = $1\n " - }, - "7ce387b1b0aaf10e72adde667b19521b66eaafa51f73bf2f95e38b8f3b64a229": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid" - ] - } - }, - "query": "\n UPDATE upstream_oauth_links\n SET user_id = $1\n WHERE upstream_oauth_link_id = $2\n " - }, - "7e676491b077d4bc8a9cdb4a27ebf119d98cd35ebb52b1064fdb2d9eed78d0e8": { - "describe": { - "columns": [ - { - "name": "oauth2_client_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "encrypted_client_secret", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "redirect_uris!", - "ordinal": 2, - "type_info": "TextArray" - }, - { - "name": "grant_type_authorization_code", - "ordinal": 3, - "type_info": "Bool" - }, - { - "name": "grant_type_refresh_token", - "ordinal": 4, - "type_info": "Bool" - }, - { - "name": "client_name", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "logo_uri", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "client_uri", - "ordinal": 7, - "type_info": "Text" - }, - { - "name": "policy_uri", - "ordinal": 8, - "type_info": "Text" - }, - { - "name": "tos_uri", - "ordinal": 9, - "type_info": "Text" - }, - { - "name": "jwks_uri", - "ordinal": 10, - "type_info": "Text" - }, - { - "name": "jwks", - "ordinal": 11, - "type_info": "Jsonb" - }, - { - "name": "id_token_signed_response_alg", - "ordinal": 12, - "type_info": "Text" - }, - { - "name": "userinfo_signed_response_alg", - "ordinal": 13, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_method", - "ordinal": 14, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_signing_alg", - "ordinal": 15, - "type_info": "Text" - }, - { - "name": "initiate_login_uri", - "ordinal": 16, - "type_info": "Text" - } - ], - "nullable": [ - false, - true, - null, - false, - false, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true - ], - "parameters": { - "Left": [] - } - }, - "query": "\n SELECT oauth2_client_id\n , encrypted_client_secret\n , ARRAY(\n SELECT redirect_uri\n FROM oauth2_client_redirect_uris r\n WHERE r.oauth2_client_id = c.oauth2_client_id\n ) AS \"redirect_uris!\"\n , grant_type_authorization_code\n , grant_type_refresh_token\n , client_name\n , logo_uri\n , client_uri\n , policy_uri\n , tos_uri\n , jwks_uri\n , jwks\n , id_token_signed_response_alg\n , userinfo_signed_response_alg\n , token_endpoint_auth_method\n , token_endpoint_auth_signing_alg\n , initiate_login_uri\n FROM oauth2_clients c\n WHERE is_static = TRUE\n " - }, - "836fb7567d84057fa7f1edaab834c21a158a5762fe220b6bfacd6576be6c613c": { - "describe": { - "columns": [ - { - "name": "user_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "username", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "primary_user_email_id", - "ordinal": 2, - "type_info": "Uuid" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT user_id\n , username\n , primary_user_email_id\n , created_at\n FROM users\n WHERE username = $1\n " - }, - "85499663f1adc7b7439592063f06914089f6243126a177b365bde37db5f6b33d": { - "describe": { - "columns": [ - { - "name": "oauth2_client_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "encrypted_client_secret", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "redirect_uris!", - "ordinal": 2, - "type_info": "TextArray" - }, - { - "name": "grant_type_authorization_code", - "ordinal": 3, - "type_info": "Bool" - }, - { - "name": "grant_type_refresh_token", - "ordinal": 4, - "type_info": "Bool" - }, - { - "name": "client_name", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "logo_uri", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "client_uri", - "ordinal": 7, - "type_info": "Text" - }, - { - "name": "policy_uri", - "ordinal": 8, - "type_info": "Text" - }, - { - "name": "tos_uri", - "ordinal": 9, - "type_info": "Text" - }, - { - "name": "jwks_uri", - "ordinal": 10, - "type_info": "Text" - }, - { - "name": "jwks", - "ordinal": 11, - "type_info": "Jsonb" - }, - { - "name": "id_token_signed_response_alg", - "ordinal": 12, - "type_info": "Text" - }, - { - "name": "userinfo_signed_response_alg", - "ordinal": 13, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_method", - "ordinal": 14, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_signing_alg", - "ordinal": 15, - "type_info": "Text" - }, - { - "name": "initiate_login_uri", - "ordinal": 16, - "type_info": "Text" - } - ], - "nullable": [ - false, - true, - null, - false, - false, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true - ], - "parameters": { - "Left": [ - "UuidArray" - ] - } - }, - "query": "\n SELECT oauth2_client_id\n , encrypted_client_secret\n , ARRAY(\n SELECT redirect_uri\n FROM oauth2_client_redirect_uris r\n WHERE r.oauth2_client_id = c.oauth2_client_id\n ) AS \"redirect_uris!\"\n , grant_type_authorization_code\n , grant_type_refresh_token\n , client_name\n , logo_uri\n , client_uri\n , policy_uri\n , tos_uri\n , jwks_uri\n , jwks\n , id_token_signed_response_alg\n , userinfo_signed_response_alg\n , token_endpoint_auth_method\n , token_endpoint_auth_signing_alg\n , initiate_login_uri\n FROM oauth2_clients c\n\n WHERE oauth2_client_id = ANY($1::uuid[])\n " - }, - "8acbdc892d44efb53529da1c2df65bea6b799a43cf4c9264a37d392847e6eff0": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM oauth2_sessions\n WHERE oauth2_client_id = $1\n " - }, - "8b7297c263336d70c2b647212b16f7ae39bc5cb1572e3a2dcfcd67f196a1fa39": { - "describe": { - "columns": [ - { - "name": "scope_token", - "ordinal": 0, - "type_info": "Text" - } - ], - "nullable": [ - false - ], - "parameters": { - "Left": [ - "Uuid", - "Uuid" - ] - } - }, - "query": "\n SELECT scope_token\n FROM oauth2_consents\n WHERE user_id = $1 AND oauth2_client_id = $2\n " - }, - "90b5512c0c9dc3b3eb6500056cc72f9993216d9b553c2e33a7edec26ffb0fc59": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE user_emails\n SET confirmed_at = $2\n WHERE user_email_id = $1\n " - }, - "90fe32cb9c88a262a682c0db700fef7d69d6ce0be1f930d9f16c50b921a8b819": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO user_emails (user_email_id, user_id, email, created_at)\n VALUES ($1, $2, $3, $4)\n " - }, - "91a3ee5ad64a947b7807a590f6b014c6856229918b972b98946f98b75686ab6c": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM upstream_oauth_providers\n WHERE upstream_oauth_provider_id = $1\n " - }, - "921d77c194609615a7e9a6fd806e9cc17a7927e3e5deb58f3917ceeb9ab4dede": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE user_email_confirmation_codes\n SET consumed_at = $2\n WHERE user_email_confirmation_code_id = $1\n " - }, - "9348d87f9e06b614c7e90bdc93bcf38236766aaf4d894bf768debdff2b59fae2": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE compat_sso_logins\n SET\n exchanged_at = $2\n WHERE\n compat_sso_login_id = $1\n " - }, - "94fd96446b237c87bd6bf741f3c42b37ee751b87b7fcc459602bdf8c46962443": { - "describe": { - "columns": [ - { - "name": "exists!", - "ordinal": 0, - "type_info": "Bool" - } - ], - "nullable": [ - null - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT EXISTS(\n SELECT 1 FROM users WHERE username = $1\n ) AS \"exists!\"\n " - }, - "9a6c197ff4ad80217262d48f8792ce7e16bc5df0677c7cd4ecb4fdbc5ee86395": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "UuidArray", - "Uuid", - "Uuid", - "TextArray", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO oauth2_consents\n (oauth2_consent_id, user_id, oauth2_client_id, scope_token, created_at)\n SELECT id, $2, $3, scope_token, $5 FROM UNNEST($1::uuid[], $4::text[]) u(id, scope_token)\n ON CONFLICT (user_id, oauth2_client_id, scope_token) DO UPDATE SET refreshed_at = $5\n " - }, - "9f7bdc034c618e47e49c467d0d7f5b8c297d055abe248cc876dbc12c5a7dc920": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Uuid", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO compat_refresh_tokens\n (compat_refresh_token_id, compat_session_id,\n compat_access_token_id, refresh_token, created_at)\n VALUES ($1, $2, $3, $4, $5)\n " - }, - "a2f7433f06fb4f6a7ad5ac6c1db18705276bce41e9b19d5d7e910ad4b767fb5e": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Uuid", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO oauth2_refresh_tokens\n (oauth2_refresh_token_id, oauth2_session_id, oauth2_access_token_id,\n refresh_token, created_at)\n VALUES\n ($1, $2, $3, $4, $5)\n " - }, - "a300fe99c95679c5664646a6a525c0491829e97db45f3234483872ed38436322": { - "describe": { - "columns": [ - { - "name": "user_email_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "user_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "email", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "confirmed_at", - "ordinal": 4, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - false, - false, - true - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT user_email_id\n , user_id\n , email\n , created_at\n , confirmed_at\n FROM user_emails\n\n WHERE user_id = $1\n\n ORDER BY email ASC\n " - }, - "a6fa7811d0a7c62c7cccff96dc82db5b25462fa7669fde1941ccab4712585b20": { - "describe": { - "columns": [ - { - "name": "oauth2_refresh_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "refresh_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "consumed_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "oauth2_access_token_id", - "ordinal": 4, - "type_info": "Uuid" - }, - { - "name": "oauth2_session_id", - "ordinal": 5, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - true, - true, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT oauth2_refresh_token_id\n , refresh_token\n , created_at\n , consumed_at\n , oauth2_access_token_id\n , oauth2_session_id\n FROM oauth2_refresh_tokens\n\n WHERE oauth2_refresh_token_id = $1\n " - }, - "a7f780528882a2ae66c45435215763eed0582264861436eab3f862e3eb12cab1": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Timestamptz", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO compat_access_tokens\n (compat_access_token_id, compat_session_id, access_token, created_at, expires_at)\n VALUES ($1, $2, $3, $4, $5)\n " - }, - "ab34912b42a48a8b5c8d63e271b99b7d0b690a2471873c6654b1b6cf2079b95c": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE compat_sessions cs\n SET finished_at = $2\n WHERE compat_session_id = $1\n " - }, - "af65441068530b68826561d4308e15923ba6c6882ded4860ebde4a7641359abb": { - "describe": { - "columns": [ - { - "name": "upstream_oauth_provider_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "issuer", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "scope", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "client_id", - "ordinal": 3, - "type_info": "Text" - }, - { - "name": "encrypted_client_secret", - "ordinal": 4, - "type_info": "Text" - }, - { - "name": "token_endpoint_signing_alg", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_method", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 7, - "type_info": "Timestamptz" - }, - { - "name": "claims_imports: Json", - "ordinal": 8, - "type_info": "Jsonb" - } - ], - "nullable": [ - false, - false, - false, - false, - true, - true, - false, - false, - false - ], - "parameters": { - "Left": [] - } - }, - "query": "\n SELECT\n upstream_oauth_provider_id,\n issuer,\n scope,\n client_id,\n encrypted_client_secret,\n token_endpoint_signing_alg,\n token_endpoint_auth_method,\n created_at,\n claims_imports as \"claims_imports: Json\"\n FROM upstream_oauth_providers\n " - }, - "afa86e79e3de2a83265cb0db8549d378a2f11b2a27bbd86d60558318c87eb698": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Timestamptz", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO oauth2_access_tokens\n (oauth2_access_token_id, oauth2_session_id, access_token, created_at, expires_at)\n VALUES\n ($1, $2, $3, $4, $5)\n " - }, - "aff08a8caabeb62f4929e6e901e7ca7c55e284c18c5c1d1e78821dd9bc961412": { - "describe": { - "columns": [ - { - "name": "user_email_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "user_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "email", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "confirmed_at", - "ordinal": 4, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - false, - false, - true - ], - "parameters": { - "Left": [ - "Uuid", - "Text" - ] - } - }, - "query": "\n SELECT user_email_id\n , user_id\n , email\n , created_at\n , confirmed_at\n FROM user_emails\n\n WHERE user_id = $1 AND email = $2\n " - }, - "b26ae7dd28f8a756b55a76e80cdedd7be9ba26435ea4a914421483f8ed832537": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Text", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO users (user_id, username, created_at)\n VALUES ($1, $2, $3)\n " - }, - "b515bbfb331e46acd3c0219f09223cc5d8d31cb41287e693dcb82c6e199f7991": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Timestamptz", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO user_email_confirmation_codes\n (user_email_confirmation_code_id, user_email_id, code, created_at, expires_at)\n VALUES ($1, $2, $3, $4, $5)\n " - }, - "b6a6f5386dc89e4bc2ce56d578a29341848fce336d339b6bbf425956f5ed5032": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE oauth2_refresh_tokens\n SET consumed_at = $2\n WHERE oauth2_refresh_token_id = $1\n " - }, - "b700dc3f7d0f86f4904725d8357e34b7e457f857ed37c467c314142877fd5367": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE oauth2_sessions\n SET finished_at = $2\n WHERE oauth2_session_id = $1\n " - }, - "b753790eecbbb4bcd87b9e9a1d1b0dd6c3b50e82ffbfee356e2cf755d72f00be": { - "describe": { - "columns": [ - { - "name": "id!", - "ordinal": 0, - "type_info": "Text" - } - ], - "nullable": [ - null - ], - "parameters": { - "Left": [ - "Text", - "Json" - ] - } - }, - "query": "\n SELECT id as \"id!\"\n FROM apalis.push_job($1::text, $2::json, 'Pending', now(), 25)\n " - }, - "b9875a270f7e753e48075ccae233df6e24a91775ceb877735508c1d5b2300d64": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz", - "Text", - "Uuid" - ] - } - }, - "query": "\n UPDATE upstream_oauth_authorization_sessions\n SET upstream_oauth_link_id = $1,\n completed_at = $2,\n id_token = $3\n WHERE upstream_oauth_authorization_session_id = $4\n " - }, - "b992283a9b43cbb8f86149f3f55cb47fb628dabd8fadc50e6a5772903f851e1c": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n DELETE FROM upstream_oauth_authorization_sessions\n WHERE upstream_oauth_provider_id = $1\n " - }, - "bbf62633c561706a762089bbab2f76a9ba3e2ed3539ef16accb601fb609c2ec9": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE compat_access_tokens\n SET expires_at = $2\n WHERE compat_access_token_id = $1\n " - }, - "bd1f6daa5fa1b10250c01f8b3fbe451646a9ceeefa6f72b9c4e29b6d05f17641": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n UPDATE users\n SET primary_user_email_id = user_emails.user_email_id\n FROM user_emails\n WHERE user_emails.user_email_id = $1\n AND users.user_id = user_emails.user_id\n " - }, - "c0ed9d70e496433d8686a499055d8a8376459109b6154a2c0c13b28462afa523": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Text", - "Text", - "Text", - "Int4", - "Text", - "Text", - "Text", - "Bool", - "Bool", - "Text", - "Bool", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO oauth2_authorization_grants (\n oauth2_authorization_grant_id,\n oauth2_client_id,\n redirect_uri,\n scope,\n state,\n nonce,\n max_age,\n response_mode,\n code_challenge,\n code_challenge_method,\n response_type_code,\n response_type_id_token,\n authorization_code,\n requires_consent,\n created_at\n )\n VALUES\n ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)\n " - }, - "c1d90a7f2287ec779c81a521fab19e5ede3fa95484033e0312c30d9b6ecc03f0": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n INSERT INTO user_sessions (user_session_id, user_id, created_at)\n VALUES ($1, $2, $3)\n " - }, - "c5e7dbb22488aca427b85b3415bd1f1a1766ff865f2e08a5daa095d2a1ccbd56": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE oauth2_authorization_grants\n SET exchanged_at = $2\n WHERE oauth2_authorization_grant_id = $1\n " - }, - "cff3ac0fff62ffdc5640fce08c2ffabc1d89202561b736c5d03b501dfcd8d886": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Text", - "Timestamptz", - "Bool" - ] - } - }, - "query": "\n INSERT INTO compat_sessions (compat_session_id, user_id, device_id, created_at, is_synapse_admin)\n VALUES ($1, $2, $3, $4, $5)\n " - }, - "d0b403e9c843ef19fa5ad60bec32ebf14a1ba0d01681c3836366d3f55e7851f4": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid", - "Timestamptz" - ] - } - }, - "query": "\n UPDATE compat_refresh_tokens\n SET consumed_at = $2\n WHERE compat_refresh_token_id = $1\n " - }, - "d12a513b81b3ef658eae1f0a719933323f28c6ee260b52cafe337dd3d19e865c": { - "describe": { - "columns": [ - { - "name": "count", - "ordinal": 0, - "type_info": "Int8" - } - ], - "nullable": [ - null - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT COUNT(*)\n FROM user_emails\n WHERE user_id = $1\n " - }, - "d83421d4a16f4ad084dd0db5abb56d3688851c36a48a50aa6104e8291e73630d": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n UPDATE oauth2_authorization_grants AS og\n SET\n requires_consent = 'f'\n WHERE\n og.oauth2_authorization_grant_id = $1\n " - }, - "db90cbc406a399f5447bd2c1d8018464f83b927dec620353516c0285b76fcf24": { - "describe": { - "columns": [ - { - "name": "oauth2_client_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "encrypted_client_secret", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "redirect_uris!", - "ordinal": 2, - "type_info": "TextArray" - }, - { - "name": "grant_type_authorization_code", - "ordinal": 3, - "type_info": "Bool" - }, - { - "name": "grant_type_refresh_token", - "ordinal": 4, - "type_info": "Bool" - }, - { - "name": "client_name", - "ordinal": 5, - "type_info": "Text" - }, - { - "name": "logo_uri", - "ordinal": 6, - "type_info": "Text" - }, - { - "name": "client_uri", - "ordinal": 7, - "type_info": "Text" - }, - { - "name": "policy_uri", - "ordinal": 8, - "type_info": "Text" - }, - { - "name": "tos_uri", - "ordinal": 9, - "type_info": "Text" - }, - { - "name": "jwks_uri", - "ordinal": 10, - "type_info": "Text" - }, - { - "name": "jwks", - "ordinal": 11, - "type_info": "Jsonb" - }, - { - "name": "id_token_signed_response_alg", - "ordinal": 12, - "type_info": "Text" - }, - { - "name": "userinfo_signed_response_alg", - "ordinal": 13, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_method", - "ordinal": 14, - "type_info": "Text" - }, - { - "name": "token_endpoint_auth_signing_alg", - "ordinal": 15, - "type_info": "Text" - }, - { - "name": "initiate_login_uri", - "ordinal": 16, - "type_info": "Text" - } - ], - "nullable": [ - false, - true, - null, - false, - false, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT oauth2_client_id\n , encrypted_client_secret\n , ARRAY(\n SELECT redirect_uri\n FROM oauth2_client_redirect_uris r\n WHERE r.oauth2_client_id = c.oauth2_client_id\n ) AS \"redirect_uris!\"\n , grant_type_authorization_code\n , grant_type_refresh_token\n , client_name\n , logo_uri\n , client_uri\n , policy_uri\n , tos_uri\n , jwks_uri\n , jwks\n , id_token_signed_response_alg\n , userinfo_signed_response_alg\n , token_endpoint_auth_method\n , token_endpoint_auth_signing_alg\n , initiate_login_uri\n FROM oauth2_clients c\n\n WHERE oauth2_client_id = $1\n " - }, - "dbf4be84eeff9ea51b00185faae2d453ab449017ed492bf6711dc7fceb630880": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Timestamptz", - "Uuid" - ] - } - }, - "query": "\n UPDATE user_sessions\n SET finished_at = $1\n WHERE user_session_id = $2\n " - }, - "dd16942318bf38d9a245b2c86fedd3cbd6b65e7a13465552d79cd3c022122fd4": { - "describe": { - "columns": [ - { - "name": "oauth2_access_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "access_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "expires_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "revoked_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "oauth2_session_id", - "ordinal": 5, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - false, - true, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT oauth2_access_token_id\n , access_token\n , created_at\n , expires_at\n , revoked_at\n , oauth2_session_id\n\n FROM oauth2_access_tokens\n\n WHERE oauth2_access_token_id = $1\n " - }, - "ddb22dd9ae9367af65a607e1fdc48b3d9581d67deea0c168f24e02090082bb82": { - "describe": { - "columns": [ - { - "name": "compat_sso_login_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "login_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "redirect_uri", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "fulfilled_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "exchanged_at", - "ordinal": 5, - "type_info": "Timestamptz" - }, - { - "name": "compat_session_id", - "ordinal": 6, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - false, - true, - true, - true - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT compat_sso_login_id\n , login_token\n , redirect_uri\n , created_at\n , fulfilled_at\n , exchanged_at\n , compat_session_id\n\n FROM compat_sso_logins\n WHERE compat_sso_login_id = $1\n " - }, - "e35d56de7136d43d0803ec825b0612e4185cef838f105d66f18cb24865e45140": { - "describe": { - "columns": [ - { - "name": "compat_refresh_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "refresh_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "consumed_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "compat_session_id", - "ordinal": 4, - "type_info": "Uuid" - }, - { - "name": "compat_access_token_id", - "ordinal": 5, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - true, - false, - false - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT compat_refresh_token_id\n , refresh_token\n , created_at\n , consumed_at\n , compat_session_id\n , compat_access_token_id\n\n FROM compat_refresh_tokens\n\n WHERE compat_refresh_token_id = $1\n " - }, - "e6dc63984aced9e19c20e90e9cd75d6f6d7ade64f782697715ac4da077b2e1fc": { - "describe": { - "columns": [ - { - "name": "upstream_oauth_link_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "upstream_oauth_provider_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "user_id", - "ordinal": 2, - "type_info": "Uuid" - }, - { - "name": "subject", - "ordinal": 3, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 4, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - true, - false, - false - ], - "parameters": { - "Left": [ - "Uuid", - "Text" - ] - } - }, - "query": "\n SELECT\n upstream_oauth_link_id,\n upstream_oauth_provider_id,\n user_id,\n subject,\n created_at\n FROM upstream_oauth_links\n WHERE upstream_oauth_provider_id = $1\n AND subject = $2\n " - }, - "e709869c062ac50248b1f9f8f808cc2f5e7bef58a6c2e42a7bb0c1cb8f508671": { - "describe": { - "columns": [ - { - "name": "oauth2_refresh_token_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "refresh_token", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 2, - "type_info": "Timestamptz" - }, - { - "name": "consumed_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "oauth2_access_token_id", - "ordinal": 4, - "type_info": "Uuid" - }, - { - "name": "oauth2_session_id", - "ordinal": 5, - "type_info": "Uuid" - } - ], - "nullable": [ - false, - false, - false, - true, - true, - false - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "\n SELECT oauth2_refresh_token_id\n , refresh_token\n , created_at\n , consumed_at\n , oauth2_access_token_id\n , oauth2_session_id\n FROM oauth2_refresh_tokens\n\n WHERE refresh_token = $1\n " - }, - "e7ce95415bb6b57cd601393c6abe5febfec2a963ce6eac7b099b761594b1dfaf": { - "describe": { - "columns": [ - { - "name": "created_at", - "ordinal": 0, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false - ], - "parameters": { - "Left": [ - "Uuid", - "Text", - "Text", - "Text", - "Text", - "Text", - "Text", - "Timestamptz", - "Jsonb" - ] - } - }, - "query": "\n INSERT INTO upstream_oauth_providers (\n upstream_oauth_provider_id,\n issuer,\n scope,\n token_endpoint_auth_method,\n token_endpoint_signing_alg,\n client_id,\n encrypted_client_secret,\n created_at,\n claims_imports\n ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)\n ON CONFLICT (upstream_oauth_provider_id) \n DO UPDATE\n SET\n issuer = EXCLUDED.issuer,\n scope = EXCLUDED.scope,\n token_endpoint_auth_method = EXCLUDED.token_endpoint_auth_method,\n token_endpoint_signing_alg = EXCLUDED.token_endpoint_signing_alg,\n client_id = EXCLUDED.client_id,\n encrypted_client_secret = EXCLUDED.encrypted_client_secret,\n claims_imports = EXCLUDED.claims_imports\n RETURNING created_at\n " - }, - "f0ace1af3775192a555c4ebb59b81183f359771f9f77e5fad759d38d872541d1": { - "describe": { - "columns": [ - { - "name": "oauth2_session_id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "user_session_id", - "ordinal": 1, - "type_info": "Uuid" - }, - { - "name": "oauth2_client_id", - "ordinal": 2, - "type_info": "Uuid" - }, - { - "name": "scope", - "ordinal": 3, - "type_info": "Text" - }, - { - "name": "created_at", - "ordinal": 4, - "type_info": "Timestamptz" - }, - { - "name": "finished_at", - "ordinal": 5, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - false, - false, - false, - true - ], - "parameters": { - "Left": [ - "Uuid" - ] - } - }, - "query": "\n SELECT oauth2_session_id\n , user_session_id\n , oauth2_client_id\n , scope\n , created_at\n , finished_at\n FROM oauth2_sessions\n\n WHERE oauth2_session_id = $1\n " - } -} \ No newline at end of file diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 942a41da..a480475d 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -8,14 +8,14 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.71" chrono = "0.4.26" -thiserror = "1.0.41" +thiserror = "1.0.43" futures-util = "0.3.28" apalis-core = { version = "0.4.2", features = ["tokio-comp"] } opentelemetry = "0.19.0" rand_core = "0.6.4" -serde = "1.0.166" -serde_json = "1.0.100" +serde = "1.0.171" +serde_json = "1.0.103" tracing = "0.1.37" tracing-opentelemetry = "0.19.0" url = "2.4.0" diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml index 97a472f1..6331cdd8 100644 --- a/crates/tasks/Cargo.toml +++ b/crates/tasks/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "apache-2.0" [dependencies] -anyhow = "1.0.71" +anyhow = "1.0.72" apalis-core = { version = "0.4.2", features = ["extensions", "tokio-comp", "storage"] } apalis-cron = "0.4.2" async-stream = "0.3.5" @@ -15,17 +15,17 @@ chrono = "0.4.26" futures-lite = "1.13.0" rand = "0.8.5" rand_chacha = "0.3.1" -sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] } -thiserror = "1.0.41" -tokio = { version = "1.28.2", features = ["macros", "time"] } +sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] } +thiserror = "1.0.43" +tokio = { version = "1.29.1", features = ["macros", "time"] } tower = "0.4.13" tracing = "0.1.37" tracing-opentelemetry = "0.19.0" opentelemetry = "0.19.0" ulid = "1.0.0" url = "2.4.0" -serde = { version = "1.0.166", features = ["derive"] } -serde_json = "1.0.97" +serde = { version = "1.0.171", features = ["derive"] } +serde_json = "1.0.103" mas-data-model = { path = "../data-model" } mas-email = { path = "../email" } diff --git a/crates/tasks/src/storage/postgres.rs b/crates/tasks/src/storage/postgres.rs index 2c86f423..1cb6566d 100644 --- a/crates/tasks/src/storage/postgres.rs +++ b/crates/tasks/src/storage/postgres.rs @@ -205,26 +205,29 @@ where .bind(id.to_string()) .bind(job_type) .bind(on) - .execute(&mut conn) + .execute(&mut *conn) .await .map_err(|e| StorageError::Database(Box::from(e)))?; Ok(id) } async fn fetch_by_id(&self, job_id: &JobId) -> StorageResult>> { - let pool = self.pool.clone(); + let mut conn = self + .pool + .acquire() + .await + .map_err(|e| StorageError::Connection(Box::from(e)))?; let fetch_query = "SELECT * FROM apalis.jobs WHERE id = $1"; let res: Option> = sqlx::query_as(fetch_query) .bind(job_id.to_string()) - .fetch_optional(&pool) + .fetch_optional(&mut *conn) .await .map_err(|e| StorageError::Database(Box::from(e)))?; Ok(res.map(Into::into)) } async fn heartbeat(&mut self, pulse: StorageWorkerPulse) -> StorageResult { - let pool = self.pool.clone(); match pulse { StorageWorkerPulse::EnqueueScheduled { count: _ } => { // Ideally jobs are queue via run_at. So this is not necessary @@ -234,7 +237,8 @@ where // Worker not seen in 5 minutes yet has running jobs StorageWorkerPulse::ReenqueueOrphaned { count } => { let job_type = T::NAME; - let mut tx = pool + let mut conn = self + .pool .acquire() .await .map_err(|e| StorageError::Database(Box::from(e)))?; @@ -247,7 +251,7 @@ where sqlx::query(query) .bind(job_type) .bind(count) - .execute(&mut tx) + .execute(&mut *conn) .await .map_err(|e| StorageError::Database(Box::from(e)))?; Ok(true) @@ -260,16 +264,16 @@ where async fn kill(&mut self, worker_id: &WorkerId, job_id: &JobId) -> StorageResult<()> { let pool = self.pool.clone(); - let mut tx = pool + let mut conn = pool .acquire() .await - .map_err(|e| StorageError::Database(Box::from(e)))?; + .map_err(|e| StorageError::Connection(Box::from(e)))?; let query = "UPDATE apalis.jobs SET status = 'Killed', done_at = now() WHERE id = $1 AND lock_by = $2"; sqlx::query(query) .bind(job_id.to_string()) .bind(worker_id.to_string()) - .execute(&mut tx) + .execute(&mut *conn) .await .map_err(|e| StorageError::Database(Box::from(e)))?; Ok(()) @@ -280,16 +284,16 @@ where async fn retry(&mut self, worker_id: &WorkerId, job_id: &JobId) -> StorageResult<()> { let pool = self.pool.clone(); - let mut tx = pool + let mut conn = pool .acquire() .await - .map_err(|e| StorageError::Database(Box::from(e)))?; + .map_err(|e| StorageError::Connection(Box::from(e)))?; let query = "UPDATE apalis.jobs SET status = 'Pending', done_at = NULL, lock_by = NULL WHERE id = $1 AND lock_by = $2"; sqlx::query(query) .bind(job_id.to_string()) .bind(worker_id.to_string()) - .execute(&mut tx) + .execute(&mut *conn) .await .map_err(|e| StorageError::Database(Box::from(e)))?; Ok(()) @@ -343,16 +347,16 @@ where #[allow(clippy::disallowed_methods)] let run_at = Utc::now().add(wait); - let mut tx = pool + let mut conn = pool .acquire() .await - .map_err(|e| StorageError::Database(Box::from(e)))?; + .map_err(|e| StorageError::Connection(Box::from(e)))?; let query = "UPDATE apalis.jobs SET status = 'Pending', done_at = NULL, lock_by = NULL, lock_at = NULL, run_at = $2 WHERE id = $1"; sqlx::query(query) .bind(job_id.to_string()) .bind(run_at) - .execute(&mut tx) + .execute(&mut *conn) .await .map_err(|e| StorageError::Database(Box::from(e)))?; Ok(()) @@ -371,10 +375,10 @@ where let lock_at = *job.lock_at(); let last_error = job.last_error().clone(); - let mut tx = pool + let mut conn = pool .acquire() .await - .map_err(|e| StorageError::Database(Box::from(e)))?; + .map_err(|e| StorageError::Connection(Box::from(e)))?; let query = "UPDATE apalis.jobs SET status = $1, attempts = $2, done_at = $3, lock_by = $4, lock_at = $5, last_error = $6 WHERE id = $7"; sqlx::query(query) @@ -385,7 +389,7 @@ where .bind(lock_at) .bind(last_error) .bind(job_id.to_string()) - .execute(&mut tx) + .execute(&mut *conn) .await .map_err(|e| StorageError::Database(Box::from(e)))?; Ok(()) diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index 5270cde6..cc83a26e 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -9,15 +9,15 @@ license = "Apache-2.0" tracing = "0.1.37" tokio = { version = "1.29.1", features = ["macros", "rt"] } -anyhow = "1.0.71" -thiserror = "1.0.41" +anyhow = "1.0.72" +thiserror = "1.0.43" tera = "1.19.0" -serde = { version = "1.0.166", features = ["derive"] } -serde_json = "1.0.100" +serde = { version = "1.0.171", features = ["derive"] } +serde_json = "1.0.103" serde_urlencoded = "0.7.1" -camino = "1.1.4" +camino = "1.1.6" chrono = "0.4.26" url = "2.4.0" http = "0.2.9"