diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-10 09:37:58 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-10 09:37:58 -0800 |
| commit | 23101de283de13517e30c4c3d1ecc65525264886 (patch) | |
| tree | 239e573b7155f5f41acf0a43eb7d2a4d33690e46 /activerecord/lib | |
| parent | 74233d48e64650c26600f82ac23eb55c39fea342 (diff) | |
| parent | b805c71655ada0e3fcf7ccc1cdf3376e55b2b9ce (diff) | |
| download | rails-23101de283de13517e30c4c3d1ecc65525264886.tar.gz rails-23101de283de13517e30c4c3d1ecc65525264886.tar.bz2 rails-23101de283de13517e30c4c3d1ecc65525264886.zip | |
Merge pull request #3600 from vijaydev/migration_arity
Checking the arity of the block passed to create_table
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 0e5e33fa02..be9a02682b 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -158,7 +158,13 @@ module ActiveRecord td = table_definition td.primary_key(options[:primary_key] || Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false - td.instance_eval(&blk) if blk + if block_given? + if blk.arity == 1 + yield td + else + td.instance_eval(&blk) + end + end if options[:force] && table_exists?(table_name) drop_table(table_name) |