Clean up code

Author: Albert Lai

deps.edn

@@ -13,9 +13,9 @@
                         "-O" "-enable-all-security-services"
                         "-O" "-initialize-at-run-time=org.postgresql.sspi.SSPIClient"]}}
  :deps {org.clojure/clojure {:mvn/version "1.9.0"}
-        duct/migrator.ragtime {:git/url "https://github.com/zerg000000/migrator.ragtime.git" :sha "dba95e5b5645e4cd1e81b1d0a316cfccdc899016"}
+        duct/migrator.ragtime {:git/url "https://github.com/zerg000000/migrator.ragtime.git" :sha "1562879f4e3173d755717b6fed9aad21e9dc7513"}
         duct/core {:mvn/version "0.8.0"}
         org.postgresql/postgresql {:mvn/version "42.2.8"}
         ragtime/jdbc {:git/url "https://github.com/zerg000000/ragtime.git" :deps/root "jdbc" :sha "81033b3520c026ea0504e8adb6dbed1640a060f6"}
         cli-matic {:mvn/version "0.3.9"
-                   :exclusions [org.clojure/spec.alpha]}}}
+                   :exclusions [org.clojure/spec.alpha]}}}

src/ragtime/cli/core.clj

@@ -4,7 +4,6 @@
             [ragtime.reporter :as reporter]
             [ragtime.jdbc :as jdbc]
             [ragtime.protocols :as p]
-            [duct.core.resource]
             [duct.migrator.ragtime :as migrator]
             [clojure.pprint :as pp]))
 
@@ -33,8 +32,8 @@
 (defmulti info (fn [{:keys [mode]}] mode))
 
 (defmethod info :default
-  [{:keys [migrations] :as opts}]
-  (let [applied-migrations (p/applied-migration-ids (get-database opts))
+  [{:keys [database migrations] :as opts}]
+  (let [applied-migrations (p/applied-migration-ids database)
         list (map (fn [idx applied-id mig]
                     {:idx idx
                      :migration-id (when mig (p/id mig))
@@ -52,16 +51,16 @@
                           mode))
 
 (defmethod migrate-all :default
-  [{:keys [migrations] :as opts}]
-  (ragtime/migrate-all (get-database opts) {} migrations opts))
+  [{:keys [database migrations] :as opts}]
+  (ragtime/migrate-all database (ragtime/into-index migrations) migrations opts))
 
 (defmethod rollback-to :default
-  [{:keys [migration-id migrations] :as opts}]
-  (ragtime/rollback-to (get-database opts) (ragtime/into-index migrations) migration-id opts))
+  [{:keys [database migration-id migrations] :as opts}]
+  (ragtime/rollback-to database (ragtime/into-index migrations) migration-id opts))
 
 (defmethod rollback-last :default
-  [{:keys [last-n migrations] :as opts}]
-  (ragtime/rollback-last (get-database opts) (ragtime/into-index migrations) last-n opts))
+  [{:keys [last-n migrations database] :as opts}]
+  (ragtime/rollback-last database (ragtime/into-index migrations) last-n opts))
 
 
 (extend-protocol migrator/StringSource

src/ragtime/cli/dir.clj

@@ -6,8 +6,8 @@
 (defmethod cc/prepare-options :dir
   [{:keys [database-url strategy resources-dir reporter] :as ins}]
   (let [migrations (jdbc/load-directory resources-dir)
-        opts {:database {:spec {:connection-uri database-url}}
+        opts {:database (cc/get-database (assoc ins :database {:spec {:connection-uri database-url}}))
               :strategy (cc/get-strategy strategy)
               :reporter (cc/get-reporter reporter)
               :migrations migrations}]
-    (merge ins opts)))
+    (merge ins opts)))

src/ragtime/cli/duct.clj

@@ -7,13 +7,6 @@
 
 (duct/load-hierarchy)
 
-(defn- migrate [index {:keys [migrations] :as opts}]
-  (let [db    (cc/get-database opts)
-        strat (cc/get-strategy opts)
-        rep   (:reporter opts)]
-    (ragtime/migrate-all db index migrations {:reporter rep, :strategy strat})
-    (ragtime/into-index index migrations)))
-
 (defn get-config [config-file resources-dir]
   (duct/read-config (io/file config-file)
                     {'duct/resource (fn [f] (io/file (str resources-dir f)))}))
@@ -28,7 +21,7 @@
           {} config))
 
 (defmethod cc/prepare-options :duct
-  [{:keys [database-url config-file resources-dir reporter] :as ins}]
+  [{:keys [database-url config-file resources-dir reporter strategy] :as ins}]
   (let [raw-config (get-config config-file resources-dir)
         migration-order (get-in raw-config [:duct.profile/base :duct.migrator/ragtime :migrations])
         config (-> raw-config
@@ -37,12 +30,9 @@
                    (ig/init [:duct.migrator.ragtime/sql]))]
     (merge
       ins
-      {:database {:spec {:connection-uri database-url}}
+      {:database (cc/get-database (assoc ins :database {:spec {:connection-uri database-url}}))
+       :strategy (cc/get-strategy strategy)
        :reporter (cc/get-reporter reporter)
-       :migrations (map (fn [{:keys [key]}]
-                            (get config [:duct.migrator.ragtime/sql key]))
+       :migrations (mapv (fn [{:keys [key]}]
+                           (get config [:duct.migrator.ragtime/sql key]))
                      migration-order)})))
-
-(defmethod cc/migrate-all :duct
-  [opts]
-  (migrate {} opts))