aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorKir Shatrov <shatrov@me.com>2017-02-25 16:33:06 -0600
committerKir Shatrov <shatrov@me.com>2017-02-25 16:33:06 -0600
commit08e781569aea7f0e084c169c70b452e337aa1b5f (patch)
tree0760eef837c92ebcda40693b663a6e06247fc002 /activerecord
parentd13bc5df902a2c82c3096b627830be97acbedf50 (diff)
downloadrails-08e781569aea7f0e084c169c70b452e337aa1b5f.tar.gz
rails-08e781569aea7f0e084c169c70b452e337aa1b5f.tar.bz2
rails-08e781569aea7f0e084c169c70b452e337aa1b5f.zip
Deprecate AbstractAdapter#verify! with arguments
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb3
-rw-r--r--activerecord/test/cases/adapters/mysql2/connection_test.rb12
2 files changed, 15 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index fd11cab5c0..b66d3a2e14 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -439,6 +439,9 @@ module ActiveRecord
# This is done under the hood by calling #active?. If the connection
# is no longer active, then this method will reconnect to the database.
def verify!(*ignored)
+ if ignored.size > 0
+ ActiveSupport::Deprecation.warn("Passing arguments to #verify method of the connection has no affect and has been deprecated. Please remove all arguments from the #verify method call.")
+ end
reconnect! unless active?
end
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index bae283a048..20f1b77f31 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -63,6 +63,18 @@ class Mysql2ConnectionTest < ActiveRecord::Mysql2TestCase
assert @connection.active?
end
+ def test_verify_with_args_is_deprecated
+ assert_deprecated do
+ @connection.verify!(option: true)
+ end
+ assert_deprecated do
+ @connection.verify!([])
+ end
+ assert_deprecated do
+ @connection.verify!({})
+ end
+ end
+
def test_execute_after_disconnect
@connection.disconnect!