From 7139e414d5bada5a5b9bbdc9d4089ad360160d20 Mon Sep 17 00:00:00 2001 From: dieriba Date: Sat, 15 Nov 2025 01:21:05 +0100 Subject: [PATCH] update sqlx --- ...242af1ac0276d3143e3af00e9a99f058fe5bb.json | 22 ++++++++ ...153c43903f929ae5d62fbba12610f89c36d55.json | 2 +- ...1a507669c0718363d89e9115824a93d288969.json | 22 -------- ...cdb0573b5dc8221b33b93a7fd5244980d99b7.json | 24 +++++++++ ...14a79327699f8718d010a71aca1dcf281420b.json | 22 -------- ...df751eb8dd44b700e82539b359a926cacc011.json | 24 --------- backend/Cargo.lock | 50 ++++--------------- 7 files changed, 57 insertions(+), 109 deletions(-) create mode 100644 backend/.sqlx/query-14cb27031d383462b35e6b71c35242af1ac0276d3143e3af00e9a99f058fe5bb.json delete mode 100644 backend/.sqlx/query-5b24b4731623b25bf3e65ade4d71a507669c0718363d89e9115824a93d288969.json create mode 100644 backend/.sqlx/query-706a45bebb2321d6bb2330d225ecdb0573b5dc8221b33b93a7fd5244980d99b7.json delete mode 100644 backend/.sqlx/query-81226fe1d728ffba3629b6bd61414a79327699f8718d010a71aca1dcf281420b.json delete mode 100644 backend/.sqlx/query-d96cc71bbfecd92af3742648bbbdf751eb8dd44b700e82539b359a926cacc011.json diff --git a/backend/.sqlx/query-14cb27031d383462b35e6b71c35242af1ac0276d3143e3af00e9a99f058fe5bb.json b/backend/.sqlx/query-14cb27031d383462b35e6b71c35242af1ac0276d3143e3af00e9a99f058fe5bb.json new file mode 100644 index 0000000000..00cf5272f6 --- /dev/null +++ b/backend/.sqlx/query-14cb27031d383462b35e6b71c35242af1ac0276d3143e3af00e9a99f058fe5bb.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT \n COUNT(*) \n FROM (\n SELECT id FROM v2_job WHERE workspace_id = $1\n UNION ALL\n SELECT id FROM v2_job_completed WHERE workspace_id = $1\n ) as total_jobs", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "count", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + null + ] + }, + "hash": "14cb27031d383462b35e6b71c35242af1ac0276d3143e3af00e9a99f058fe5bb" +} diff --git a/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json b/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json index 36ddb8ab9f..713ccb9dd3 100644 --- a/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json +++ b/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json @@ -15,7 +15,7 @@ ] }, "nullable": [ - true + null ] }, "hash": "5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55" diff --git a/backend/.sqlx/query-5b24b4731623b25bf3e65ade4d71a507669c0718363d89e9115824a93d288969.json b/backend/.sqlx/query-5b24b4731623b25bf3e65ade4d71a507669c0718363d89e9115824a93d288969.json deleted file mode 100644 index 2877af01b7..0000000000 --- a/backend/.sqlx/query-5b24b4731623b25bf3e65ade4d71a507669c0718363d89e9115824a93d288969.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) FROM v2_job_completed WHERE workspace_id = $1", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Text" - ] - }, - "nullable": [ - null - ] - }, - "hash": "5b24b4731623b25bf3e65ade4d71a507669c0718363d89e9115824a93d288969" -} diff --git a/backend/.sqlx/query-706a45bebb2321d6bb2330d225ecdb0573b5dc8221b33b93a7fd5244980d99b7.json b/backend/.sqlx/query-706a45bebb2321d6bb2330d225ecdb0573b5dc8221b33b93a7fd5244980d99b7.json new file mode 100644 index 0000000000..b36a33ec19 --- /dev/null +++ b/backend/.sqlx/query-706a45bebb2321d6bb2330d225ecdb0573b5dc8221b33b93a7fd5244980d99b7.json @@ -0,0 +1,24 @@ +{ + "db_name": "PostgreSQL", + "query": "WITH \n batch_completed_jobs AS (\n SELECT id FROM v2_job_completed\n WHERE workspace_id = $1\n LIMIT $2\n ),\n batch_jobs AS (\n SELECT id FROM v2_job\n WHERE workspace_id = $1\n LIMIT $2\n ),\n updated_completed AS (\n UPDATE v2_job_completed\n SET workspace_id = $3\n WHERE id IN (SELECT id FROM batch_completed_jobs)\n RETURNING 1\n ),\n updated_jobs AS (\n UPDATE v2_job\n SET workspace_id = $3\n WHERE id IN (SELECT id FROM batch_jobs)\n RETURNING 1\n )\n SELECT \n (SELECT COUNT(*) FROM updated_completed) + \n (SELECT COUNT(*) FROM updated_jobs) as total_count", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "total_count", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [ + "Text", + "Int8", + "Varchar" + ] + }, + "nullable": [ + null + ] + }, + "hash": "706a45bebb2321d6bb2330d225ecdb0573b5dc8221b33b93a7fd5244980d99b7" +} diff --git a/backend/.sqlx/query-81226fe1d728ffba3629b6bd61414a79327699f8718d010a71aca1dcf281420b.json b/backend/.sqlx/query-81226fe1d728ffba3629b6bd61414a79327699f8718d010a71aca1dcf281420b.json deleted file mode 100644 index 35443df17d..0000000000 --- a/backend/.sqlx/query-81226fe1d728ffba3629b6bd61414a79327699f8718d010a71aca1dcf281420b.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT \n 1 \n FROM \n workspace \n WHERE \n id = $1\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "?column?", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Text" - ] - }, - "nullable": [ - null - ] - }, - "hash": "81226fe1d728ffba3629b6bd61414a79327699f8718d010a71aca1dcf281420b" -} diff --git a/backend/.sqlx/query-d96cc71bbfecd92af3742648bbbdf751eb8dd44b700e82539b359a926cacc011.json b/backend/.sqlx/query-d96cc71bbfecd92af3742648bbbdf751eb8dd44b700e82539b359a926cacc011.json deleted file mode 100644 index 76f4fc887c..0000000000 --- a/backend/.sqlx/query-d96cc71bbfecd92af3742648bbbdf751eb8dd44b700e82539b359a926cacc011.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "WITH batch AS (\n SELECT id FROM v2_job_completed\n WHERE workspace_id = $1\n LIMIT $2\n )\n UPDATE v2_job_completed\n SET workspace_id = $3\n WHERE id IN (SELECT id FROM batch)\n RETURNING 1", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "?column?", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Text", - "Int8", - "Varchar" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d96cc71bbfecd92af3742648bbbdf751eb8dd44b700e82539b359a926cacc011" -} diff --git a/backend/Cargo.lock b/backend/Cargo.lock index a421888328..960c57b32f 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -4524,16 +4524,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro 0.12.0", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro 0.20.2", + "derive_builder_macro", ] [[package]] @@ -4548,38 +4539,16 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn 2.0.107", -] - [[package]] name = "derive_builder_macro" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core 0.12.0", + "derive_builder_core", "syn 1.0.109", ] -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core 0.20.2", - "syn 2.0.107", -] - [[package]] name = "derive_more" version = "0.99.20" @@ -10251,9 +10220,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", "serde", @@ -11430,13 +11399,14 @@ dependencies = [ [[package]] name = "samael" version = "0.0.14" -source = "git+https://github.com/njaremko/samael?rev=464d015e3ae393e4b5dd00b4d6baa1b617de0dd6#464d015e3ae393e4b5dd00b4d6baa1b617de0dd6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75583aad4a51c50fc0af69c230d18078c9d5a69a98d0f6013d01053acf744f4" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "bindgen 0.69.5", "chrono", "data-encoding", - "derive_builder 0.20.2", + "derive_builder", "flate2", "lazy_static", "libc", @@ -11445,7 +11415,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "pkg-config", - "quick-xml 0.31.0", + "quick-xml 0.30.0", "rand 0.8.5", "serde", "thiserror 1.0.69", @@ -13624,7 +13594,7 @@ checksum = "d9be88c795d8b9f9c4002b3a8f26a6d0876103a6f523b32ea3bac52d8560c17c" dependencies = [ "aho-corasick", "clap", - "derive_builder 0.12.0", + "derive_builder", "esaxx-rs", "getrandom 0.2.16", "indicatif",