sort applied do read and empty sort check added #14

serayuzgur · May 10, 2017 · 4955152 · 4955152
1 parent e35c828
commit 4955152
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/database/query_api/sort.rs b/src/database/query_api/sort.rs
@@ -71,6 +71,9 @@ fn compare(a: &Map<String, Value>, b: &Map<String, Value>, sort_key: &String) ->
 
 /// sort on all desired fields fields according to the query api
 pub fn apply(obj: &mut Value, queries: &Queries) {
+    if queries.sort.len() == 0 {
+        return;
+    }
     if let &mut Value::Array(ref mut arr) = obj {
         let ref sorts = queries.sort;
         arr.sort_by(|a: &Value, b: &Value| {

diff --git a/src/database/read.rs b/src/database/read.rs
@@ -30,6 +30,7 @@ impl Database {
                     let clone = &mut obj.clone();
                     query_api::filter::apply(clone, &q);
                     query_api::q::apply(clone, &q);
+                    query_api::sort::apply(clone, &q);
                     return Ok(clone.clone());
                 }
                 return Ok(obj.clone());