From 0cd2b9db969cdf515ae46f939bdaee5a3a1edd4d Mon Sep 17 00:00:00 2001 From: Donovan Preston Date: Fri, 28 Feb 2020 15:42:28 -0500 Subject: [PATCH 1/2] fix: Fix #459 db-tests on master --- src/db/spanner/models.rs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/db/spanner/models.rs b/src/db/spanner/models.rs index eea21a24..6444962a 100644 --- a/src/db/spanner/models.rs +++ b/src/db/spanner/models.rs @@ -1855,16 +1855,35 @@ impl Db for SpannerDb { Box::pin(async move { db.get_bso_timestamp_async(param).map_err(Into::into).await }) } + #[cfg(not(any(test, feature = "db_test")))] fn put_bso(&self, param: params::PutBso) -> DbFuture { let db = self.clone(); Box::pin(async move { db.put_bso_async(param).map_err(Into::into).await }) } + #[cfg(any(test, feature = "db_test"))] + fn put_bso(&self, param: params::PutBso) -> DbFuture { + let db = self.clone(); + Box::pin(block(move || { + db.put_bso_sync(param).map_err(Into::into) + }).map_err(Into::into)) + } + + #[cfg(not(any(test, feature = "db_test")))] fn post_bsos(&self, param: params::PostBsos) -> DbFuture { let db = self.clone(); Box::pin(async move { db.post_bsos_async(param).map_err(Into::into).await }) } + #[cfg(any(test, feature = "db_test"))] + fn post_bsos(&self, param: params::PostBsos) -> DbFuture { + let db = self.clone(); + Box::pin(block(move || { + db.post_bsos_sync(param).map_err(Into::into) + }).map_err(Into::into)) + } + + fn validate_batch_id(&self, id: String) -> Result<()> { batch::validate_batch_id(&id) } From c4f49fca13899c54566258afb2ffaffd1b03c7b2 Mon Sep 17 00:00:00 2001 From: Donovan Preston Date: Fri, 28 Feb 2020 17:47:10 -0500 Subject: [PATCH 2/2] cargo fmt --- src/db/spanner/models.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/db/spanner/models.rs b/src/db/spanner/models.rs index 6444962a..bff5dd62 100644 --- a/src/db/spanner/models.rs +++ b/src/db/spanner/models.rs @@ -1864,9 +1864,7 @@ impl Db for SpannerDb { #[cfg(any(test, feature = "db_test"))] fn put_bso(&self, param: params::PutBso) -> DbFuture { let db = self.clone(); - Box::pin(block(move || { - db.put_bso_sync(param).map_err(Into::into) - }).map_err(Into::into)) + Box::pin(block(move || db.put_bso_sync(param).map_err(Into::into)).map_err(Into::into)) } #[cfg(not(any(test, feature = "db_test")))] @@ -1878,12 +1876,9 @@ impl Db for SpannerDb { #[cfg(any(test, feature = "db_test"))] fn post_bsos(&self, param: params::PostBsos) -> DbFuture { let db = self.clone(); - Box::pin(block(move || { - db.post_bsos_sync(param).map_err(Into::into) - }).map_err(Into::into)) + Box::pin(block(move || db.post_bsos_sync(param).map_err(Into::into)).map_err(Into::into)) } - fn validate_batch_id(&self, id: String) -> Result<()> { batch::validate_batch_id(&id) }