Update Rust crate diesel to 2.2.2 (#6236)

Author: oxide-renovate[bot]

Cargo.lock

@@ -314,7 +314,8 @@ db-macros = { path = "nexus/db-macros" }
 debug-ignore = "1.0.5"
 derive_more = "0.99.18"
 derive-where = "1.2.7"
-diesel = { version = "2.1.6", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
+# Having the i-implement-... feature here makes diesel go away from the workspace-hack
+diesel = { version = "2.2.2", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", branch = "main" }
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }

Cargo.toml

@@ -307,7 +307,10 @@ impl FromSql<diesel::sql_types::Text, diesel::pg::Pg> for ArtifactHash {
     fn from_sql(
         bytes: diesel::pg::PgValue<'_>,
     ) -> diesel::deserialize::Result<Self> {
-        let s = String::from_sql(bytes)?;
+        let s =
+            <String as FromSql<diesel::sql_types::Text, diesel::pg::Pg>>::from_sql(
+                bytes,
+            )?;
         ExternalArtifactHash::from_str(&s)
             .map(ArtifactHash)
             .map_err(|e| e.into())

nexus/db-model/src/tuf_repo.rs

@@ -272,7 +272,7 @@ impl DataStore {
                         );
                     }
 
-                    sql_function!(fn random() -> diesel::sql_types::Float);
+                    define_sql_function!(fn random() -> diesel::sql_types::Float);
 
                     // We only actually care about one target here, so this
                     // query should have a `.limit(1)` attached. We fetch all

nexus/db-queries/src/db/datastore/sled.rs

@@ -41,7 +41,6 @@ crossbeam-utils = { version = "0.8.19" }
 crossterm = { version = "0.27.0", features = ["event-stream", "serde"] }
 crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] }
 der = { version = "0.7.9", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
-diesel = { version = "2.1.6", features = ["chrono", "i-implement-a-third-party-backend-and-opt-into-breaking-changes", "network-address", "postgres", "r2d2", "serde_json", "uuid"] }
 digest = { version = "0.10.7", features = ["mac", "oid", "std"] }
 either = { version = "1.13.0" }
 elliptic-curve = { version = "0.13.8", features = ["ecdh", "hazmat", "pem", "std"] }
@@ -65,7 +64,6 @@ hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.30", features = ["full"] }
 indexmap = { version = "2.3.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
-ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
@@ -147,7 +145,6 @@ crossbeam-utils = { version = "0.8.19" }
 crossterm = { version = "0.27.0", features = ["event-stream", "serde"] }
 crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] }
 der = { version = "0.7.9", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
-diesel = { version = "2.1.6", features = ["chrono", "i-implement-a-third-party-backend-and-opt-into-breaking-changes", "network-address", "postgres", "r2d2", "serde_json", "uuid"] }
 digest = { version = "0.10.7", features = ["mac", "oid", "std"] }
 either = { version = "1.13.0" }
 elliptic-curve = { version = "0.13.8", features = ["ecdh", "hazmat", "pem", "std"] }
@@ -171,7 +168,6 @@ hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.30", features = ["full"] }
 indexmap = { version = "2.3.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
-ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }