diff options
author | Vipul A M <vipulnsward@gmail.com> | 2013-07-14 21:15:09 +0530 |
---|---|---|
committer | Vipul A M <vipulnsward@gmail.com> | 2013-11-10 11:29:17 +0530 |
commit | a8f6662defe086258814f82dc8acb8d2eeee9842 (patch) | |
tree | ba5ad462c4f0a41afa4ab88d06e91938057f1d80 | |
parent | 27330ebae9537dd5503b10d3c0e6f422a38bd9c8 (diff) | |
download | rails-a8f6662defe086258814f82dc8acb8d2eeee9842.tar.gz rails-a8f6662defe086258814f82dc8acb8d2eeee9842.tar.bz2 rails-a8f6662defe086258814f82dc8acb8d2eeee9842.zip |
Remove deprecated calls to `SelectManage#insert` with preference to using `compile_insert`
-rw-r--r-- | lib/arel/select_manager.rb | 25 | ||||
-rw-r--r-- | test/test_select_manager.rb | 14 |
2 files changed, 0 insertions, 39 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index 399cddb513..b4899177d5 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -264,31 +264,6 @@ module Arel @engine.connection.send(:select, to_sql, 'AREL').map { |x| Row.new(x) } end - # FIXME: this method should go away - def insert values - if $VERBOSE - warn <<-eowarn -insert (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please -switch to `compile_insert` - eowarn - end - - im = compile_insert(values) - table = @ctx.froms - - primary_key = table.primary_key - primary_key_name = primary_key.name if primary_key - - # FIXME: in AR tests values sometimes were Array and not Hash therefore is_a?(Hash) check is added - primary_key_value = primary_key && values.is_a?(Hash) && values[primary_key] - im.into table - # Oracle adapter needs primary key name to generate RETURNING ... INTO ... clause - # for tables which assign primary key value using trigger. - # RETURNING ... INTO ... clause will be added only if primary_key_value is nil - # therefore it is necessary to pass primary key value as well - @engine.connection.insert im.to_sql, 'AREL', primary_key_name, primary_key_value - end - private def collapse exprs, existing = nil exprs = exprs.unshift(existing.expr) if existing diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb index a449f78bd8..9779aca21d 100644 --- a/test/test_select_manager.rb +++ b/test/test_select_manager.rb @@ -435,20 +435,6 @@ module Arel end end - describe 'insert' do - it 'uses the select FROM' do - engine = EngineProxy.new Table.engine - table = Table.new :users - manager = Arel::SelectManager.new engine - manager.from table - manager.insert 'VALUES(NULL)' - - engine.executed.last.must_be_like %{ - INSERT INTO "users" VALUES(NULL) - } - end - end - describe 'lock' do # This should fail on other databases it 'adds a lock node' do |