diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-01-30 13:59:42 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-01-30 13:59:42 -0800 |
| commit | c99eb232c2d85b18cca78f699895aff007e7aa85 (patch) | |
| tree | 4a2cad0149126e8b4d3947908b6a0ed06d3b9a9f /railties | |
| parent | de161003c36a0cd967aa393e7706b12055770174 (diff) | |
| parent | b04bce28ff475a93311304069085b0b99d1dbac4 (diff) | |
| download | rails-c99eb232c2d85b18cca78f699895aff007e7aa85.tar.gz rails-c99eb232c2d85b18cca78f699895aff007e7aa85.tar.bz2 rails-c99eb232c2d85b18cca78f699895aff007e7aa85.zip | |
Merge pull request #4769 from sikachu/failing-test
Fix failing test from [7619bcf2]
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/generated_attribute.rb | 2 |
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 51787c30df..7dfc1aa599 100644 --- a/railties/lib/rails/generators/generated_attribute.rb +++ b/railties/lib/rails/generators/generated_attribute.rb @@ -33,7 +33,7 @@ module Rails when /(string|text|binary|integer)\{(\d+)\}/ return $1, :limit => $2.to_i when /decimal\{(\d+)[,.-](\d+)\}/ - return :decimal, :precision => $1.to_i, :scale => $3.to_i + return :decimal, :precision => $1.to_i, :scale => $2.to_i else return type, {} end |