From 98d52608a03f9c405f447a23b82bed635255aaab Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Fri, 16 Aug 2013 21:04:16 -0300 Subject: [PATCH] Removed the database configuration file and moved to one sample --- .gitignore | 2 ++ .travis.yml | 1 + config/database.yml | 28 ---------------------------- config/database.yml.sample | 28 ++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 config/database.yml create mode 100644 config/database.yml.sample diff --git a/.gitignore b/.gitignore index 8cbbb53..342b3a1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /tmp coverage + +database.yml diff --git a/.travis.yml b/.travis.yml index a625b06..f748098 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 2.0.0-p247 before_script: + - "cp config/database.yml.sample config/database.yml" - "rake db:migrate RAILS_ENV=test" notifications: diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 09cc85a..0000000 --- a/config/database.yml +++ /dev/null @@ -1,28 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem '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: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 - -cucumber: - <<: *test \ No newline at end of file diff --git a/config/database.yml.sample b/config/database.yml.sample new file mode 100644 index 0000000..09cc85a --- /dev/null +++ b/config/database.yml.sample @@ -0,0 +1,28 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem '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: db/test.sqlite3 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 + +cucumber: + <<: *test \ No newline at end of file -- libgit2 0.21.2