aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/generated_attribute.rb
diff options
context:
space:
mode:
authorMarc-Andre Lafortune <github@marc-andre.ca>2011-03-05 16:25:20 -0500
committerSantiago Pastorino <santiago@wyeworks.com>2011-07-11 19:47:57 -0300
commiteeb58b0934f646847b3220e3db270bc6b9148919 (patch)
tree854843083040b7f91606ac33f77bd7bd756178a4 /railties/lib/rails/generators/generated_attribute.rb
parent1939fa3f169e4c44234aef0f336411fc01d0445f (diff)
downloadrails-eeb58b0934f646847b3220e3db270bc6b9148919.tar.gz
rails-eeb58b0934f646847b3220e3db270bc6b9148919.tar.bz2
rails-eeb58b0934f646847b3220e3db270bc6b9148919.zip
Generate valid default fixtures for models with a type column
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'railties/lib/rails/generators/generated_attribute.rb')
-rw-r--r--railties/lib/rails/generators/generated_attribute.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index f9f89c9f1d..816d82cac3 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -32,7 +32,7 @@ module Rails
when :decimal then "9.99"
when :datetime, :timestamp, :time then Time.now.to_s(:db)
when :date then Date.today.to_s(:db)
- when :string then "MyString"
+ when :string then name == "type" ? "" : "MyString"
when :text then "MyText"
when :boolean then false
when :references, :belongs_to then nil