Revert "Use lease_connection in test database setup"

This reverts commit c5005d3.

Author: brendon

test/helper.rb

@@ -34,13 +34,13 @@
 
 def teardown_db
   if ActiveRecord::VERSION::MAJOR >= 5
-    tables = ActiveRecord::Base.lease_connection.data_sources
+    tables = ActiveRecord::Base.connection.data_sources
   else
-    tables = ActiveRecord::Base.lease_connection.tables
+    tables = ActiveRecord::Base.connection.tables
   end
 
   tables.each do |table|
-    ActiveRecord::Base.lease_connection.drop_table(table)
+    ActiveRecord::Base.connection.drop_table(table)
   end
 end
 

test/test_default_scope_with_select.rb

@@ -7,12 +7,12 @@ class Animal < ActiveRecord::Base
 
 class DefaultScopeWithSelectTest < Minitest::Test
   def setup
-    ActiveRecord::Base.lease_connection.create_table :animals do |t|
+    ActiveRecord::Base.connection.create_table :animals do |t|
       t.column :position, :integer
       t.column :name, :string
     end
 
-    ActiveRecord::Base.lease_connection.schema_cache.clear!
+    ActiveRecord::Base.connection.schema_cache.clear!
     Animal.reset_column_information
     super
   end

test/test_joined_list.rb

@@ -18,18 +18,18 @@ class Item < ActiveRecord::Base
 
 class JoinedTestCase < Minitest::Test
   def setup
-    ActiveRecord::Base.lease_connection.create_table :sections do |t|
+    ActiveRecord::Base.connection.create_table :sections do |t|
       t.column :position, :integer
       t.column :visible, :boolean, default: true
     end
 
-    ActiveRecord::Base.lease_connection.create_table :items do |t|
+    ActiveRecord::Base.connection.create_table :items do |t|
       t.column :position, :integer
       t.column :section_id, :integer
       t.column :visible, :boolean, default: true
     end
 
-    ActiveRecord::Base.lease_connection.schema_cache.clear!
+    ActiveRecord::Base.connection.schema_cache.clear!
     [Section, Item].each(&:reset_column_information)
     super
   end

test/test_list.rb

@@ -12,7 +12,7 @@ def setup_db(position_options = {})
   positive = position_options.delete(:positive)
 
   # AR caches columns options like defaults etc. Clear them!
-  ActiveRecord::Base.lease_connection.create_table :mixins do |t|
+  ActiveRecord::Base.connection.create_table :mixins do |t|
     t.column :pos, :integer, **position_options unless positive && sqlite
     t.column :active, :boolean, default: true
     t.column :parent_id, :integer
@@ -23,35 +23,35 @@ def setup_db(position_options = {})
   end
 
   if unique && !(sqlite && positive)
-    ActiveRecord::Base.lease_connection.add_index :mixins, :pos, unique: true
+    ActiveRecord::Base.connection.add_index :mixins, :pos, unique: true
   end
 
   if positive
     if sqlite
       # SQLite cannot add constraint after table creation, also cannot add unique inside ADD COLUMN
-      ActiveRecord::Base.lease_connection.execute('ALTER TABLE mixins ADD COLUMN pos integer8 NOT NULL CHECK (pos > 0) DEFAULT 1')
-      ActiveRecord::Base.lease_connection.execute('CREATE UNIQUE INDEX index_mixins_on_pos ON mixins(pos)')
+      ActiveRecord::Base.connection.execute('ALTER TABLE mixins ADD COLUMN pos integer8 NOT NULL CHECK (pos > 0) DEFAULT 1')
+      ActiveRecord::Base.connection.execute('CREATE UNIQUE INDEX index_mixins_on_pos ON mixins(pos)')
     else
-      ActiveRecord::Base.lease_connection.execute('ALTER TABLE mixins ADD CONSTRAINT pos_check CHECK (pos > 0)')
+      ActiveRecord::Base.connection.execute('ALTER TABLE mixins ADD CONSTRAINT pos_check CHECK (pos > 0)')
     end
   end
 
   # This table is used to test table names and column names quoting
-  ActiveRecord::Base.lease_connection.create_table 'table-name' do |t|
+  ActiveRecord::Base.connection.create_table 'table-name' do |t|
     t.column :order, :integer
   end
 
   # This table is used to test table names with different primary_key columns
-  ActiveRecord::Base.lease_connection.create_table 'altid-table', primary_key: 'altid' do |t|
+  ActiveRecord::Base.connection.create_table 'altid-table', primary_key: 'altid' do |t|
     t.column :pos, :integer
     t.column :created_at, :datetime
     t.column :updated_at, :datetime
   end
 
-  ActiveRecord::Base.lease_connection.add_index 'altid-table', :pos, unique: true
+  ActiveRecord::Base.connection.add_index 'altid-table', :pos, unique: true
 
   # This table is used to test table names with a composite primary_key
