From 1b9c40b3c816fa51fd914072ff654d0828f345e7 Mon Sep 17 00:00:00 2001
From: Michael Freeborn <31806808+mfreeborn@users.noreply.github.com>
Date: Wed, 1 Jun 2022 00:58:11 +0100
Subject: [PATCH] fix serde_json usage in macros (#1842)

---
 sqlx-core/src/types/json.rs          | 4 ++--
 sqlx-core/src/types/mod.rs           | 2 +-
 sqlx-macros/src/database/mysql.rs    | 2 +-
 sqlx-macros/src/database/postgres.rs | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sqlx-core/src/types/json.rs b/sqlx-core/src/types/json.rs
index 11b29a09..f97b3369 100644
--- a/sqlx-core/src/types/json.rs
+++ b/sqlx-core/src/types/json.rs
@@ -1,8 +1,8 @@
 use std::ops::{Deref, DerefMut};
 
 use serde::{Deserialize, Serialize};
-use serde_json::value::RawValue as JsonRawValue;
-use serde_json::Value as JsonValue;
+pub use serde_json::value::RawValue as JsonRawValue;
+pub use serde_json::Value as JsonValue;
 
 use crate::database::{Database, HasArguments, HasValueRef};
 use crate::decode::Decode;
diff --git a/sqlx-core/src/types/mod.rs b/sqlx-core/src/types/mod.rs
index 2bf4e3b5..0610c67a 100644
--- a/sqlx-core/src/types/mod.rs
+++ b/sqlx-core/src/types/mod.rs
@@ -83,7 +83,7 @@ pub mod mac_address {
 }
 
 #[cfg(feature = "json")]
-pub use json::Json;
+pub use json::{Json, JsonRawValue, JsonValue};
 
 /// Indicates that a SQL type is supported for a database.
 ///
diff --git a/sqlx-macros/src/database/mysql.rs b/sqlx-macros/src/database/mysql.rs
index 0ef49fa7..b5504c32 100644
--- a/sqlx-macros/src/database/mysql.rs
+++ b/sqlx-macros/src/database/mysql.rs
@@ -51,7 +51,7 @@ impl_database_ext! {
         sqlx::types::Decimal,
 
         #[cfg(feature = "json")]
-        serde_json::Value,
+        sqlx::types::JsonValue,
     },
     ParamChecking::Weak,
     feature-types: info => info.__type_feature_gate(),
diff --git a/sqlx-macros/src/database/postgres.rs b/sqlx-macros/src/database/postgres.rs
index 83a84334..57335430 100644
--- a/sqlx-macros/src/database/postgres.rs
+++ b/sqlx-macros/src/database/postgres.rs
@@ -69,7 +69,7 @@ impl_database_ext! {
         sqlx::types::mac_address::MacAddress,
 
         #[cfg(feature = "json")]
-        serde_json::Value,
+        sqlx::types::JsonValue,
 
         #[cfg(feature = "bit-vec")]
         sqlx::types::BitVec,
@@ -128,7 +128,7 @@ impl_database_ext! {
         Vec<sqlx::types::mac_address::MacAddress> | &[sqlx::types::mac_address::MacAddress],
 
         #[cfg(feature = "json")]
-        Vec<serde_json::Value> | &[serde_json::Value],
+        Vec<sqlx::types::JsonValue> | &[sqlx::types::JsonValue],
 
         // Ranges