<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>railties/configs/seeds.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,8 @@
+*Edge*
+
+* Added db/seeds.rb as a default file for storing seed data for the database. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the &quot;Stop Putting Gawd Damn Seed Data In Your Migrations&quot; feature) [DHH]
+
+
 *2.3.2 [Final] (March 15, 2009)*
 
 * Remove outdated script/plugin options [Pratik Naik]</diff>
      <filename>railties/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -200,11 +200,14 @@ task :copy_configs do
 
   cp &quot;configs/locales/en.yml&quot;, &quot;#{PKG_DESTINATION}/config/locales/en.yml&quot;
 
+  cp &quot;configs/seeds.rb&quot;, &quot;#{PKG_DESTINATION}/db/seeds.rb&quot;
+
   cp &quot;environments/boot.rb&quot;,        &quot;#{PKG_DESTINATION}/config/boot.rb&quot;
   cp &quot;environments/environment.rb&quot;, &quot;#{PKG_DESTINATION}/config/environment.rb&quot;
   cp &quot;environments/production.rb&quot;,  &quot;#{PKG_DESTINATION}/config/environments/production.rb&quot;
   cp &quot;environments/development.rb&quot;, &quot;#{PKG_DESTINATION}/config/environments/development.rb&quot;
   cp &quot;environments/test.rb&quot;,        &quot;#{PKG_DESTINATION}/config/environments/test.rb&quot;
+
 end
 
 task :copy_binfiles do</diff>
      <filename>railties/Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -125,6 +125,7 @@ class AppGenerator &lt; Rails::Generator::Base
       create_database_configuration_file(m)
       create_routes_file(m)
       create_locale_file(m)
+      create_seeds_file(m)
       create_initializer_files(m)
       create_environment_files(m)
     end
@@ -176,6 +177,10 @@ class AppGenerator &lt; Rails::Generator::Base
       m.file &quot;configs/routes.rb&quot;, &quot;config/routes.rb&quot;
     end
 
+    def create_seeds_file(m)
+      m.file &quot;configs/seeds.rb&quot;, &quot;db/seeds.rb&quot;
+    end
+
     def create_initializer_files(m)
       %w( 
         backtrace_silencers </diff>
      <filename>railties/lib/rails_generator/generators/applications/app/app_generator.rb</filename>
    </modified>
    <modified>
      <diff>@@ -156,8 +156,8 @@ namespace :db do
     Rake::Task[&quot;db:schema:dump&quot;].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
-  desc 'Drops and recreates the database from db/schema.rb for the current environment.'
-  task :reset =&gt; ['db:drop', 'db:create', 'db:schema:load']
+  desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
+  task :reset =&gt; [ 'db:drop', 'db:setup' ]
 
   desc &quot;Retrieves the charset for the current environment's database&quot;
   task :charset =&gt; :environment do
@@ -206,6 +206,15 @@ namespace :db do
     end
   end
 
+  desc 'Create the database, load the schema, and initialize with the seed data'
+  task :setup =&gt; [ 'db:create', 'db:schema:load', 'db:seed' ]
+
+  desc 'Load the seed data from db/seeds.rb'
+  task :seed =&gt; :environment do
+    seed_file = File.join(Rails.root, 'db', 'seeds.rb')
+    load(seed_file) if File.exist?(seed_file)
+  end
+
   namespace :fixtures do
     desc &quot;Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures.&quot;
     task :load =&gt; :environment do</diff>
      <filename>railties/lib/tasks/databases.rake</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>2e7409f035236c719c5b1567c4bb3e65a5e543bc</id>
    </parent>
  </parents>
  <author>
    <name>David Heinemeier Hansson</name>
    <login>dhh</login>
    <email>david@loudthinking.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/4932f7b38f72104819022abca0c952ba6f9888cb</url>
  <id>4932f7b38f72104819022abca0c952ba6f9888cb</id>
  <committed-date>2009-05-11T10:08:13-07:00</committed-date>
  <authored-date>2009-05-11T10:08:13-07:00</authored-date>
  <message>Added db/seeds.rb as a default file for storing seed data for the database. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the &quot;Stop Putting Gawd Damn Seed Data In Your Migrations&quot; feature) [DHH]</message>
  <tree>b8f5d82f7a00d910e6e88648cfe3cda345cd0295</tree>
  <committer>
    <name>David Heinemeier Hansson</name>
    <login>dhh</login>
    <email>david@loudthinking.com</email>
  </committer>
</commit>
