Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump dependencies #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump dependencies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
:url "https://github.com/weavejester/duct-ragtime-component"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.7.0"]
[com.stuartsierra/component "0.3.1"]
[ragtime "0.6.0"]]
:dependencies [[org.clojure/clojure "1.8.0"]
[com.stuartsierra/component "0.3.2"]
[ragtime "0.7.2"]]
:profiles
{:dev {:dependencies [[com.h2database/h2 "1.4.191"]
[org.clojure/java.jdbc "0.6.1"]]}})
{:dev {:dependencies [[com.h2database/h2 "1.4.196"]
[org.clojure/java.jdbc "0.7.3"]]}})
17 changes: 8 additions & 9 deletions src/duct/component/ragtime.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(:require [com.stuartsierra.component :as component]
[ragtime.core :as core]
[ragtime.jdbc :as jdbc]
[ragtime.repl :as repl]
[ragtime.reporter :as reporter]
[ragtime.strategy :as strategy]))

(defn reload
Expand All @@ -22,7 +22,7 @@

(def default-options
{:strategy strategy/raise-error
:reporter repl/default-reporter})
:reporter reporter/print})

(defn ragtime
"Create a Ragtime component for handling migrations. Expects a dependency :db
Expand All @@ -34,16 +34,16 @@
:strategy - the Ragtime strategy
(defaults to ragtime.strategy/raise-error)
:reporter - the reporter function
(defaults to ragtime.repl/default-reporter)"
(defaults to ragtime.reporter/print)"
[options]
{:pre [(contains? options :resource-path)]}
(map->Ragtime (merge default-options options)))

(defn migrate
"Migrates the dependent database to the latest migration."
[{:keys [datastore migrations strategy reporter]}]
(let [migrations (map #(repl/wrap-reporting % reporter) migrations)]
(core/migrate-all datastore {} migrations strategy)))
(core/migrate-all datastore {} migrations {:strategy strategy
:reporter reporter}))

(defn rollback
"Rolls the dependent database back to a specific migration ID, or by a fixed
Expand All @@ -52,8 +52,7 @@
([component]
(rollback component 1))
([{:keys [datastore migrations reporter]} amount-or-id]
(let [migrations (map #(repl/wrap-reporting % reporter) migrations)
index (core/into-index migrations)]
(let [index (core/into-index migrations)]
(if (integer? amount-or-id)
(core/rollback-last datastore index amount-or-id)
(core/rollback-to datastore index amount-or-id)))))
(core/rollback-last datastore index amount-or-id {:reporter reporter})
(core/rollback-to datastore index amount-or-id {:reporter reporter})))))