Added fixes suggested by augustus and got the test to pass

oxidecomputer · Sep 26, 2022 · bcd77ba · bcd77ba
1 parent c7d1d7a
commit bcd77ba
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 85 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,6 +30,7 @@ anyhow = "1"
 async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel.git", rev = "7944dafc8a36dc6e20a1405eca59d04662de2bb7" }
 async-trait = "^0.1.57"
 base64 = "0.13.0"
+bb8 = "0.8.0"
 bytes = "1"
 checkr = "^0.0.10"
 chrono = { version = "^0.4.20", features = ["serde"] }
@@ -38,7 +39,7 @@ chrono-tz = { version = "0.6", features = ["serde"] }
 cio-api = { path = "cio" }
 cio-api-types = { path = "cio-api-types" }
 cloudflare = "^0.9.1"
-diesel = { git = "https://github.com/diesel-rs/diesel", rev = "99d0b05" }
+diesel = { version = "2.0.0" }
 docusign = "^0.1.0"
 dropshot = { git = "https://github.com/oxidecomputer/dropshot" }
 dropshot-verify-request = { path = "dropshot-verify-request" }

diff --git a/cio/Cargo.toml b/cio/Cargo.toml
@@ -21,7 +21,7 @@ async-bb8-diesel = { workspace = true }
 async-trait= { workspace = true }
 barcoders = { version = "1.0.2", features = ["image", "ascii", "svg", "json"]}
 base64 = { workspace = true }
-bb8 = "^0.7.1"
+bb8 = { workspace = true }
 byte-unit = "4"
 checkr = { workspace = true }
 #checkr = { path = "../checkr" }

diff --git a/cio/src/configs.rs b/cio/src/configs.rs
@@ -136,7 +136,7 @@ impl fmt::Display for ExternalServices {
 }
 
 impl ToSql<VarChar, Pg> for ExternalServices {
-    fn to_sql<W: std::io::Write>(&self, out: &mut Output<Pg>) -> serialize::Result {
+    fn to_sql(&self, out: &mut Output<Pg>) -> serialize::Result {
         <str as ToSql<VarChar, Pg>>::to_sql(self.as_str(), out)
     }
 }
@@ -1568,7 +1568,7 @@ impl ResourceCategory {
 }
 
 impl ToSql<VarChar, Pg> for ResourceCategory {
-    fn to_sql<W: std::io::Write>(&self, out: &mut Output<Pg>) -> serialize::Result {
+    fn to_sql(&self, out: &mut Output<Pg>) -> serialize::Result {
         <str as ToSql<VarChar, Pg>>::to_sql(self.as_str(), out)
     }
 }

diff --git a/diesel-sentry/src/lib.rs b/diesel-sentry/src/lib.rs
@@ -39,9 +39,6 @@ pub struct SentryConnection<C: Connection> {
     info: ConnectionInfo,
 }
 
-// Need this so that ConnectionManager can impl ManageConnection
-unsafe impl<C: Connection> Send for SentryConnection<C> {}
-
 impl<C: Connection> Deref for SentryConnection<C> {
     type Target = C;
     fn deref(&self) -> &Self::Target {