diff --git a/concatsql/Cargo.toml b/concatsql/Cargo.toml index 14eb0da..2cdc558 100644 --- a/concatsql/Cargo.toml +++ b/concatsql/Cargo.toml @@ -21,31 +21,31 @@ postgres = ["postgres-sys"] [dependencies] -indexmap = "1.6" +indexmap = "2.2.6" lazy_static = "1.4" -uuid = "0.8" +uuid = "1.8" chrono = "0.4" concatsql_macro = { version = "0.1.0", path = "../concatsql_macro" } [dependencies.sqlite3-sys] -version = "0.12" +version = "0.16" default-features = false optional = true [dependencies.mysql-sys] package = "mysql" -version = "20.0" +version = "20.1" optional = true [dependencies.postgres-sys] package = "postgres" -version = "0.18" +version = "0.19.7" optional = true -features = ["with-uuid-0_8"] +features = ["with-uuid-1"] [dev-dependencies] -temporary = "0.6" -uuid = { version = "0.8", features = ["v4"] } +temporary = "0.7" +uuid = { version = "1.8", features = ["v4"] } [package.metadata.docs.rs] all-features = true diff --git a/concatsql/src/postgres/connection.rs b/concatsql/src/postgres/connection.rs index 6c1df13..32751ab 100644 --- a/concatsql/src/postgres/connection.rs +++ b/concatsql/src/postgres/connection.rs @@ -155,7 +155,7 @@ impl GetToString for postgres::row::Row { } else if let Ok(value) = self.try_get::>(index) { Some(crate::parser::to_hex(&value)) } else if let Ok(value) = self.try_get::(index) { - Some(value.to_simple_ref().to_string()) + Some(value.simple().to_string()) } else if let Ok(value) = self.try_get::(index) { Some(value.to_string()) } else { diff --git a/concatsql/src/wrapstring.rs b/concatsql/src/wrapstring.rs index 79e5f00..7f94ae0 100644 --- a/concatsql/src/wrapstring.rs +++ b/concatsql/src/wrapstring.rs @@ -321,7 +321,7 @@ impl<'a> Add for WrapString<'a> { #[inline] fn add(mut self, other: Uuid) -> WrapString<'a> { self.query .push(None); - self.params.push(Value::Text(Cow::Owned(format!("{:X}", other.to_simple())))); + self.params.push(Value::Text(Cow::Owned(format!("{:X}", other.simple())))); self } } @@ -332,7 +332,7 @@ impl<'a> Add<&Uuid> for WrapString<'a> { #[inline] fn add(mut self, other: &Uuid) -> WrapString<'a> { self.query .push(None); - self.params.push(Value::Text(Cow::Owned(format!("{:X}", other.to_simple_ref())))); + self.params.push(Value::Text(Cow::Owned(format!("{:X}", other.simple())))); self } } diff --git a/concatsql_macro/Cargo.toml b/concatsql_macro/Cargo.toml index 298a8a7..b36acdd 100644 --- a/concatsql_macro/Cargo.toml +++ b/concatsql_macro/Cargo.toml @@ -16,7 +16,7 @@ proc-macro = true [dependencies] proc-macro2 = "1.0" proc-macro-error = "1.0" -syn = { version = "1.0", features = ["full", "extra-traits"] } +syn = { version = "2.0", features = ["full", "extra-traits"] } quote = "1.0" nom = "7"