Merge branch 'launchbadge:main' into feat/json-any

Author: JosiahParry

.github/workflows/sqlx.yml

@@ -181,7 +181,7 @@ jobs:
       - run: >
           cargo build
           --no-default-features
-          --test ${{ matrix.linking }}-macros
+          --test sqlite-macros
           --features any,macros,${{ matrix.linking }},_unstable-all-types,runtime-${{ matrix.runtime }}
         env:
           SQLX_OFFLINE: true
@@ -193,7 +193,7 @@ jobs:
       - run: >
           cargo test
           --no-default-features
-          --test ${{ matrix.linking }}-macros
+          --test sqlite-macros
           --features any,macros,${{ matrix.linking }},_unstable-all-types,runtime-${{ matrix.runtime }}
         env:
           DATABASE_URL: sqlite://tests/sqlite/sqlite.db

Cargo.toml

@@ -392,12 +392,7 @@ required-features = ["sqlite"]
 [[test]]
 name = "sqlite-macros"
 path = "tests/sqlite/macros.rs"
-required-features = ["sqlite", "macros"]
-
-[[test]]
-name = "sqlite-unbundled-macros"
-path = "tests/sqlite/macros.rs"
-required-features = ["sqlite-unbundled", "macros"]
+required-features = ["_sqlite", "macros"]
 
 [[test]]
 name = "sqlite-derives"

sqlx-core/src/types/json.rs

@@ -196,8 +196,59 @@ where
     }
 }
 
-// We don't have to implement Encode for JsonRawValue because that's covered by the default
-// implementation for Encode
+impl<DB> Type<DB> for Box<JsonRawValue>
+where
+    for<'a> Json<&'a Self>: Type<DB>,
+    DB: Database,
+{
+    fn type_info() -> DB::TypeInfo {
+        <Json<&Self> as Type<DB>>::type_info()
+    }
+
+    fn compatible(ty: &DB::TypeInfo) -> bool {
+        <Json<&Self> as Type<DB>>::compatible(ty)
+    }
+}
+
+impl<'q, DB> Encode<'q, DB> for JsonRawValue
+where
+    for<'a> Json<&'a Self>: Encode<'q, DB>,
+    DB: Database,
+{
+    fn encode_by_ref(
+        &self,
+        buf: &mut <DB as Database>::ArgumentBuffer<'q>,
+    ) -> Result<IsNull, BoxDynError> {
+        <Json<&Self> as Encode<'q, DB>>::encode(Json(self), buf)
+    }
+}
+
+impl<'q, DB> Encode<'q, DB> for &'q JsonRawValue
+where
+    for<'a> Json<&'a Self>: Encode<'q, DB>,
+    DB: Database,
+{
+    fn encode_by_ref(
+        &self,
+        buf: &mut <DB as Database>::ArgumentBuffer<'q>,
+    ) -> Result<IsNull, BoxDynError> {
+        <Json<&Self> as Encode<'q, DB>>::encode(Json(self), buf)
+    }
+}
+
+impl<'q, DB> Encode<'q, DB> for Box<JsonRawValue>
+where
+    for<'a> Json<&'a Self>: Encode<'q, DB>,
+    DB: Database,
+{
+    fn encode_by_ref(
+        &self,
+        buf: &mut <DB as Database>::ArgumentBuffer<'q>,
+    ) -> Result<IsNull, BoxDynError> {
+        <Json<&Self> as Encode<'q, DB>>::encode(Json(self), buf)
+    }
+}
+
 impl<'r, DB> Decode<'r, DB> for &'r JsonRawValue
 where
     Json<Self>: Decode<'r, DB>,
@@ -207,3 +258,13 @@ where
         <Json<Self> as Decode<DB>>::decode(value).map(|item| item.0)
     }
 }
+
+impl<'r, DB> Decode<'r, DB> for Box<JsonRawValue>
+where
+    Json<Self>: Decode<'r, DB>,
+    DB: Database,
+{
+    fn decode(value: <DB as Database>::ValueRef<'r>) -> Result<Self, BoxDynError> {
+        <Json<Self> as Decode<DB>>::decode(value).map(|item| item.0)
+    }
+}

tests/postgres/types.rs

@@ -468,7 +468,9 @@ mod json {
             .await?;
 
         let value: &JsonRawValue = row.try_get(0)?;
+        assert_eq!(value.get(), "{\"hello\": \"world\"}");
 
+        let value: Box<JsonRawValue> = row.try_get(0)?;
         assert_eq!(value.get(), "{\"hello\": \"world\"}");
 
         // prepared, binary API
@@ -477,7 +479,9 @@ mod json {
             .await?;
 
         let value: &JsonRawValue = row.try_get(0)?;
+        assert_eq!(value.get(), "{\"hello\": \"world\"}");
 
+        let value: Box<JsonRawValue> = row.try_get(0)?;
         assert_eq!(value.get(), "{\"hello\": \"world\"}");
 
         Ok(())