From 8897e5149d0d73fb89e065c6f89bf2d5bdf860da Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Sun, 6 Jul 2014 20:14:12 +1000
Subject: [PATCH] switch to using postgres in dev and test

---
 Gemfile             |  4 ----
 Gemfile.lock        |  2 --
 config/database.yml | 14 ++++++--------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 38b4a70ce..b18430504 100644
--- a/Gemfile
+++ b/Gemfile
@@ -117,10 +117,6 @@ gem 'omniauth-flickr', '>= 0.0.15'
 
 gem 'rake', '>= 10.0.0'
 
-group :development, :test do
-  gem 'sqlite3'                      # database engine
-end
-
 group :development, :test, :travis do
   gem 'haml-rails'                   # HTML templating language
   gem 'rspec-rails', '~> 2.12.1'     # unit testing framework
diff --git a/Gemfile.lock b/Gemfile.lock
index bd7b668bb..e2bd35b31 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -251,7 +251,6 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     therubyracer (0.12.1)
@@ -327,7 +326,6 @@ DEPENDENCIES
   rake (>= 10.0.0)
   rspec-rails (~> 2.12.1)
   sass-rails (~> 3.2.3)
-  sqlite3
   therubyracer (~> 0.12)
   twitter-bootstrap-rails!
   uglifier (>= 1.0.3)
diff --git a/config/database.yml b/config/database.yml
index 8dd0a9fba..10a2ea0e8 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,14 +1,12 @@
 development:
-  adapter: sqlite3
-  database: db/growstuff_dev.sqlite3
-  pool: 5
-  timeout: 5000
+  adapter: postgresql
+  database: growstuff_dev
+  host: localhost
 
 test:
-  adapter: sqlite3
-  database: db/growstuff_test.sqlite3
-  pool: 5
-  timeout: 5000
+  adapter: postgresql
+  database: growstuff_test
+  host: localhost
 
 # should be identical to test apart from running on postgres
 travis: