Replace connection with lease_connection

Author: aidanharan

Diff for: lib/arel/visitors/sqlserver.rb

@@ -129,7 +129,7 @@ def visit_Arel_Table(o, collector)
         # github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues/450
         table_name =
           begin
-            if o.class.engine.connection.respond_to?(:sqlserver?) && o.class.engine.connection.database_prefix_remote_server?
+            if o.class.engine.lease_connection.respond_to?(:sqlserver?) && o.class.engine.lease_connection.database_prefix_remote_server?
               remote_server_table_name(o)
             else
               quote_table_name(o.name)
@@ -316,7 +316,7 @@ def primary_Key_From_Table(t)
 
       def remote_server_table_name(o)
         ActiveRecord::ConnectionAdapters::SQLServer::Utils.extract_identifiers(
-          "#{o.class.engine.connection.database_prefix}#{o.name}"
+          "#{o.class.engine.lease_connection.database_prefix}#{o.name}"
         ).quoted
       end
 

Diff for: test/cases/adapter_test_sqlserver.rb

@@ -31,7 +31,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   end
 
   it "raises invalid statement error for bad SQL" do
-    assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.update("UPDATE XXX") }
+    assert_raise(ActiveRecord::StatementInvalid) { Topic.lease_connection.update("UPDATE XXX") }
   end
 
   it "is has our adapter_name" do
@@ -285,23 +285,23 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it "NOT ALLOW by default the deletion of a referenced parent" do
-      SSTestHasPk.connection.disable_referential_integrity {}
+      SSTestHasPk.lease_connection.disable_referential_integrity {}
       assert_raise(ActiveRecord::StatementInvalid) { @parent.destroy }
     end
 
     it "ALLOW deletion of referenced parent using #disable_referential_integrity block" do
-      SSTestHasPk.connection.disable_referential_integrity { @parent.destroy }
+      SSTestHasPk.lease_connection.disable_referential_integrity { @parent.destroy }
     end
 
     it "again NOT ALLOW deletion of referenced parent after #disable_referential_integrity block" do
       assert_raise(ActiveRecord::StatementInvalid) do
-        SSTestHasPk.connection.disable_referential_integrity {}
+        SSTestHasPk.lease_connection.disable_referential_integrity {}
         @parent.destroy
       end
     end
 
     it "not disable referential integrity for the same table twice" do
-      tables = SSTestHasPk.connection.tables_with_referential_integrity
+      tables = SSTestHasPk.lease_connection.tables_with_referential_integrity
       assert_equal tables.size, tables.uniq.size
     end
   end
@@ -396,7 +396,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
 
     it "allows connection#view_information to work across databases when using qualified object names" do
       # College is defined in activerecord_unittest2 database.
-      view_info = College.connection.send(:view_information, "[activerecord_unittest].[dbo].[sst_customers_view]")
+      view_info = College.lease_connection.send(:view_information, "[activerecord_unittest].[dbo].[sst_customers_view]")
       assert_equal("sst_customers_view", view_info["TABLE_NAME"])
       assert_match(/CREATE VIEW sst_customers_view/, view_info["VIEW_DEFINITION"])
     end
@@ -407,8 +407,8 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it "allow the connection#view_table_name method to return true table_name for the view for other connections" do
-      assert_equal "customers", College.connection.send(:view_table_name, "[activerecord_unittest].[dbo].[sst_customers_view]")
-      assert_equal "topics", College.connection.send(:view_table_name, "topics"), "No view here, the same table name should come back."
+      assert_equal "customers", College.lease_connection.send(:view_table_name, "[activerecord_unittest].[dbo].[sst_customers_view]")
+      assert_equal "topics", College.lease_connection.send(:view_table_name, "topics"), "No view here, the same table name should come back."
     end
     # With same column names
 
@@ -434,7 +434,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it "respond true to data_source_exists?" do
-      assert SSTestCustomersView.connection.data_source_exists?(SSTestCustomersView.table_name)
+      assert SSTestCustomersView.lease_connection.data_source_exists?(SSTestCustomersView.table_name)
     end
 
     # With aliased column names
@@ -462,7 +462,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it "respond true to data_source_exists?" do
-      assert SSTestStringDefaultsView.connection.data_source_exists?(SSTestStringDefaultsView.table_name)
+      assert SSTestStringDefaultsView.lease_connection.data_source_exists?(SSTestStringDefaultsView.table_name)
     end
 
     # That have more than 4000 chars for their defintion
@@ -554,7 +554,7 @@ def test_doesnt_error_when_a_select_query_is_called_while_preventing_writes
     end
 
     it 'records can be inserted using SQL' do
-      Alien.connection.exec_insert("insert into [test].[aliens] (id, name) VALUES(1, 'Trisolarans'), (2, 'Xenomorph')")
+      Alien.lease_connection.exec_insert("insert into [test].[aliens] (id, name) VALUES(1, 'Trisolarans'), (2, 'Xenomorph')")
     end
   end
 

Diff for: test/cases/coerced_tests.rb

@@ -657,7 +657,7 @@ def migrate(x)
   ensure
     Person.reset_column_information
     if Person.column_names.include?("last_name")
-      Person.connection.remove_column("people", "last_name")
+      Person.lease_connection.remove_column("people", "last_name")
     end
   end
 end
@@ -1334,7 +1334,7 @@ class QueryCacheTest < ActiveRecord::TestCase
   coerce_tests! :test_cache_does_not_wrap_results_in_arrays
   def test_cache_does_not_wrap_results_in_arrays_coerced
     Task.cache do
-      assert_equal 2, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")
+      assert_equal 2, Task.lease_connection.select_value("SELECT count(*) AS count_all FROM tasks")
     end
   end
 
@@ -1493,7 +1493,7 @@ class RelationTest < ActiveRecord::TestCase
 
     coerce_tests! :test_does_not_duplicate_optimizer_hints_on_merge
     def test_does_not_duplicate_optimizer_hints_on_merge_coerced
-      escaped_table = Post.connection.quote_table_name("posts")
+      escaped_table = Post.lease_connection.quote_table_name("posts")
       expected = "SELECT #{escaped_table}.* FROM #{escaped_table} OPTION (OMGHINT)"
       query = Post.optimizer_hints("OMGHINT").merge(Post.optimizer_hints("OMGHINT")).to_sql
       assert_equal expected, query
@@ -1634,19 +1634,19 @@ class TransactionTest < ActiveRecord::TestCase
   coerce_tests! :test_releasing_named_savepoints
   def test_releasing_named_savepoints_coerced
     Topic.transaction do
-      Topic.connection.materialize_transactions
+      Topic.lease_connection.materialize_transactions
 
-      Topic.connection.create_savepoint("another")
-      Topic.connection.release_savepoint("another")
+      Topic.lease_connection.create_savepoint("another")
+      Topic.lease_connection.release_savepoint("another")
       # We do not have a notion of releasing, so this does nothing vs raise an error.
-      Topic.connection.release_savepoint("another")
+      Topic.lease_connection.release_savepoint("another")
     end
   end
 
   # SQL Server does not have query for release_savepoint.
   coerce_tests! :test_nested_transactions_after_disable_lazy_transactions
   def test_nested_transactions_after_disable_lazy_transactions_coerced
-    Topic.connection.disable_lazy_transactions!
+    Topic.lease_connection.disable_lazy_transactions!
 
     capture_sql do
       # RealTransaction (begin..commit)
@@ -1889,12 +1889,12 @@ class StatementCacheTest < ActiveRecord::TestCase
     # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
     coerce_tests! :test_statement_cache_values_differ
     def test_statement_cache_values_differ_coerced
-      Book.connection.remove_index(:books, column: [:author_id, :name])
+      Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
       original_test_statement_cache_values_differ
     ensure
       Book.where(author_id: nil, name: 'my book').delete_all
-      Book.connection.add_index(:books, [:author_id, :name], unique: true)
+      Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
     end
   end
 end
@@ -2124,7 +2124,7 @@ def test_merge_doesnt_duplicate_same_clauses_coerced
 
     non_mary_and_bob = Author.where.not(id: [mary, bob])
 
-    author_id = Author.connection.quote_table_name("authors.id")
+    author_id = Author.lease_connection.quote_table_name("authors.id")
     assert_queries_match(/WHERE #{Regexp.escape(author_id)} NOT IN \((@\d), \g<1>\)'/) do
       assert_equal [david], non_mary_and_bob.merge(non_mary_and_bob)
     end
@@ -2151,56 +2151,56 @@ class EnumTest < ActiveRecord::TestCase
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! %r{enums are distinct per class}
   test "enums are distinct per class coerced" do
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     send(:'original_enums are distinct per class')
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! %r{creating new objects with enum scopes}
   test "creating new objects with enum scopes coerced" do
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     send(:'original_creating new objects with enum scopes')
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! %r{enums are inheritable}
   test "enums are inheritable coerced" do
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     send(:'original_enums are inheritable')
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! %r{declare multiple enums at a time}
   test "declare multiple enums at a time coerced" do
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     send(:'original_declare multiple enums at a time')
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! %r{serializable\? with large number label}
   test "serializable? with large number label coerced" do
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     send(:'original_serializable\? with large number label')
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 end
 
@@ -2401,45 +2401,45 @@ class FieldOrderedValuesTest < ActiveRecord::TestCase
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! :test_in_order_of_with_enums_values
   def test_in_order_of_with_enums_values_coerced
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     original_test_in_order_of_with_enums_values
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! :test_in_order_of_with_string_column
   def test_in_order_of_with_string_column_coerced
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     original_test_in_order_of_with_string_column
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! :test_in_order_of_with_enums_keys
   def test_in_order_of_with_enums_keys_coerced
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     original_test_in_order_of_with_enums_keys
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 
   # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
   coerce_tests! :test_in_order_of_with_nil
   def test_in_order_of_with_nil_coerced
-    Book.connection.remove_index(:books, column: [:author_id, :name])
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
 
     original_test_in_order_of_with_nil
   ensure
     Book.where(author_id: nil, name: nil).delete_all
-    Book.connection.add_index(:books, [:author_id, :name], unique: true)
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
 end