From 5f7319b903b712ad417460475bfbfeff1164121a Mon Sep 17 00:00:00 2001
From: Jari Bakken <jari.bakken@gmail.com>
Date: Thu, 23 Oct 2014 14:36:06 +0200
Subject: [PATCH] Simplify DB setup / migrations

---
 unleash-server/README.md                    | 32 ++++++++++-----------
 unleash-server/config/database.json.example |  3 --
 unleash-server/lib/eventDb.js               |  1 -
 unleash-server/package.json                 |  7 +----
 4 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 unleash-server/config/database.json.example

diff --git a/unleash-server/README.md b/unleash-server/README.md
index 8315332291..a4b85e074c 100644
--- a/unleash-server/README.md
+++ b/unleash-server/README.md
@@ -1,12 +1,25 @@
 # unleash-server [![Build Status](https://travis-ci.org/finn-no/unleash.svg?branch=master)](https://travis-ci.org/finn-no/unleash) [![Code Climate](https://codeclimate.com/github/finn-no/unleash/badges/gpa.svg)](https://codeclimate.com/github/finn-no/unleash)
 unleash-server is a place to ask for the status of features.
 
+### Create a local unleash-db on postgres
+´´´bash
+$ psql postgres <<SQL
+CREATE USER unleash_user WITH PASSWORD 'passord';
+CREATE DATABASE unleash;
+GRANT ALL PRIVILEGES ON DATABASE unleash to unleash_user;
+SQL
+´´´
+
+Then set up your DATABASE_URI env.var:
+```
+export DATABASE_URL=postgres://unleash_user:passord@localhost:5432/unleash
+```
+
 ## Important commands:
 
 ```
-// Set up DB
-cp config/database.example.json config/database.json
-npm run db-setup
+// Make sure DATABASE_URL is set and run migrations in your local DB
+db-migrate up
 
 // Start server in dev-mode:
 npm run start-dev
@@ -29,16 +42,3 @@ npm test
 4. Run `npm run db-migrate-up`.
 5. Generate LB artifact using `scripts/generate-liquibase-artifact` (TODO: make this internal)
 
-### Create a local unleash-db on postgres
-´´´bash
-$ psql postgres <<SQL
-CREATE USER unleash_user WITH PASSWORD 'passord';
-CREATE DATABASE unleash;
-GRANT ALL PRIVILEGES ON DATABASE unleash to unleash_user;
-SQL
-´´´
-
-Then set up your DATABASE_URI env.var:
-```
-export DATABASE_URL=postgres://unleash_user:passord@localhost:5432/unleash
-```
diff --git a/unleash-server/config/database.json.example b/unleash-server/config/database.json.example
deleted file mode 100644
index 66a4e79aee..0000000000
--- a/unleash-server/config/database.json.example
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "dev": "postgres://localhost:5432/unleash_dev"
-}
diff --git a/unleash-server/lib/eventDb.js b/unleash-server/lib/eventDb.js
index ce348cdd83..077d647995 100644
--- a/unleash-server/lib/eventDb.js
+++ b/unleash-server/lib/eventDb.js
@@ -13,7 +13,6 @@ function storeEvent(event) {
     });
 }
 
-
 module.exports = {
     store: storeEvent
 };
\ No newline at end of file
diff --git a/unleash-server/package.json b/unleash-server/package.json
index 470b56d4c1..a35fb3185c 100644
--- a/unleash-server/package.json
+++ b/unleash-server/package.json
@@ -21,12 +21,7 @@
         "start-dev": "NODE_ENV=local supervisor --ignore ./node_modules/,./public/js server.js",
         "test": "jshint server.js lib test && jsxhint public/js/*.jsx && mocha test test/*",
         "tdd": "mocha --watch test test/*",
-        "test-bamboo-ci": "mocha test test/*",
-        "db-create": "createdb unleash_${NODE_ENV:-dev}",
-        "db-drop": "dropdb unleash_${NODE_ENV:-dev}",
-        "db-migrate-up": "db-migrate --config config/database.json up",
-        "db-migrate-down": "db-migrate --config config/database.json down",
-        "db-setup": "npm run db-create; npm run db-migrate-up"
+        "test-bamboo-ci": "mocha test test/*"
     },
     "dependencies": {
         "any-db": "2.1.0",