caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak

Browse Source
This commit is contained in:
Chris Tsang 2021-05-27 15:19:15 +08:00
parent 97e6bb3433
commit 1613a57c19
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/connector/select.rs
View File

@ -1,6 +1,6 @@
use crate::query::combine;
use crate::{ 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 sea_query::{QueryBuilder, SelectStatement};
use std::marker::PhantomData; use std::marker::PhantomData;
@ -39,7 +39,7 @@ where
} }
#[cfg(feature = "with-json")] #[cfg(feature = "with-json")]
pub fn into_json(self) -> SelectModel<serde_json::Value> { pub fn into_json(self) -> SelectModel<JsonValue> {
SelectModel { SelectModel {
query: self.query, query: self.query,
model: PhantomData, model: PhantomData,
@ -72,7 +72,7 @@ where
} }
#[cfg(feature = "with-json")] #[cfg(feature = "with-json")]
pub fn into_json(self) -> SelectTwoModel<serde_json::Value, serde_json::Value> { pub fn into_json(self) -> SelectTwoModel<JsonValue, JsonValue> {
SelectTwoModel { SelectTwoModel {
query: self.query, query: self.query,
model: PhantomData, model: PhantomData,

7
src/query/json.rs
View File

@ -1,7 +1,8 @@
use crate::{FromQueryResult, QueryResult, QueryResultRow, TypeErr}; 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<Self, TypeErr> { fn from_query_result(res: &QueryResult, pre: &str) -> Result<Self, TypeErr> {
match &res.row { match &res.row {
QueryResultRow::SqlxMySql(row) => { QueryResultRow::SqlxMySql(row) => {
@ -35,7 +36,7 @@ impl FromQueryResult for Value {
match_mysql_type!(f64); match_mysql_type!(f64);
match_mysql_type!(String); match_mysql_type!(String);
} }
Ok(Value::Object(map)) Ok(JsonValue::Object(map))
} }
} }
} }