diff options
| author | Bryan Helmkamp <bryan@brynary.com> | 2008-04-12 18:36:43 -0400 |
|---|---|---|
| committer | Bryan Helmkamp <bryan@brynary.com> | 2008-04-12 18:36:43 -0400 |
| commit | 8feaf2b8bd0c2c9fcc137c7f5fa5f30b74fa35ef (patch) | |
| tree | 11e63cffc807ee9070a3f07c0b0bba821010d107 | |
| parent | 3967bd524da7b3c0b985c57670ceb7f5d48a0f1b (diff) | |
| download | rails-8feaf2b8bd0c2c9fcc137c7f5fa5f30b74fa35ef.tar.gz rails-8feaf2b8bd0c2c9fcc137c7f5fa5f30b74fa35ef.tar.bz2 rails-8feaf2b8bd0c2c9fcc137c7f5fa5f30b74fa35ef.zip | |
Use a git-ignored database.yml file for test DB configuration
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | config/database.yml.example | 6 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 12 |
3 files changed, 10 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index d6355b45d0..2bab52ab21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ coverage/* +config/database.yml *.DS_Store diff --git a/config/database.yml.example b/config/database.yml.example new file mode 100644 index 0000000000..2230912f7d --- /dev/null +++ b/config/database.yml.example @@ -0,0 +1,6 @@ +test: + adapter: mysql + username: root + password: password + encoding: utf8 + database: sql_algebra_test diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4b61ae8ca8..b633d17257 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,15 +6,9 @@ $LOAD_PATH.unshift "#{dir}/../lib" Dir["#{dir}/matchers/*"].each { |m| require "#{dir}/matchers/#{File.basename(m)}" } require 'active_relation' -ActiveRecord::Base.configurations = { - 'test' => { - :adapter => 'mysql', - :username => 'root', - :password => 'password', - :encoding => 'utf8', - :database => 'sql_algebra_test', - }, -} +FileUtils.cp("#{dir}/../config/database.yml.example", "#{dir}/../config/database.yml") unless File.exist?("#{dir}/../config/database.yml") + +ActiveRecord::Base.configurations = YAML::load(IO.read("#{dir}/../config/database.yml")) ActiveRecord::Base.establish_connection 'test' class Hash |