sqitch config repairs and cleanup

* Use verify mode of "change" so that sqitch only ever rolls back the
  most recently failed update.

* Flesh out DB connection string to use 'evergreen' user by default

* Remove unneeded comments; replace tabs.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/sql/schema/sqitch.conf b/Open-ILS/src/sql/schema/sqitch.conf
index 68a5d36..f3ce043 100644 (file)
--- a/Open-ILS/src/sql/schema/sqitch.conf
+++ b/Open-ILS/src/sql/schema/sqitch.conf
@@ -1,16 +1,14 @@
 [core]
-       engine = pg
-       # plan_file = sqitch.plan
-       # top_dir = .
-       # deploy_dir = deploy
-       # revert_dir = revert
-       # verify_dir = verify
-       # extension = sql
+    engine = pg
 [target "evergreen"]
-       uri = db:pg:evergreen
+    # override at run time with --db-user and/or --db-host
+    uri = postgresql://evergreen@127.0.0.1/evergreen
 [engine "pg"]
-       target = evergreen
+    target = evergreen
 [deploy]
-       verify = true
+    verify = true
+    # only revert the last (failed) change by default.
+    # this helps avoid an unintended chain reaction of reverts.
+    mode = change
 [rebase]
-       verify = true
+    verify = true

diff --git a/Open-ILS/src/sql/test-data/sqitch.conf b/Open-ILS/src/sql/test-data/sqitch.conf
index 68a5d36..f3ce043 100644 (file)
--- a/Open-ILS/src/sql/test-data/sqitch.conf
+++ b/Open-ILS/src/sql/test-data/sqitch.conf
@@ -1,16 +1,14 @@
 [core]
-       engine = pg
-       # plan_file = sqitch.plan
-       # top_dir = .
-       # deploy_dir = deploy
-       # revert_dir = revert
-       # verify_dir = verify
-       # extension = sql
+    engine = pg
 [target "evergreen"]
-       uri = db:pg:evergreen
+    # override at run time with --db-user and/or --db-host
+    uri = postgresql://evergreen@127.0.0.1/evergreen
 [engine "pg"]
-       target = evergreen
+    target = evergreen
 [deploy]
-       verify = true
+    verify = true
+    # only revert the last (failed) change by default.
+    # this helps avoid an unintended chain reaction of reverts.
+    mode = change
 [rebase]
-       verify = true
+    verify = true