diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-02-15 16:10:27 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-02-15 16:10:27 +0000 |
| commit | 2f997797a500721ca845f5eb6d056bcaf4ffeaca (patch) | |
| tree | e497d908022c734af8c6bbdec63815f38df64eb5 /activerecord/lib | |
| parent | 8aa4603a5adaa56c818a7bd1c0b761b4ecca3d3e (diff) | |
| download | rails-2f997797a500721ca845f5eb6d056bcaf4ffeaca.tar.gz rails-2f997797a500721ca845f5eb6d056bcaf4ffeaca.tar.bz2 rails-2f997797a500721ca845f5eb6d056bcaf4ffeaca.zip | |
Revert "Revert "Merge pull request #9206 from ranjaykrishna/use_define_method""
This reverts commit 8aa4603a5adaa56c818a7bd1c0b761b4ecca3d3e.
Reverting the revert because I reverted the wrong thing! Fail.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index b1ec33d06c..f758e19a4f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -252,15 +252,12 @@ module ActiveRecord self end - %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type| - class_eval <<-EOV, __FILE__, __LINE__ + 1 - def #{column_type}(*args) # def string(*args) - options = args.extract_options! # options = args.extract_options! - column_names = args # column_names = args - type = :'#{column_type}' # type = :string - column_names.each { |name| column(name, type, options) } # column_names.each { |name| column(name, type, options) } - end # end - EOV + [:string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean].each do |column_type| + define_method column_type do |*args| + options = args.extract_options! + column_names = args + column_names.each { |name| column(name, column_type, options) } + end end # Adds index options to the indexes hash, keyed by column name @@ -486,15 +483,13 @@ module ActiveRecord # # t.string(:goat) # t.string(:goat, :sheep) - %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type| - class_eval <<-EOV, __FILE__, __LINE__ + 1 - def #{column_type}(*args) # def string(*args) - options = args.extract_options! # options = args.extract_options! - args.each do |name| # column_names.each do |name| - @base.add_column(@table_name, name, :#{column_type}, options) # @base.add_column(@table_name, name, :string, options) - end # end - end # end - EOV + [:string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean].each do |column_type| + define_method column_type do |*args| + options = args.extract_options! + args.each do |name| + @base.add_column(@table_name, name, column_type, options) + end + end end private |