diff --git a/src/connector/select.rs b/src/connector/select.rs index 4db557de..627cb848 100644 --- a/src/connector/select.rs +++ b/src/connector/select.rs @@ -1,6 +1,6 @@ -use crate::query::combine; use crate::{ - Connection, Database, EntityTrait, FromQueryResult, QueryErr, Select, SelectTwo, Statement, + query::combine, Connection, Database, EntityTrait, FromQueryResult, JsonValue, QueryErr, + Select, SelectTwo, Statement, }; use sea_query::{QueryBuilder, SelectStatement}; use std::marker::PhantomData; @@ -39,7 +39,7 @@ where } #[cfg(feature = "with-json")] - pub fn into_json(self) -> SelectModel { + pub fn into_json(self) -> SelectModel { SelectModel { query: self.query, model: PhantomData, @@ -72,7 +72,7 @@ where } #[cfg(feature = "with-json")] - pub fn into_json(self) -> SelectTwoModel { + pub fn into_json(self) -> SelectTwoModel { SelectTwoModel { query: self.query, model: PhantomData, diff --git a/src/query/json.rs b/src/query/json.rs index 864ff93d..a6699745 100644 --- a/src/query/json.rs +++ b/src/query/json.rs @@ -1,7 +1,8 @@ use crate::{FromQueryResult, QueryResult, QueryResultRow, TypeErr}; -use serde_json::{json, Map, Value}; +pub use serde_json::Value as JsonValue; +use serde_json::{json, Map}; -impl FromQueryResult for Value { +impl FromQueryResult for JsonValue { fn from_query_result(res: &QueryResult, pre: &str) -> Result { match &res.row { QueryResultRow::SqlxMySql(row) => { @@ -35,7 +36,7 @@ impl FromQueryResult for Value { match_mysql_type!(f64); match_mysql_type!(String); } - Ok(Value::Object(map)) + Ok(JsonValue::Object(map)) } } }