Tienson Qin 10 months ago
parent
commit
fc06cbc33c
2 changed files with 9 additions and 2 deletions
  1. 3 1
      deps/db/src/logseq/db/common/sqlite.cljs
  2. 6 1
      src/main/frontend/db/restore.cljs

+ 3 - 1
deps/db/src/logseq/db/common/sqlite.cljs

@@ -330,7 +330,9 @@
                       views
                       all-files
                       pages-datoms))]
-    {:schema schema
+    (prn :debug "db-graph?" db-graph?)
+    (prn :debug "block/journal-day schema" (str (:block/journal-day (:schema db))))
+    {:schema (assoc schema :block/journal-day {:db/index true})
      :initial-data data}))
 
 (defn restore-initial-data

+ 6 - 1
src/main/frontend/db/restore.cljs

@@ -4,6 +4,7 @@
             [frontend.db.conn :as db-conn]
             [frontend.persist-db :as persist-db]
             [frontend.state :as state]
+            [logseq.db :as ldb]
             [logseq.db.common.sqlite :as sqlite-common-db]
             [promesa.core :as p]))
 
@@ -14,10 +15,14 @@
   (p/let [start-time (t/now)
           {:keys [schema initial-data]} (persist-db/<fetch-init-data repo opts)
           ;; Without valid schema app fails hard downstream
-          _ (assert (some? schema) "No valid schema found when reloading db")
+          _ (when (nil? schema)
+              (throw (ex-info "No valid schema found when reloading db" {:repo repo})))
           conn (try
                  (sqlite-common-db/restore-initial-data initial-data schema)
                  (catch :default e
+                   (prn :error :restore-initial-data-failed
+                        (ldb/write-transit-str {:schema schema
+                                                :initial-data initial-data}))
                    (js/console.error e)
                    (throw e)))
           db-name (db-conn/get-repo-path repo)