kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Change attributes default type to array to allow order to be preserved.

Browse source
This commit is contained in:
José Valim 2009-07-21 12:00:02 +02:00
parent c90419d4f4
commit 10fd021789
7 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/generators/active_record/migration/migration_generator.rb
View file

@ -3,7 +3,7 @@ require 'generators/active_record'
module ActiveRecord module ActiveRecord
module Generators module Generators
class MigrationGenerator < Base class MigrationGenerator < Base
argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
def create_migration_file def create_migration_file
set_local_assigns! set_local_assigns!

2
railties/lib/generators/active_record/model/model_generator.rb
View file

@ -3,7 +3,7 @@ require 'generators/active_record'
module ActiveRecord module ActiveRecord
module Generators module Generators
class ModelGenerator < Base class ModelGenerator < Base
argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
check_class_collision check_class_collision

2
railties/lib/generators/erb/scaffold/scaffold_generator.rb
View file

@ -5,7 +5,7 @@ module Erb
class ScaffoldGenerator < Base class ScaffoldGenerator < Base
include Rails::Generators::ScaffoldBase include Rails::Generators::ScaffoldBase
argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
class_option :form, :type => :boolean class_option :form, :type => :boolean
class_option :layout, :type => :boolean class_option :layout, :type => :boolean

3
railties/lib/generators/named_base.rb
View file

@ -41,7 +41,8 @@ module Rails
# Convert attributes hash into an array with GeneratedAttribute objects. # Convert attributes hash into an array with GeneratedAttribute objects.
# #
def parse_attributes! #:nodoc: def parse_attributes! #:nodoc:
self.attributes = (attributes || {}).map do |name, type| self.attributes = (attributes || []).map do |key_value|
name, type = key_value.split(':')
Rails::Generators::GeneratedAttribute.new(name, type) Rails::Generators::GeneratedAttribute.new(name, type)
end end
end end

2
railties/lib/generators/rails/migration/migration_generator.rb
View file

@ -1,7 +1,7 @@
module Rails module Rails
module Generators module Generators
class MigrationGenerator < NamedBase #metagenerator class MigrationGenerator < NamedBase #metagenerator
argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
hook_for :orm, :required => true hook_for :orm, :required => true
end end
end end

2
railties/lib/generators/rails/model/model_generator.rb
View file

@ -1,7 +1,7 @@
module Rails module Rails
module Generators module Generators
class ModelGenerator < NamedBase #metagenerator class ModelGenerator < NamedBase #metagenerator
argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
hook_for :orm, :required => true hook_for :orm, :required => true
end end
end end

2
railties/lib/generators/test_unit/model/model_generator.rb
View file

@ -3,7 +3,7 @@ require 'generators/test_unit'
module TestUnit module TestUnit
module Generators module Generators
class ModelGenerator < Base class ModelGenerator < Base
argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
class_option :fixture, :type => :boolean class_option :fixture, :type => :boolean
check_class_collision :suffix => "Test" check_class_collision :suffix => "Test"