From cd439fe4df2dcca8b2f8e973aa15fbc21114c97d Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Thu, 27 May 2021 02:35:34 +0800 Subject: [PATCH] Rename feature --- src/connector/mod.rs | 4 ++-- src/connector/select.rs | 6 +++--- src/query/result.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/connector/mod.rs b/src/connector/mod.rs index 664e1665..c05a9630 100644 --- a/src/connector/mod.rs +++ b/src/connector/mod.rs @@ -1,11 +1,11 @@ mod executor; mod select; -#[cfg(feature = "serialize-query-result")] +#[cfg(feature = "with-json")] mod select_json; pub use executor::*; pub use select::*; -#[cfg(feature = "serialize-query-result")] +#[cfg(feature = "with-json")] pub use select_json::*; use crate::{DatabaseConnection, QueryResult, Statement, TypeErr}; diff --git a/src/connector/select.rs b/src/connector/select.rs index 099f77c5..6ce2aa22 100644 --- a/src/connector/select.rs +++ b/src/connector/select.rs @@ -5,7 +5,7 @@ use crate::{ use sea_query::{QueryBuilder, SelectStatement}; use std::marker::PhantomData; -#[cfg(feature = "serialize-query-result")] +#[cfg(feature = "with-json")] use super::select_json::{SelectJson, SelectTwoJson}; #[derive(Clone, Debug)] @@ -41,7 +41,7 @@ where } } - #[cfg(feature = "serialize-query-result")] + #[cfg(feature = "with-json")] pub fn as_json(self) -> SelectJson { SelectJson { query: self.query, @@ -73,7 +73,7 @@ where } } - #[cfg(feature = "serialize-query-result")] + #[cfg(feature = "with-json")] pub fn as_json(self) -> SelectTwoJson { SelectTwoJson { query: self.query, diff --git a/src/query/result.rs b/src/query/result.rs index 750a7e33..dc3f9881 100644 --- a/src/query/result.rs +++ b/src/query/result.rs @@ -76,7 +76,7 @@ impl QueryResult { T::try_get(self, pre, col) } - #[cfg(feature = "serialize-query-result")] + #[cfg(feature = "with-json")] pub fn as_json(&self, pre: &str) -> Result { use serde_json::{Value, Map, json}; match &self.row {