diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-22 15:45:18 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-22 15:58:58 +0100 |
| commit | ede01ce8b27c752de66dcb96aa9b8d3a29e61111 (patch) | |
| tree | 91e63a62f8e202a4b71a8ad68f3364aabff9dd9a /railties/lib/rails/generators/generated_attribute.rb | |
| parent | 334e5cab2a999ef246ae0c31d0b939ef185cfe63 (diff) | |
| download | rails-ede01ce8b27c752de66dcb96aa9b8d3a29e61111.tar.gz rails-ede01ce8b27c752de66dcb96aa9b8d3a29e61111.tar.bz2 rails-ede01ce8b27c752de66dcb96aa9b8d3a29e61111.zip | |
Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with bash, zsh, etc, closes #4602
Diffstat (limited to 'railties/lib/rails/generators/generated_attribute.rb')
| -rw-r--r-- | railties/lib/rails/generators/generated_attribute.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb index cfd58527ef..8d307ca536 100644 --- a/railties/lib/rails/generators/generated_attribute.rb +++ b/railties/lib/rails/generators/generated_attribute.rb @@ -29,8 +29,8 @@ module Rails case type when /(string|text|binary|integer)\{(\d+)\}/ return $1, :limit => $2.to_i - when /decimal\{(\d+),(\d+)\}/ - return :decimal, :precision => $1.to_i, :scale => $2.to_i + when /decimal\{(\d+)(,|\.|\-)(\d+)\}/ + return :decimal, :precision => $1.to_i, :scale => $3.to_i else return type, {} end |