diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-20 11:22:27 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-20 11:22:27 +0000 |
| commit | e945bcfe4a519e6cf7349443c48fecce2e8c9d67 (patch) | |
| tree | ba24e551b041918d5878157535ef90a5a01fc358 | |
| parent | 5b1a1bf5bfc520248285b036672146122dd2a815 (diff) | |
| download | rails-e945bcfe4a519e6cf7349443c48fecce2e8c9d67.tar.gz rails-e945bcfe4a519e6cf7349443c48fecce2e8c9d67.tar.bz2 rails-e945bcfe4a519e6cf7349443c48fecce2e8c9d67.zip | |
Add test sqlite3 db to .gitignore
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | activemodel/test/cases/helper.rb | 5 | ||||
| -rw-r--r-- | activemodel/test/fixtures/fixture_database.sqlite3 | bin | 2048 -> 0 bytes |
3 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 5b3bd90098..294f15c9a8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ activesupport/doc activeresource/pkg activerecord/pkg actionpack/pkg +activemodel/test/fixtures/fixture_database.sqlite3 actionmailer/pkg activesupport/pkg railties/pkg diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 6465f4e61f..1e5c6697cd 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -9,9 +9,6 @@ require 'active_record' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") -class SqliteError < StandardError -end - # Setup database connection db_file = "#{FIXTURES_ROOT}/fixture_database.sqlite3" ActiveRecord::Base.configurations = { ActiveRecord::Base.name => { :adapter => 'sqlite3', :database => db_file, :timeout => 5000 } } @@ -19,7 +16,7 @@ unless File.exist?(db_file) puts "SQLite3 database not found at #{db_file}. Rebuilding it." sqlite_command = %Q{sqlite3 "#{db_file}" "create table a (a integer); drop table a;"} puts "Executing '#{sqlite_command}'" - raise SqliteError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command) + raise StandardError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command) end ActiveRecord::Base.establish_connection(ActiveRecord::Base.name) diff --git a/activemodel/test/fixtures/fixture_database.sqlite3 b/activemodel/test/fixtures/fixture_database.sqlite3 Binary files differdeleted file mode 100644 index 3847b16aca..0000000000 --- a/activemodel/test/fixtures/fixture_database.sqlite3 +++ /dev/null |