JBAS-837 initial sqitch data/sample-data stuff

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

diff --git a/KCLS/sql/data/deploy/no_op_initialization.sql b/KCLS/sql/data/deploy/no_op_initialization.sql
new file mode 100644 (file)
index 0000000..e15544e
--- /dev/null
+++ b/KCLS/sql/data/deploy/no_op_initialization.sql
@@ -0,0 +1,8 @@
+-- Deploy kcls-evergreen-data:no_op_initialization to pg
+-- requires: kcls-evergreen:KMAIN-1765-reingest-causing-false-browse-headings
+
+BEGIN;
+
+-- XXX Add DDLs here.
+
+COMMIT;

diff --git a/KCLS/sql/data/revert/no_op_initialization.sql b/KCLS/sql/data/revert/no_op_initialization.sql
new file mode 100644 (file)
index 0000000..31d9b3f
--- /dev/null
+++ b/KCLS/sql/data/revert/no_op_initialization.sql
@@ -0,0 +1,7 @@
+-- Revert kcls-evergreen-data:no_op_initialization from pg
+
+BEGIN;
+
+-- XXX Add DDLs here.
+
+COMMIT;

diff --git a/KCLS/sql/data/sqitch.conf b/KCLS/sql/data/sqitch.conf
new file mode 100644 (file)
index 0000000..35f49d7
--- /dev/null
+++ b/KCLS/sql/data/sqitch.conf
@@ -0,0 +1,16 @@
+[core]
+       engine = pg
+       # plan_file = sqitch.plan
+       # top_dir = .
+       # deploy_dir = deploy
+       # revert_dir = revert
+       # verify_dir = verify
+       # extension = sql
+[target "evergreen"]
+       uri = db:pg:evergreen
+[engine "pg"]
+       target = evergreen
+[deploy]
+    verify = true
+[rebase]
+    verify = true

diff --git a/KCLS/sql/data/sqitch.plan b/KCLS/sql/data/sqitch.plan
new file mode 100644 (file)
index 0000000..291d288
--- /dev/null
+++ b/KCLS/sql/data/sqitch.plan
@@ -0,0 +1,5 @@
+%syntax-version=1.0.0
+%project=kcls-evergreen-data
+
+
+no_op_initialization [kcls-evergreen:KMAIN-1765-reingest-causing-false-browse-headings] 2015-08-13T16:51:28Z Bill Erickson  <berickxx@gmail.com > # Start with a no-op target so other can depend on it

diff --git a/KCLS/sql/data/verify/no_op_initialization.sql b/KCLS/sql/data/verify/no_op_initialization.sql
new file mode 100644 (file)
index 0000000..02ba21d
--- /dev/null
+++ b/KCLS/sql/data/verify/no_op_initialization.sql
@@ -0,0 +1,7 @@
+-- Verify kcls-evergreen-data:no_op_initialization on pg
+
+BEGIN;
+
+-- XXX Add verifications here.
+
+ROLLBACK;

diff --git a/KCLS/sql/sample-data/deploy/no_op_initialization.sql b/KCLS/sql/sample-data/deploy/no_op_initialization.sql
deleted file mode 100644 (file)
index e15544e..0000000
--- a/KCLS/sql/sample-data/deploy/no_op_initialization.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- Deploy kcls-evergreen-data:no_op_initialization to pg
--- requires: kcls-evergreen:KMAIN-1765-reingest-causing-false-browse-headings
-
-BEGIN;
-
--- XXX Add DDLs here.
-
-COMMIT;

diff --git a/KCLS/sql/sample-data/revert/no_op_initialization.sql b/KCLS/sql/sample-data/revert/no_op_initialization.sql
deleted file mode 100644 (file)
index 31d9b3f..0000000
--- a/KCLS/sql/sample-data/revert/no_op_initialization.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Revert kcls-evergreen-data:no_op_initialization from pg
-
-BEGIN;
-
--- XXX Add DDLs here.
-
-COMMIT;

diff --git a/KCLS/sql/sample-data/sqitch.conf b/KCLS/sql/sample-data/sqitch.conf
deleted file mode 100644 (file)
index 35f49d7..0000000
--- a/KCLS/sql/sample-data/sqitch.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[core]
-       engine = pg
-       # plan_file = sqitch.plan
-       # top_dir = .
-       # deploy_dir = deploy
-       # revert_dir = revert
-       # verify_dir = verify
-       # extension = sql
-[target "evergreen"]
-       uri = db:pg:evergreen
-[engine "pg"]
-       target = evergreen
-[deploy]
-    verify = true
-[rebase]
-    verify = true

diff --git a/KCLS/sql/sample-data/sqitch.plan b/KCLS/sql/sample-data/sqitch.plan
deleted file mode 100644 (file)
index 291d288..0000000
--- a/KCLS/sql/sample-data/sqitch.plan
+++ /dev/null
@@ -1,5 +0,0 @@
-%syntax-version=1.0.0
-%project=kcls-evergreen-data
-
-
-no_op_initialization [kcls-evergreen:KMAIN-1765-reingest-causing-false-browse-headings] 2015-08-13T16:51:28Z Bill Erickson  <berickxx@gmail.com > # Start with a no-op target so other can depend on it

diff --git a/KCLS/sql/sample-data/tools/create-dev-db.sh b/KCLS/sql/sample-data/tools/create-dev-db.sh
index f920ee1..cf535f5 100755 (executable)
--- a/KCLS/sql/sample-data/tools/create-dev-db.sh
+++ b/KCLS/sql/sample-data/tools/create-dev-db.sh
@@ -22,11 +22,15 @@ echo $CREATE | sudo -u postgres psql
 
 PSQL="psql -h localhost -U evergreen -d evergreen"
 
-# deploy the schema via sqitch
-cd ../../sqitch
+# deploy the schema
+cd ../schema
 sqitch --db-user evergreen deploy
 cd $DIR
 
+# deploy sample data
+sqitch --db-user evergreen deploy
+
+
 # The remainder of the script inserts sample data
 
 $PSQL -f kcls-dev-db-export.sql

diff --git a/KCLS/sql/sample-data/verify/no_op_initialization.sql b/KCLS/sql/sample-data/verify/no_op_initialization.sql
deleted file mode 100644 (file)
index 02ba21d..0000000
--- a/KCLS/sql/sample-data/verify/no_op_initialization.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Verify kcls-evergreen-data:no_op_initialization on pg
-
-BEGIN;
-
--- XXX Add verifications here.
-
-ROLLBACK;