status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug: Can't set status with #\ (#1245) (#1252) 

* escape queries correctly when querying realm
* kill dead code
This commit is contained in:
Mike Jackson 2017-06-01 09:22:19 +02:00 committed by Roman Volosovskyi
parent 2c90faab86
commit 30ef161afa
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/status_im/data_store/realm/core.cljs
View File

@ -4,7 +4,8 @@
[status-im.data-store.realm.schemas.base.core :as base] [status-im.data-store.realm.schemas.base.core :as base]
[taoensso.timbre :as log] [taoensso.timbre :as log]
[status-im.utils.fs :as fs] [status-im.utils.fs :as fs]
[clojure.string :as str]) [clojure.string :as str]
[goog.string :as gstr])
(:refer-clojure :exclude [exists?])) (:refer-clojure :exclude [exists?]))
(def realm-class (js/require "realm")) (def realm-class (js/require "realm"))
@ -196,11 +197,6 @@
(js->clj res :keywordize-keys true)) (js->clj res :keywordize-keys true))
res))) res)))
(defn get-by-filter [realm schema-name filter]
(-> realm
(.objects (name schema-name))
(.filtered filter)))
(defn- get-schema-by-name [opts] (defn- get-schema-by-name [opts]
(->> opts (->> opts
(mapv (fn [{:keys [name] :as schema}] (mapv (fn [{:keys [name] :as schema}]
@ -219,7 +215,7 @@
(defmethod to-query :eq [schema schema-name _ field value] (defmethod to-query :eq [schema schema-name _ field value]
(let [value (to-string value) (let [value (to-string value)
field-type (field-type schema schema-name field) field-type (field-type schema schema-name field)
escaped-value (when value (str/replace (str value) #"\"" "\\\"")) escaped-value (when value (gstr/escapeString (str value)))
query (str (name field) "=" (if (= "string" (name field-type)) query (str (name field) "=" (if (= "string" (name field-type))
(str "\"" escaped-value "\"") (str "\"" escaped-value "\"")
value))] value))]