itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-11-06 00:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(mysql): tweak JSON type so it accepts BINARY in addition to CHAR (and make tests pass in MySQL 5.5)

Browse Source
This commit is contained in:
Ryan Leckey 2020-06-10 00:40:30 -07:00
parent 6fcb520ac9
commit a2c55b9f31
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sqlx-core/src/mysql/types/json.rs
View File

@ -34,7 +34,9 @@ where
T: 'r + DeserializeOwned, T: 'r + DeserializeOwned,
{ {
fn accepts(ty: &MySqlTypeInfo) -> bool { fn accepts(ty: &MySqlTypeInfo) -> bool {
ty.r#type == ColumnType::Json || <&str as Decode<MySql>>::accepts(ty) ty.r#type == ColumnType::Json
|| <&str as Decode<MySql>>::accepts(ty)
|| <&[u8] as Decode<MySql>>::accepts(ty)
} }
fn decode(value: MySqlValueRef<'r>) -> Result<Self, BoxDynError> { fn decode(value: MySqlValueRef<'r>) -> Result<Self, BoxDynError> {

1
tests/mysql/mysql.rs
View File

@ -2,7 +2,6 @@ use futures::TryStreamExt;
use sqlx::mysql::{MySql, MySqlPool, MySqlRow}; use sqlx::mysql::{MySql, MySqlPool, MySqlRow};
use sqlx::{Connection, Executor, Row}; use sqlx::{Connection, Executor, Row};
use sqlx_test::new; use sqlx_test::new;
use std::env;
#[sqlx_macros::test] #[sqlx_macros::test]
async fn it_connects() -> anyhow::Result<()> { async fn it_connects() -> anyhow::Result<()> {

8
tests/mysql/types.rs
View File

@ -123,11 +123,11 @@ mod json_tests {
test_type!(json<JsonValue>( test_type!(json<JsonValue>(
MySql, MySql,
"SELECT CAST({0} AS JSON) <=> CAST(? AS JSON), CAST({0} AS JSON) as _2, ? as _3", "SELECT CAST({0} AS BINARY) <=> CAST(? AS BINARY), CAST({0} AS BINARY) as _2, ? as _3",
"'\"Hello, World\"'" == json!("Hello, World"), "'\"Hello, World\"'" == json!("Hello, World"),
"'\"😎\"'" == json!("😎"), "'\"😎\"'" == json!("😎"),
"'\"🙋‍♀️\"'" == json!("🙋‍♀️"), "'\"🙋‍♀️\"'" == json!("🙋‍♀️"),
"'[\"Hello\", \"World!\"]'" == json!(["Hello", "World!"]) "'[\"Hello\",\"World!\"]'" == json!(["Hello", "World!"])
)); ));
#[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq)] #[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq)]
@ -138,7 +138,7 @@ mod json_tests {
test_type!(json_struct<Json<Friend>>( test_type!(json_struct<Json<Friend>>(
MySql, MySql,
"SELECT CAST({0} AS JSON) <=> CAST(? AS JSON), CAST({0} AS JSON) as _2, ? as _3", "SELECT CAST({0} AS BINARY) <=> CAST(? AS BINARY), CAST({0} AS BINARY) as _2, ? as _3",
"\'{\"name\": \"Joe\", \"age\":33}\'" == Json(Friend { name: "Joe".to_string(), age: 33 }) "\'{\"name\":\"Joe\",\"age\":33}\'" == Json(Friend { name: "Joe".to_string(), age: 33 })
)); ));
} }