From 6bb34b9b649ac798bb70b9b0fb1a7215bd88b73f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 19:42:07 +0300
Subject: [PATCH] Upgrade 'bson' crate to 2.0 version (#932, #979)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kai Ren <tyranron@gmail.com>
Co-authored-by: Grant Perry <grant42perry@gmail.com>
---
juniper/CHANGELOG.md | 1 +
juniper/Cargo.toml | 5 ++++-
juniper/src/integrations/bson.rs | 37 ++++++++++++++++----------------
3 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md
index eb0829b9..60a90088 100644
--- a/juniper/CHANGELOG.md
+++ b/juniper/CHANGELOG.md
@@ -4,6 +4,7 @@
- `#[graphql_object]` and `#[graphql_subscription]` macros expansion now preserves defined `impl` blocks "as is" and reuses defined methods in opaque way. ([#971](https://github.com/graphql-rust/juniper/pull/971)
- `rename = "<policy>"` attribute's argument renamed to `rename_all = "<policy>"`. ([#971](https://github.com/graphql-rust/juniper/pull/971)
+- Upgrade `bson` feature to [2.0 version of its crate](https://github.com/mongodb/bson-rust/releases/tag/v2.0.0). ([#979](https://github.com/graphql-rust/juniper/pull/979)
## Features
diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
index 0501aea3..94facab4 100644
--- a/juniper/Cargo.toml
+++ b/juniper/Cargo.toml
@@ -36,7 +36,7 @@ juniper_codegen = { version = "0.15.7", path = "../juniper_codegen" }
anyhow = { version = "1.0.32", optional = true, default-features = false }
async-trait = "0.1.39"
-bson = { version = "1.0", optional = true }
+bson = { version = "2.0", features = ["chrono-0_4"], optional = true }
chrono = { version = "0.4", default-features = false, optional = true }
chrono-tz = { version = "0.5", default-features = false, optional = true }
fnv = "1.0.3"
@@ -51,6 +51,9 @@ static_assertions = "1.1"
url = { version = "2.0", optional = true }
uuid = { version = "0.8", default-features = false, optional = true }
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { version = "0.2", features = ["js"] }
+
[dev-dependencies]
bencher = "0.1.2"
pretty_assertions = "0.7.1"
diff --git a/juniper/src/integrations/bson.rs b/juniper/src/integrations/bson.rs
index 95d83382..e11c752d 100644
--- a/juniper/src/integrations/bson.rs
+++ b/juniper/src/integrations/bson.rs
@@ -4,12 +4,13 @@ use bson::{oid::ObjectId, DateTime as UtcDateTime};
use chrono::prelude::*;
use crate::{
+ graphql_scalar,
parser::{ParseError, ScalarToken, Token},
value::ParseScalarResult,
Value,
};
-#[crate::graphql_scalar(description = "ObjectId")]
+#[graphql_scalar(description = "ObjectId")]
impl<S> GraphQLScalar for ObjectId
where
S: ScalarValue,
@@ -19,37 +20,36 @@ where
}
fn from_input_value(v: &InputValue) -> Option<ObjectId> {
- v.as_string_value()
- .and_then(|s| ObjectId::with_string(s).ok())
+ v.as_string_value().and_then(|s| Self::parse_str(s).ok())
}
fn from_str<'a>(value: ScalarToken<'a>) -> ParseScalarResult<'a, S> {
- if let ScalarToken::String(value) = value {
- Ok(S::from(value.to_owned()))
+ if let ScalarToken::String(val) = value {
+ Ok(S::from(val.to_owned()))
} else {
Err(ParseError::UnexpectedToken(Token::Scalar(value)))
}
}
}
-#[crate::graphql_scalar(description = "UtcDateTime")]
+#[graphql_scalar(description = "UtcDateTime")]
impl<S> GraphQLScalar for UtcDateTime
where
S: ScalarValue,
{
fn resolve(&self) -> Value {
- Value::scalar((*self).to_rfc3339())
+ Value::scalar((*self).to_chrono().to_rfc3339())
}
fn from_input_value(v: &InputValue) -> Option<UtcDateTime> {
v.as_string_value()
.and_then(|s| (s.parse::<DateTime<Utc>>().ok()))
- .map(UtcDateTime)
+ .map(Self::from_chrono)
}
fn from_str<'a>(value: ScalarToken<'a>) -> ParseScalarResult<'a, S> {
- if let ScalarToken::String(value) = value {
- Ok(S::from(value.to_owned()))
+ if let ScalarToken::String(val) = value {
+ Ok(S::from(val.to_owned()))
} else {
Err(ParseError::UnexpectedToken(Token::Scalar(value)))
}
@@ -58,17 +58,18 @@ where
#[cfg(test)]
mod test {
- use crate::{value::DefaultScalarValue, InputValue};
use bson::{oid::ObjectId, DateTime as UtcDateTime};
- use chrono::prelude::*;
+ use chrono::{DateTime, Utc};
+
+ use crate::{value::DefaultScalarValue, FromInputValue, InputValue};
#[test]
fn objectid_from_input_value() {
let raw = "53e37d08776f724e42000000";
- let input: InputValue<DefaultScalarValue> = InputValue::scalar(raw.to_string());
+ let input = InputValue::<DefaultScalarValue>::scalar(raw.to_string());
- let parsed: ObjectId = crate::FromInputValue::from_input_value(&input).unwrap();
- let id = ObjectId::with_string(raw).unwrap();
+ let parsed: ObjectId = FromInputValue::from_input_value(&input).unwrap();
+ let id = ObjectId::parse_str(raw).unwrap();
assert_eq!(parsed, id);
}
@@ -76,10 +77,10 @@ mod test {
#[test]
fn utcdatetime_from_input_value() {
let raw = "2020-03-23T17:38:32.446+00:00";
- let input: InputValue<DefaultScalarValue> = InputValue::scalar(raw.to_string());
+ let input = InputValue::<DefaultScalarValue>::scalar(raw.to_string());
- let parsed: UtcDateTime = crate::FromInputValue::from_input_value(&input).unwrap();
- let date_time = UtcDateTime(
+ let parsed: UtcDateTime = FromInputValue::from_input_value(&input).unwrap();
+ let date_time = UtcDateTime::from_chrono(
DateTime::parse_from_rfc3339(raw)
.unwrap()
.with_timezone(&Utc),