diff --git a/Gemfile b/Gemfile index d699750..982533d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.1.4' # Use sqlite3 as the database for Active Record -gem 'sqlite3' +# gem 'sqlite3' # Swappin' gem 'pg' # Use SCSS for stylesheets diff --git a/Gemfile.lock b/Gemfile.lock index db3a441..1ab1916 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,9 +82,9 @@ GEM sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0) - sdoc (0.4.0) - json (~> 1.8) - rdoc (~> 4.0, < 5.0) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -95,7 +95,6 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.9) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -104,7 +103,7 @@ GEM polyglot (>= 0.3.1) turbolinks (2.2.2) coffee-rails - tzinfo (1.2.1) + tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.5.3) execjs (>= 0.3.0) @@ -122,6 +121,5 @@ DEPENDENCIES sass-rails (~> 4.0.3) sdoc (~> 0.4.0) spring - sqlite3 turbolinks uglifier (>= 1.3.0) diff --git a/config/database.yml b/config/database.yml index 1c1a37c..966246f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,25 +1,16 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 +development: + adapter: postgresql + database: my_database_development + pool: 5 + timeout: 5000 +test: + adapter: postgresql + database: my_database_test pool: 5 timeout: 5000 -development: - <<: *default - database: db/development.sqlite3 - -# 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: - <<: *default - database: db/test.sqlite3 - production: - <<: *default - database: db/production.sqlite3 + adapter: postgresql + database: my_database_production + pool: 5 + timeout: 5000 \ No newline at end of file