From ede01ce8b27c752de66dcb96aa9b8d3a29e61111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 22 Jan 2012 15:45:18 +0100
Subject: Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works
 fine with bash, zsh, etc, closes #4602

---
 railties/lib/rails/generators/generated_attribute.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails/generators/generated_attribute.rb')

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
-- 
cgit v1.2.3