diff --git a/.gitignore b/.gitignore index 800086114..0d307089f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ !/log/.keep /tmp -/spec/examples.txt \ No newline at end of file +/spec/examples.txt +/config/database.yml \ No newline at end of file diff --git a/Gemfile b/Gemfile index da69551ab..653824110 100644 --- a/Gemfile +++ b/Gemfile @@ -35,6 +35,7 @@ gem 'acts-as-taggable-on' gem "responders" gem 'foundation-rails' gem 'acts_as_votable' +gem 'pg' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 601246774..badde51eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,6 +107,7 @@ GEM nokogiri (1.6.6.2) mini_portile (~> 0.6.0) orm_adapter (0.5.0) + pg (0.18.2) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -208,6 +209,7 @@ DEPENDENCIES foundation-rails jbuilder (~> 2.0) jquery-rails + pg rails (= 4.2.3) responders rspec-rails (~> 3.0) diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 1c1a37ca8..000000000 --- a/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 - 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 diff --git a/config/database.yml.example b/config/database.yml.example new file mode 100644 index 000000000..55b37c9c0 --- /dev/null +++ b/config/database.yml.example @@ -0,0 +1,15 @@ +default: &default + adapter: postgresql + encoding: unicode + database: participacion_development + host: localhost + pool: 5 + username: + password: + +development: + <<: *default + +test: + <<: *default + database: participacion_test \ No newline at end of file