update and clippy

This commit is contained in:
2023-08-29 21:34:01 +02:00
parent 479d8f1a6a
commit fda4118f6b
6 changed files with 101 additions and 111 deletions

124
rust/Cargo.lock generated
View File

@@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "addr2line" name = "addr2line"
version = "0.20.0" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
dependencies = [ dependencies = [
"gimli", "gimli",
] ]
@@ -46,24 +46,23 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]] [[package]]
name = "anstream" name = "anstream"
version = "0.3.2" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"anstyle-parse", "anstyle-parse",
"anstyle-query", "anstyle-query",
"anstyle-wincon", "anstyle-wincon",
"colorchoice", "colorchoice",
"is-terminal",
"utf8parse", "utf8parse",
] ]
[[package]] [[package]]
name = "anstyle" name = "anstyle"
version = "1.0.1" version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
[[package]] [[package]]
name = "anstyle-parse" name = "anstyle-parse"
@@ -85,9 +84,9 @@ dependencies = [
[[package]] [[package]]
name = "anstyle-wincon" name = "anstyle-wincon"
version = "1.0.2" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"windows-sys", "windows-sys",
@@ -200,9 +199,9 @@ dependencies = [
[[package]] [[package]]
name = "backtrace" name = "backtrace"
version = "0.3.68" version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
dependencies = [ dependencies = [
"addr2line", "addr2line",
"cc", "cc",
@@ -221,9 +220,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.21.2" version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
[[package]] [[package]]
name = "base64ct" name = "base64ct"
@@ -290,9 +289,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.3.23" version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@@ -301,9 +300,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.3.23" version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@@ -313,9 +312,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.3.12" version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
@@ -325,9 +324,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_lex" name = "clap_lex"
version = "0.5.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
[[package]] [[package]]
name = "colorchoice" name = "colorchoice"
@@ -719,9 +718,9 @@ dependencies = [
[[package]] [[package]]
name = "gimli" name = "gimli"
version = "0.27.3" version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]] [[package]]
name = "h2" name = "h2"
@@ -986,17 +985,6 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
[[package]]
name = "is-terminal"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
"rustix",
"windows-sys",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.10.5" version = "0.10.5"
@@ -1164,7 +1152,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5"
dependencies = [ dependencies = [
"base64 0.21.2", "base64 0.21.3",
"hyper", "hyper",
"indexmap 1.9.3", "indexmap 1.9.3",
"ipnet", "ipnet",
@@ -1314,9 +1302,9 @@ dependencies = [
[[package]] [[package]]
name = "object" name = "object"
version = "0.31.1" version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@@ -1390,7 +1378,7 @@ dependencies = [
"futures-util", "futures-util",
"once_cell", "once_cell",
"opentelemetry_api", "opentelemetry_api",
"ordered-float 3.9.0", "ordered-float 3.9.1",
"percent-encoding", "percent-encoding",
"rand", "rand",
"regex", "regex",
@@ -1410,9 +1398,9 @@ dependencies = [
[[package]] [[package]]
name = "ordered-float" name = "ordered-float"
version = "3.9.0" version = "3.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "126d3e6f3926bfb0fb24495b4f4da50626f547e54956594748e3d8882a0320b4" checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
dependencies = [ dependencies = [
"num-traits", "num-traits",
] ]
@@ -1429,7 +1417,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"axum", "axum",
"axum-prometheus", "axum-prometheus",
"base64 0.21.2", "base64 0.21.3",
"clap", "clap",
"console-subscriber", "console-subscriber",
"futures", "futures",
@@ -1522,9 +1510,9 @@ dependencies = [
[[package]] [[package]]
name = "pin-project-lite" name = "pin-project-lite"
version = "0.2.12" version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]] [[package]]
name = "pin-utils" name = "pin-utils"
@@ -1561,9 +1549,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]] [[package]]
name = "portable-atomic" name = "portable-atomic"
version = "1.4.2" version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
[[package]] [[package]]
name = "ppv-lite86" name = "ppv-lite86"
@@ -1711,14 +1699,14 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.9.3" version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
"regex-automata 0.3.6", "regex-automata 0.3.7",
"regex-syntax 0.7.4", "regex-syntax 0.7.5",
] ]
[[package]] [[package]]
@@ -1732,13 +1720,13 @@ dependencies = [
[[package]] [[package]]
name = "regex-automata" name = "regex-automata"
version = "0.3.6" version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
"regex-syntax 0.7.4", "regex-syntax 0.7.5",
] ]
[[package]] [[package]]
@@ -1749,9 +1737,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.7.4" version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
[[package]] [[package]]
name = "ring" name = "ring"
@@ -1798,9 +1786,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.8" version = "0.38.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49"
dependencies = [ dependencies = [
"bitflags 2.4.0", "bitflags 2.4.0",
"errno", "errno",
@@ -1826,7 +1814,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [ dependencies = [
"base64 0.21.2", "base64 0.21.3",
] ]
[[package]] [[package]]
@@ -1869,18 +1857,18 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.171" version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.171" version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -2140,7 +2128,7 @@ name = "sqlx-mysql"
version = "0.7.1" version = "0.7.1"
dependencies = [ dependencies = [
"atoi", "atoi",
"base64 0.21.2", "base64 0.21.3",
"bitflags 2.4.0", "bitflags 2.4.0",
"byteorder", "byteorder",
"bytes", "bytes",
@@ -2181,7 +2169,7 @@ name = "sqlx-postgres"
version = "0.7.1" version = "0.7.1"
dependencies = [ dependencies = [
"atoi", "atoi",
"base64 0.21.2", "base64 0.21.3",
"bitflags 2.4.0", "bitflags 2.4.0",
"byteorder", "byteorder",
"crc", "crc",
@@ -2352,9 +2340,9 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.26" version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
dependencies = [ dependencies = [
"deranged", "deranged",
"itoa", "itoa",
@@ -2371,9 +2359,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]] [[package]]
name = "time-macros" name = "time-macros"
version = "0.2.12" version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9"
dependencies = [ dependencies = [
"time-core", "time-core",
] ]
@@ -2465,7 +2453,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",
"base64 0.21.2", "base64 0.21.3",
"bytes", "bytes",
"futures-core", "futures-core",
"futures-util", "futures-util",

View File

@@ -57,11 +57,13 @@ impl AuthError {
pub fn trace(&self) { pub fn trace(&self) {
match self { match self {
Self::AuthenticationUserNotFound { username } => { Self::AuthenticationUserNotFound { username } => {
tracing::info!(username, "auth failed, user not found") tracing::info!(username, "auth failed, user not found");
}
Self::AuthenticationHeaderMissing => {
tracing::info!("auth failed, auth header missing");
} }
Self::AuthenticationHeaderMissing => tracing::info!("auth failed, auth header missing"),
Self::AuthenticationHeaderInvalid { message } => { Self::AuthenticationHeaderInvalid { message } => {
tracing::info!(message, "auth failed, auth header invalid") tracing::info!(message, "auth failed, auth header invalid");
} }
} }
} }

View File

@@ -14,7 +14,7 @@ impl Inventory {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let mut categories = crate::query_all!( let mut categories = crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -76,7 +76,7 @@ impl Category {
let id_param = id.to_string(); let id_param = id.to_string();
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
crate::query_one!( crate::query_one!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -103,7 +103,7 @@ impl Category {
let id_param = id.to_string(); let id_param = id.to_string();
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Insert, query_type: sqlite::QueryType::Insert,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -142,7 +142,7 @@ impl Category {
let id = self.id.to_string(); let id = self.id.to_string();
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let items = crate::query_all!( let items = crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -238,7 +238,7 @@ impl InventoryItem {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
crate::query_one!( crate::query_one!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -279,7 +279,7 @@ impl InventoryItem {
) -> Result<bool, Error> { ) -> Result<bool, Error> {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
crate::query_exists!( crate::query_exists!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -300,7 +300,7 @@ impl InventoryItem {
let id_param = id.to_string(); let id_param = id.to_string();
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let results = crate::execute!( let results = crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Delete, query_type: sqlite::QueryType::Delete,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -330,7 +330,7 @@ impl InventoryItem {
let id_param = id.to_string(); let id_param = id.to_string();
crate::execute_returning_uuid!( crate::execute_returning_uuid!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -366,7 +366,7 @@ impl InventoryItem {
let category_id_param = category_id.to_string(); let category_id_param = category_id.to_string();
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Insert, query_type: sqlite::QueryType::Insert,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -396,7 +396,7 @@ impl InventoryItem {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let category_id_param = category_id.to_string(); let category_id_param = category_id.to_string();
let weight = crate::execute_returning!( let weight = crate::execute_returning!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -462,7 +462,7 @@ impl Item {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let category_id_param = category_id.to_string(); let category_id_param = category_id.to_string();
crate::execute_returning!( crate::execute_returning!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },

View File

@@ -197,7 +197,7 @@ impl TripCategory {
} }
let mut rows = crate::query_all!( let mut rows = crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -329,7 +329,7 @@ impl TripItem {
let item_id_param = item_id.to_string(); let item_id_param = item_id.to_string();
let trip_id_param = trip_id.to_string(); let trip_id_param = trip_id.to_string();
crate::query_one!( crate::query_one!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -376,7 +376,7 @@ impl TripItem {
let result = match key { let result = match key {
TripItemStateKey::Pick => { TripItemStateKey::Pick => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -395,7 +395,7 @@ impl TripItem {
} }
TripItemStateKey::Pack => { TripItemStateKey::Pack => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -414,7 +414,7 @@ impl TripItem {
} }
TripItemStateKey::Ready => { TripItemStateKey::Ready => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Inventory, component: sqlite::Component::Inventory,
}, },
@@ -509,7 +509,7 @@ impl Trip {
pub async fn all(ctx: &Context, pool: &sqlite::Pool) -> Result<Vec<Trip>, Error> { pub async fn all(ctx: &Context, pool: &sqlite::Pool) -> Result<Vec<Trip>, Error> {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
crate::query_all!( crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -542,7 +542,7 @@ impl Trip {
let trip_id_param = trip_id.to_string(); let trip_id_param = trip_id.to_string();
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
crate::query_one!( crate::query_one!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -579,7 +579,7 @@ impl Trip {
let type_id_param = type_id.to_string(); let type_id_param = type_id.to_string();
let results = crate::execute!( let results = crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Delete, query_type: sqlite::QueryType::Delete,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -615,7 +615,7 @@ impl Trip {
let type_id_param = type_id.to_string(); let type_id_param = type_id.to_string();
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Insert, query_type: sqlite::QueryType::Insert,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -650,7 +650,7 @@ impl Trip {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let trip_id_param = id.to_string(); let trip_id_param = id.to_string();
let result = crate::execute!( let result = crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -677,7 +677,7 @@ impl Trip {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let trip_id_param = id.to_string(); let trip_id_param = id.to_string();
let result = crate::execute!( let result = crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -707,7 +707,7 @@ impl Trip {
let result = match attribute { let result = match attribute {
TripAttribute::Name => { TripAttribute::Name => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -724,7 +724,7 @@ impl Trip {
TripAttribute::DateStart => { TripAttribute::DateStart => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -740,7 +740,7 @@ impl Trip {
} }
TripAttribute::DateEnd => { TripAttribute::DateEnd => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -756,7 +756,7 @@ impl Trip {
} }
TripAttribute::Location => { TripAttribute::Location => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -772,7 +772,7 @@ impl Trip {
} }
TripAttribute::TempMin => { TripAttribute::TempMin => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -788,7 +788,7 @@ impl Trip {
} }
TripAttribute::TempMax => { TripAttribute::TempMax => {
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -828,7 +828,7 @@ impl Trip {
let trip_state = TripState::new(); let trip_state = TripState::new();
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Insert, query_type: sqlite::QueryType::Insert,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -858,7 +858,7 @@ impl Trip {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let trip_id_param = trip_id.to_string(); let trip_id_param = trip_id.to_string();
let weight = crate::execute_returning!( let weight = crate::execute_returning!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -946,7 +946,7 @@ impl Trip {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
let id = self.id.to_string(); let id = self.id.to_string();
let types = crate::query_all!( let types = crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -1014,7 +1014,7 @@ impl Trip {
} }
let unsynced_items: Vec<Uuid> = crate::query_all!( let unsynced_items: Vec<Uuid> = crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -1044,7 +1044,7 @@ impl Trip {
for unsynced_item in &unsynced_items { for unsynced_item in &unsynced_items {
let item_id = unsynced_item.to_string(); let item_id = unsynced_item.to_string();
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Insert, query_type: sqlite::QueryType::Insert,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -1148,7 +1148,7 @@ impl Trip {
} }
let rows = crate::query_all!( let rows = crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -1296,7 +1296,7 @@ impl TripsType {
pub async fn all(ctx: &Context, pool: &sqlite::Pool) -> Result<Vec<Self>, Error> { pub async fn all(ctx: &Context, pool: &sqlite::Pool) -> Result<Vec<Self>, Error> {
let user_id = ctx.user.id.to_string(); let user_id = ctx.user.id.to_string();
crate::query_all!( crate::query_all!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -1319,7 +1319,7 @@ impl TripsType {
let id = Uuid::new_v4(); let id = Uuid::new_v4();
let id_param = id.to_string(); let id_param = id.to_string();
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Insert, query_type: sqlite::QueryType::Insert,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },
@@ -1348,7 +1348,7 @@ impl TripsType {
let id_param = id.to_string(); let id_param = id.to_string();
let result = crate::execute!( let result = crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Update, query_type: sqlite::QueryType::Update,
component: sqlite::Component::Trips, component: sqlite::Component::Trips,
}, },

View File

@@ -42,7 +42,7 @@ impl User {
name: &str, name: &str,
) -> Result<Option<Self>, Error> { ) -> Result<Option<Self>, Error> {
crate::query_one!( crate::query_one!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Select, query_type: sqlite::QueryType::Select,
component: sqlite::Component::User, component: sqlite::Component::User,
}, },
@@ -62,7 +62,7 @@ pub async fn create(pool: &sqlite::Pool, user: NewUser<'_>) -> Result<Uuid, Erro
let id_param = id.to_string(); let id_param = id.to_string();
crate::execute!( crate::execute!(
sqlite::QueryClassification { &sqlite::QueryClassification {
query_type: sqlite::QueryType::Insert, query_type: sqlite::QueryType::Insert,
component: sqlite::Component::User, component: sqlite::Component::User,
}, },

View File

@@ -111,7 +111,7 @@ pub struct QueryClassification {
} }
pub fn sqlx_query( pub fn sqlx_query(
classification: QueryClassification, classification: &QueryClassification,
query: &str, query: &str,
labels: &[(&'static str, String)], labels: &[(&'static str, String)],
) { ) {