diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/generated_attribute.rb | 4 | ||||
| -rw-r--r-- | railties/test/generators/migration_generator_test.rb | 6 |
2 files changed, 5 insertions, 5 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 diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb index cdac014965..3f4e160988 100644 --- a/railties/test/generators/migration_generator_test.rb +++ b/railties/test/generators/migration_generator_test.rb @@ -105,18 +105,18 @@ class MigrationGeneratorTest < Rails::Generators::TestCase def test_add_migration_with_attributes_index_declaration_and_attribute_options migration = "add_title_and_content_to_books" - run_generator [migration, "title:string{40}:index", "content:string{255}", "price:decimal{5,2}:index", "discount:decimal{3,2}:uniq"] + run_generator [migration, "title:string{40}:index", "content:string{255}", "price:decimal{1,2}:index", "discount:decimal{3.4}:uniq"] assert_migration "db/migrate/#{migration}.rb" do |content| assert_method :change, content do |up| assert_match(/add_column :books, :title, :string, :limit => 40/, up) assert_match(/add_column :books, :content, :string, :limit => 255/, up) assert_match(/add_column :books, :price, :decimal,/, up) - assert_match(/, :precision => 5/, up) + assert_match(/, :precision => 1/, up) assert_match(/, :scale => 2/, up) assert_match(/add_column :books, :discount, :decimal,/, up) assert_match(/, :precision => 3/, up) - assert_match(/, :scale => 2/, up) + assert_match(/, :scale => 4/, up) end assert_match(/add_index :books, :title/, content) assert_match(/add_index :books, :price/, content) |