diff options
| -rw-r--r-- | railties/CHANGELOG | 5 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/model/templates/fixtures.yml | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 921490ba6d..0095bbbf89 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [jbarnette] + + *2.0.0 [RC2]* (November 28th, 2007) * Update to Prototype -r8232. [sam] diff --git a/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml b/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml index c8a124f44f..c21035113e 100644 --- a/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml +++ b/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +<% unless attributes.empty? -%> one: - <%= class_name.constantize.primary_key %>: 1 <% for attribute in attributes -%> <%= attribute.name %>: <%= attribute.default %> <% end -%> -<% unless options[:skip_timestamps] -%> - created_at: <%= Time.now.to_s(:db) %> - updated_at: <%= Time.now.to_s(:db) %> -<% end -%> + two: - <%= class_name.constantize.primary_key %>: 2 <% for attribute in attributes -%> <%= attribute.name %>: <%= attribute.default %> <% end -%> -<% unless options[:skip_timestamps] -%> - created_at: <%= Time.now.to_s(:db) %> - updated_at: <%= Time.now.to_s(:db) %> +<% else -%> +# one: +# column: value +# +# two: +# column: value <% end -%> |