aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-23 23:45:07 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-23 23:45:07 -0300
commit72c1abcc2f04fa2b0cdf89fd6093da544274c465 (patch)
treefa06920a839c731ec18767c27cb77132ae565315 /activerecord/lib/active_record
parentd43ef0d4e3ad0461bb86694563a167acd19ed60c (diff)
parent4367d2f05cbeda855820e25a08353d4b7b3457ac (diff)
downloadrails-72c1abcc2f04fa2b0cdf89fd6093da544274c465.tar.gz
rails-72c1abcc2f04fa2b0cdf89fd6093da544274c465.tar.bz2
rails-72c1abcc2f04fa2b0cdf89fd6093da544274c465.zip
Merge pull request #15881 from mmozuras/remove_unused_params
Remove unused params
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/attribute_assignment.rb4
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb
index 40e2918777..833ffa158b 100644
--- a/activerecord/lib/active_record/attribute_assignment.rb
+++ b/activerecord/lib/active_record/attribute_assignment.rb
@@ -134,7 +134,7 @@ module ActiveRecord
elsif klass == Date
read_date
else
- read_other(klass)
+ read_other
end
end
@@ -181,7 +181,7 @@ module ActiveRecord
end
end
- def read_other(klass)
+ def read_other
max_position = extract_max_param
positions = (1..max_position)
validate_required_parameters!(positions)
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index db80c0faee..cb75070e3a 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -364,7 +364,7 @@ module ActiveRecord
conn.expire
end
- release conn, owner
+ release owner
@available.add conn
end
@@ -377,7 +377,7 @@ module ActiveRecord
@connections.delete conn
@available.delete conn
- release conn, conn.owner
+ release conn.owner
@available.add checkout_new_connection if @available.any_waiting?
end
@@ -425,7 +425,7 @@ module ActiveRecord
end
end
- def release(conn, owner)
+ def release(owner)
thread_id = owner.object_id
@reserved_connections.delete thread_id