diff --git a/server-api/db/Cargo.lock b/server-api/db/Cargo.lock index c6ad5c1..e4be112 100644 --- a/server-api/db/Cargo.lock +++ b/server-api/db/Cargo.lock @@ -279,6 +279,7 @@ dependencies = [ "chrono", "mysql_async", "serde", + "serde_json", ] [[package]] @@ -614,7 +615,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", "mio", - "miow 0.3.5", + "miow 0.3.6", "winapi 0.3.9", ] @@ -643,9 +644,9 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ "socket2", "winapi 0.3.9", @@ -703,7 +704,7 @@ dependencies = [ "serde_json", "sha1", "sha2", - "time 0.2.22", + "time 0.2.23", "twox-hash", "uuid", ] @@ -1082,6 +1083,9 @@ name = "serde" version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" @@ -1143,9 +1147,9 @@ dependencies = [ [[package]] name = "standback" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e0831040d2cf2bdfd51b844be71885783d489898a192f254ae25d57cce725c" +checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8" dependencies = [ "version_check", ] @@ -1284,9 +1288,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af" +checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" dependencies = [ "const_fn", "libc", @@ -1418,9 +1422,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6" +checksum = "f1e9a0b71dba18b6fa17c7b3dcf1440bb3522552deb2f84bf47dabd9fb7e5570" dependencies = [ "tinyvec", ] diff --git a/server-api/db/Cargo.toml b/server-api/db/Cargo.toml index d6e43ac..07308c4 100644 --- a/server-api/db/Cargo.toml +++ b/server-api/db/Cargo.toml @@ -9,5 +9,8 @@ edition = "2018" [dependencies] mysql_async = "0.23.1" async-trait = "0.1.40" -serde = "1.0.117" + +serde_json = "1.0" +serde = { version = "1.0.117", features = [ "derive" ] } + chrono = "0.4.0" diff --git a/server-api/db/src/channels.rs b/server-api/db/src/channels.rs index e2f8de6..4888e45 100644 --- a/server-api/db/src/channels.rs +++ b/server-api/db/src/channels.rs @@ -10,7 +10,6 @@ use crate::{sql_err, no_conn, Response}; use serde::Serialize; -#[allow(dead_code)] #[derive(Serialize)] pub struct Channel { pub id: UBigInt, diff --git a/server-api/db/src/common.rs b/server-api/db/src/common.rs index 22669bd..5c0d891 100644 --- a/server-api/db/src/common.rs +++ b/server-api/db/src/common.rs @@ -15,6 +15,11 @@ macro_rules! no_conn { macro_rules! sql_err { ($spec:literal) => { format!("[ SQL Error ] : {}", $spec) + }; + + // Using this mostly to pull in sql err types from lib to outside world for logging + ($exp:expr) => { + format!("[ SQL Error ] : {}", $exp) } }