Skip to content

Commit

Permalink
fix: fix validate db test
Browse files Browse the repository at this point in the history
  • Loading branch information
RCmerci committed Dec 2, 2024
1 parent fbe8d23 commit d2c877b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
6 changes: 2 additions & 4 deletions deps/db/script/validate_client_db.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
"Validate datascript db as a vec of entity maps"
[db ent-maps* {:keys [verbose group-errors humanize closed-maps]}]
(let [ent-maps (db-malli-schema/update-properties-in-ents db ent-maps*)
schema (db-validate/update-schema db-malli-schema/DB db {:closed-schema? closed-maps})]
(if-let [explanation (->> ent-maps
(m/explain schema)
not-empty)]
explainer (db-validate/get-schema-explainer closed-maps)]
(if-let [explanation (->> ent-maps explainer not-empty)]
(do
(if group-errors
(let [ent-errors (db-validate/group-errors-by-entity db ent-maps (:errors explanation))]
Expand Down
7 changes: 4 additions & 3 deletions deps/db/src/logseq/db/frontend/validate.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
(def ^:private closed-db-schema-validator (m/validator (mu/closed-schema db-malli-schema/DB)))
(def ^:private closed-db-schema-explainer (m/explainer (mu/closed-schema db-malli-schema/DB)))

(defn- get-schema-validator
(defn get-schema-validator
[closed-schema?]
(if closed-schema? closed-db-schema-validator db-schema-validator))

(defn- get-schema-explainer
(defn get-schema-explainer
[closed-schema?]
(if closed-schema? closed-db-schema-explainer db-schema-explainer))

Expand Down Expand Up @@ -117,7 +117,8 @@
;; Remove some UI interactions adding this e.g. import
#(dissoc % :block.temp/fully-loaded?)
(db-malli-schema/update-properties-in-ents db ent-maps*))
errors (-> ent-maps closed-db-schema-explainer :errors)]
errors (binding [db-malli-schema/*db-for-validate-fns* db]
(-> ent-maps closed-db-schema-explainer :errors))]
(cond-> {:datom-count (count datoms)
:entities ent-maps}
(some? errors)
Expand Down

0 comments on commit d2c877b

Please sign in to comment.