diff --git a/.gitignore b/.gitignore index f0fa30c..4cd63b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .bundle -db/*.sqlite3 +config/database.yml log/*.log tmp/ diff --git a/Gemfile b/Gemfile index f0a5684..051b696 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' gem 'rails', '3.0.9' -gem 'sqlite3' +gem 'pg' gem 'haml' diff --git a/Gemfile.lock b/Gemfile.lock index 41bbf54..dba9211 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,6 +79,7 @@ GEM treetop (~> 1.4.8) mime-types (1.16) nokogiri (1.5.0) + pg (0.11.0) polyglot (0.3.1) rack (1.2.2) rack-mount (0.6.14) @@ -123,7 +124,6 @@ GEM json_pure rubyzip spork (0.9.0.rc9) - sqlite3 (1.3.3) term-ansicolor (1.0.5) thor (0.14.6) treetop (1.4.9) @@ -145,8 +145,8 @@ DEPENDENCIES guard-rspec guard-spork haml + pg rails (= 3.0.9) rb-inotify rspec-rails spork (~> 0.9.0.rc) - sqlite3 diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 742c84b..0000000 --- a/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: &test - adapter: sqlite3 - database: ':memory:' - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 - -cucumber: - <<: *test diff --git a/config/database.yml.sample b/config/database.yml.sample new file mode 100644 index 0000000..fc30582 --- /dev/null +++ b/config/database.yml.sample @@ -0,0 +1,20 @@ +common: &common + adapter: postgresql + encoding: unicode + pool: 5 + username: scube + +development: + <<: *common + database: scube_development + +test: &test + <<: *common + database: scube_test + +production: + <<: *common + database: scube_production + +cucumber: + <<: *test