diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-28 23:51:50 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-28 23:51:50 +0000 |
| commit | ce458a74a5f95bb09c4e6b6dbd62367d767af18e (patch) | |
| tree | 40d4afe7a37428c17b24690dcc4795c05b5c6d76 /railties | |
| parent | 0e146d54a7b31d571fe3b5d2e62085a432d7e52c (diff) | |
| download | rails-ce458a74a5f95bb09c4e6b6dbd62367d767af18e.tar.gz rails-ce458a74a5f95bb09c4e6b6dbd62367d767af18e.tar.bz2 rails-ce458a74a5f95bb09c4e6b6dbd62367d767af18e.zip | |
Don't assume Active Record is available. Closes #5497.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 507b3a0219..ca87f29f01 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Don't assume Active Record is available. #5497 [bob@sporkmonger.com] + * Mongrel: script/server works on Win32. #5499 [jeremydurham@gmail.com] * Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [nicksieger@gmail.com] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 4394febd03..98d5555404 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -5,16 +5,16 @@ namespace :db do Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby end - namespace :fixtures do - desc "Load fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y" - task :load => :environment do - require 'active_record/fixtures' - ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| - Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*')) - end - end - end + namespace :fixtures do + desc "Load fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y" + task :load => :environment do + require 'active_record/fixtures' + ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) + (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| + Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*')) + end + end + end namespace :schema do desc "Create a db/schema.rb file that can be portably used against any DB supported by AR" @@ -136,7 +136,9 @@ namespace :db do desc 'Prepare the test database and load the schema' task :prepare => :environment do - Rake::Task[{ :sql => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke + if defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank? + Rake::Task[{ :sql => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke + end end end |