not using namespaced keys, due to graphql
This commit is contained in:
@@ -16,18 +16,23 @@
|
||||
(fn [[k v]]
|
||||
[(keyword (snake->kebab (name k))) v])
|
||||
x))
|
||||
merged (merge kebabed (edn/read-string (:data kebabed)))]
|
||||
merged))
|
||||
([x namespace]
|
||||
(let [x (db->clj x)]
|
||||
(assign-namespace x namespace))))
|
||||
merged (if (:data kebabed)
|
||||
(update kebabed :data edn/read-string)
|
||||
kebabed)]
|
||||
merged)))
|
||||
|
||||
(defn clj->db [x]
|
||||
(into {}
|
||||
(map
|
||||
(fn [[k v]]
|
||||
[(keyword (kebab->snake (name k))) v])
|
||||
x)))
|
||||
(let [snaked (into {}
|
||||
(map
|
||||
(fn [[k v]]
|
||||
[(keyword (kebab->snake (name k))) v])
|
||||
x))
|
||||
unmerged (if (:data snaked)
|
||||
(update snaked :data pr-str)
|
||||
snaked)]
|
||||
unmerged))
|
||||
|
||||
|
||||
|
||||
(defn merge-data [{:keys [data] :as x}]
|
||||
(merge x (edn/read-string data)))
|
||||
@@ -44,14 +49,3 @@
|
||||
:user "ap"
|
||||
:password "fifteen-invoices-imported!"}))
|
||||
|
||||
|
||||
(defn assign-namespace [x n]
|
||||
(reduce-kv
|
||||
(fn [x k v]
|
||||
(assoc x (if (and (keyword? k)
|
||||
(not (qualified-keyword? k)))
|
||||
(keyword n (name k))
|
||||
k)
|
||||
v))
|
||||
{}
|
||||
x))
|
||||
|
||||
Reference in New Issue
Block a user