Ensure the database folder exists

Author: iwillig

src/clojure_skills/db/core.clj

@@ -2,12 +2,21 @@
   "Database connection management and operations."
   (:require
    [clojure-skills.config :as config]
-   [clojure-skills.db.migrate :as migrate]))
+   [clojure-skills.db.migrate :as migrate]
+   [clojure.java.io :as io]))
+
+(defn ensure-db-dir
+  "Ensure the directory containing the database file exists."
+  [db-path]
+  (let [db-file (io/file db-path)]
+    (when-let [parent (.getParentFile db-file)]
+      (when-not (.exists parent)
+        (.mkdirs parent)))))
 
 (defn get-db
   "Get database connection spec from config.
-  Returns a simple db-spec map that next.jdbc can use directly.
-  Foreign keys are enabled for SQLite to support CASCADE deletes."
+   Returns a simple db-spec map that next.jdbc can use directly.
+   Foreign keys are enabled for SQLite to support CASCADE deletes."
   ([]
    (get-db (config/load-config)))
   ([config]
@@ -22,5 +31,8 @@
   ([db]
    (migrate/migrate-db db))
   ([]
-   (let [db (get-db)]
-     (init-db db))))
+   (let [config (config/load-config)
+         db-path (config/get-db-path config)]
+     (ensure-db-dir db-path)
+     (let [db (get-db config)]
+       (init-db db)))))

test/clojure_skills/cli_db_test.clj

@@ -41,8 +41,8 @@
                                   ["SELECT name FROM sqlite_master WHERE type='table'"])
             table-names (set (map :sqlite_master/name tables))]
         (testing "Then: the set should contain the tables created by migrations"
-          (is (contains? table-names "skills") "Skills table exists")
-          (is (contains? table-names "prompts") "Prompts table exists"))))))
+          (is (contains? table-names "skills"))
+          (is (contains? table-names "prompts")))))))
 
 ;; Tests for db init command
 (deftest db-init-command-test
@@ -162,8 +162,9 @@
         ;; 3. Stats
         (let [{:keys [output]} (capture-output #(cli/cmd-stats {}))
               parsed (tu/parse-json-output output)]
-          (is (= "stats" (:type parsed)))
-          (is (map? (:database parsed))))
+          (is (match? {:type "stats"
+                       :database map?}
+                      parsed)))
 
         ;; 4. Reset
         (let [{:keys [output]} (capture-output #(cli/cmd-reset-db {:force true}))]
@@ -180,12 +181,10 @@
       (with-redefs [cli/load-config-and-db mock-load-config-and-db]
         (testing "When: We request database statistics"
           (let [{:keys [output]} (capture-output #(cli/cmd-stats {}))
-                parsed (tu/parse-json-output output)
-                config (:configuration parsed)]
+                parsed (tu/parse-json-output output)]
             (testing "Then: Configuration should include config file paths"
-              (is (contains? config :config-file-path) "config-file-path is present")
-              (is (string? (:config-file-path config)) "config-file-path is a string")
-              (is (contains? config :project-config-path) "project-config-path is present")
-              (is (string? (:project-config-path config)) "project-config-path is a string")
-              (is (contains? config :database-path) "database-path is present")
-              (is (string? (:database-path config)) "database-path is a string"))))))))
+              (is (match? {:type "stats"
+                           :configuration {:config-file-path string?
+                                           :project-config-path string?
+                                           :database-path string?}}
+                          parsed)))))))))