-  ActiveRecord::Base.lease_connection.create_table 'composite-primary-key-table', primary_key: [:first_id, :second_id] do |t|
+  ActiveRecord::Base.connection.create_table 'composite-primary-key-table', primary_key: [:first_id, :second_id] do |t|
     t.integer :first_id, null: false
     t.integer :second_id, null: false
     t.column :parent_id, :integer
@@ -66,7 +66,7 @@ def setup_db(position_options = {})
     ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin, EnumArrayScopeListMixin,
     DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList, TouchDisabledMixin, CompositePrimaryKeyList, CompositePrimaryKeyListScoped ]
 
-  ActiveRecord::Base.lease_connection.schema_cache.clear!
+  ActiveRecord::Base.connection.schema_cache.clear!
   mixins.each do |klass|
     klass.reset_column_information
   end
@@ -214,7 +214,7 @@ class QuotedList < ActiveRecord::Base
 
 class CompositePrimaryKeyList < ActiveRecord::Base
   self.table_name = "composite-primary-key-table"
-  self.primary_key = [:first_id, :second_id]
+  self.primary_key = [:first_id, :second_id] 
 
   acts_as_list column: "pos"
 end

test/test_no_update_for_extra_classes.rb

@@ -20,21 +20,21 @@ class TodoItemAttachment < ActiveRecord::Base
 
 class NoUpdateForCollectionClassesTestCase < Minitest::Test
   def setup
-    ActiveRecord::Base.lease_connection.create_table :todo_lists do |t|
+    ActiveRecord::Base.connection.create_table :todo_lists do |t|
       t.column :position, :integer
     end
 
-    ActiveRecord::Base.lease_connection.create_table :todo_items do |t|
+    ActiveRecord::Base.connection.create_table :todo_items do |t|
       t.column :position, :integer
       t.column :todo_list_id, :integer
     end
 
-    ActiveRecord::Base.lease_connection.create_table :todo_item_attachments do |t|
+    ActiveRecord::Base.connection.create_table :todo_item_attachments do |t|
       t.column :position, :integer
       t.column :todo_item_id, :integer
     end
 
-    ActiveRecord::Base.lease_connection.schema_cache.clear!
+    ActiveRecord::Base.connection.schema_cache.clear!
     [TodoList, TodoItem, TodoItemAttachment].each(&:reset_column_information)
     super
   end

test/test_no_update_for_scope_destruction.rb

@@ -19,21 +19,21 @@ class DestructionTadaItem < ActiveRecord::Base
 
 class NoUpdateForScopeDestructionTestCase < Minitest::Test
   def setup
-    ActiveRecord::Base.lease_connection.create_table :destruction_todo_lists do |t|
+    ActiveRecord::Base.connection.create_table :destruction_todo_lists do |t|
     end
 
-    ActiveRecord::Base.lease_connection.create_table :destruction_todo_items do |t|
+    ActiveRecord::Base.connection.create_table :destruction_todo_items do |t|
       t.column :position, :integer
       t.column :destruction_todo_list_id, :integer
     end
 
-    ActiveRecord::Base.lease_connection.create_table :destruction_tada_items do |t|
+    ActiveRecord::Base.connection.create_table :destruction_tada_items do |t|
       t.column :position, :integer
       t.column :destruction_todo_list_id, :integer
       t.column :enabled, :boolean
     end
 
-    ActiveRecord::Base.lease_connection.schema_cache.clear!
+    ActiveRecord::Base.connection.schema_cache.clear!
     [DestructionTodoList, DestructionTodoItem, DestructionTadaItem].each(&:reset_column_information)
     super
   end

test/test_no_update_for_subclasses.rb

@@ -10,12 +10,12 @@ class SlaveItem < MasterItem; end
 
 class NoUpdateForSubclassesTestCase < Minitest::Test
   def setup
-    ActiveRecord::Base.lease_connection.create_table :master_items do |t|
+    ActiveRecord::Base.connection.create_table :master_items do |t|
       t.column :position, :integer
       t.column :type, :string
     end
 
-    ActiveRecord::Base.lease_connection.schema_cache.clear!
+    ActiveRecord::Base.connection.schema_cache.clear!
     [MasterItem, SlaveItem].each(&:reset_column_information)
     super
   end

test/test_scope_with_user_defined_foreign_key.rb

@@ -11,15 +11,15 @@ class ChecklistItem < ActiveRecord::Base
 
 class ScopeWithUserDefinedForeignKeyTest < Minitest::Test
   def setup
-    ActiveRecord::Base.lease_connection.create_table :checklists do |t|
+    ActiveRecord::Base.connection.create_table :checklists do |t|
     end
 
-    ActiveRecord::Base.lease_connection.create_table :checklist_items do |t|
+    ActiveRecord::Base.connection.create_table :checklist_items do |t|
       t.column :list_id, :integer
       t.column :position, :integer
     end
 
-    ActiveRecord::Base.lease_connection.schema_cache.clear!
+    ActiveRecord::Base.connection.schema_cache.clear!
     [Checklist, ChecklistItem].each(&:reset_column_information)
     super
   end