ibm_db 5.6.1 → 5.7.0

data/test/cases/pooled_connections_test.rb

@@ -5,69 +5,70 @@ require "models/project"
 require "timeout"
 
 class PooledConnectionsTest < ActiveRecord::TestCase
-  self.use_transactional_tests = false
+  unless in_memory_db?
+    self.use_transactional_tests = false
 
-  def setup
-    @per_test_teardown = []
-    @connection = ActiveRecord::Base.remove_connection.configuration_hash
-  end
+    def setup
+      @connection = ActiveRecord::Base.remove_connection.configuration_hash
+    end
 
-  teardown do
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(@connection)
-    @per_test_teardown.each(&:call)
-  end
+    def teardown
+      ActiveRecord::Base.connection_handler.clear_all_connections!(:all)
+      ActiveRecord::Base.establish_connection(@connection)
+    end
 
-  # Will deadlock due to lack of Monitor timeouts in 1.9
-  def checkout_checkin_connections(pool_size, threads)
-    ActiveRecord::Base.establish_connection(@connection.merge(pool: pool_size, checkout_timeout: 0.5))
-    @connection_count = 0
-    @timed_out = 0
-    threads.times do
-      Thread.new do
-        conn = ActiveRecord::Base.connection_pool.checkout
-        sleep 0.1
-        ActiveRecord::Base.connection_pool.checkin conn
-        @connection_count += 1
-      rescue ActiveRecord::ConnectionTimeoutError
-        @timed_out += 1
-      end.join
+    def test_pooled_connection_checkin_one
+      checkout_checkin_connections 1, 2
+      assert_equal 2, @connection_count
+      assert_equal 0, @timed_out
+      assert_equal 1, ActiveRecord::Base.connection_pool.connections.size
     end
-  end
 
-  def checkout_checkin_connections_loop(pool_size, loops)
-    ActiveRecord::Base.establish_connection(@connection.merge(pool: pool_size, checkout_timeout: 0.5))
-    @connection_count = 0
-    @timed_out = 0
-    loops.times do
-      conn = ActiveRecord::Base.connection_pool.checkout
-      ActiveRecord::Base.connection_pool.checkin conn
-      @connection_count += 1
-      ActiveRecord::Base.connection.data_sources
-    rescue ActiveRecord::ConnectionTimeoutError
-      @timed_out += 1
+    def test_pooled_connection_checkin_two
+      checkout_checkin_connections_loop 2, 3
+      assert_equal 3, @connection_count
+      assert_equal 0, @timed_out
+      assert_equal 2, ActiveRecord::Base.connection_pool.connections.size
     end
-  end
 
-  def test_pooled_connection_checkin_one
-    checkout_checkin_connections 1, 2
-    assert_equal 2, @connection_count
-    assert_equal 0, @timed_out
-    assert_equal 1, ActiveRecord::Base.connection_pool.connections.size
-  end
+    def test_pooled_connection_remove
+      ActiveRecord::Base.establish_connection(@connection.merge(pool: 2, checkout_timeout: 0.5))
+      old_connection = ActiveRecord::Base.lease_connection
+      extra_connection = ActiveRecord::Base.connection_pool.checkout
+      ActiveRecord::Base.connection_pool.remove(extra_connection)
+      assert_equal ActiveRecord::Base.lease_connection.object_id, old_connection.object_id
+    end
 
-  def test_pooled_connection_checkin_two
-    checkout_checkin_connections_loop 2, 3
-    assert_equal 3, @connection_count
-    assert_equal 0, @timed_out
-    assert_equal 2, ActiveRecord::Base.connection_pool.connections.size
-  end
+    private
+      # Will deadlock due to lack of Monitor timeouts in 1.9
+      def checkout_checkin_connections(pool_size, threads)
+        ActiveRecord::Base.establish_connection(@connection.merge(pool: pool_size, checkout_timeout: 0.5))
+        @connection_count = 0
+        @timed_out = 0
+        threads.times do
+          Thread.new do
+            conn = ActiveRecord::Base.connection_pool.checkout
+            sleep 0.1
+            ActiveRecord::Base.connection_pool.checkin conn
+            @connection_count += 1
+          rescue ActiveRecord::ConnectionTimeoutError
+            @timed_out += 1
+          end.join
+        end
+      end
 
-  def test_pooled_connection_remove
-    ActiveRecord::Base.establish_connection(@connection.merge(pool: 2, checkout_timeout: 0.5))
-    old_connection = ActiveRecord::Base.connection
-    extra_connection = ActiveRecord::Base.connection_pool.checkout
-    ActiveRecord::Base.connection_pool.remove(extra_connection)
-    assert_equal ActiveRecord::Base.connection, old_connection
+      def checkout_checkin_connections_loop(pool_size, loops)
+        ActiveRecord::Base.establish_connection(@connection.merge(pool: pool_size, checkout_timeout: 0.5))
+        @connection_count = 0
+        @timed_out = 0
+        loops.times do
+          conn = ActiveRecord::Base.connection_pool.checkout
+          ActiveRecord::Base.connection_pool.checkin conn
+          @connection_count += 1
+          ActiveRecord::Base.lease_connection.data_sources
+        rescue ActiveRecord::ConnectionTimeoutError
+          @timed_out += 1
+        end
+      end
   end
-end unless in_memory_db?
+end

data/test/cases/prepared_statement_status_test.rb

@@ -7,8 +7,13 @@ require "models/entrant"
 module ActiveRecord
   class PreparedStatementStatusTest < ActiveRecord::TestCase
     def test_prepared_statement_status_is_thread_and_instance_specific
-      course_conn = Course.connection
-      entrant_conn = Entrant.connection
+      course_conn = Course.lease_connection
+      entrant_conn = Entrant.lease_connection
+      base_conn = ActiveRecord::Base.lease_connection
+
+      if base_conn.prepared_statements && (!course_conn.prepared_statements || !entrant_conn.prepared_statements)
+        skip "prepared statements are not uniformly enabled across leased connections"
+      end
 
       inside = Concurrent::Event.new
       preventing = Concurrent::Event.new
@@ -16,7 +21,7 @@ module ActiveRecord
 
       assert_not_same course_conn, entrant_conn
 
-      if ActiveRecord::Base.connection.prepared_statements
+      if ActiveRecord::Base.lease_connection.prepared_statements
         t1 = Thread.new do
           course_conn.unprepared_statement do
             inside.set

data/test/cases/primary_class_test.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require "cases/helper"
+
+class PrimaryClassTest < ActiveRecord::TestCase
+  self.use_transactional_tests = false
+
+  def teardown
+    clean_up_connection_handler
+  end
+
+  class PrimaryAppRecord < ActiveRecord::Base
+  end
+
+  class AnotherAppRecord < PrimaryAppRecord
+    self.abstract_class = true
+  end
+
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+
+  def test_application_record_is_used_if_no_primary_class_is_set
+    Object.const_set(:ApplicationRecord, ApplicationRecord)
+
+    assert_predicate ApplicationRecord, :primary_class?
+    assert_predicate ApplicationRecord, :application_record_class?
+    assert_predicate ApplicationRecord, :abstract_class?
+  ensure
+    ActiveRecord.application_record_class = nil
+    Object.send(:remove_const, :ApplicationRecord)
+  end
+
+  def test_primary_class_and_primary_abstract_class_behavior
+    PrimaryClassTest::PrimaryAppRecord.primary_abstract_class
+
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :primary_class?
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :application_record_class?
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :abstract_class?
+
+    assert_not_predicate AnotherAppRecord, :primary_class?
+    assert_not_predicate AnotherAppRecord, :application_record_class?
+    assert_predicate AnotherAppRecord, :abstract_class?
+
+    assert_predicate ActiveRecord::Base, :primary_class?
+    assert_not_predicate ActiveRecord::Base, :application_record_class?
+    assert_not_predicate ActiveRecord::Base, :abstract_class?
+  ensure
+    ActiveRecord.application_record_class = nil
+  end
+
+  def test_primary_abstract_class_cannot_be_reset
+    PrimaryClassTest::PrimaryAppRecord.primary_abstract_class
+
+    assert_raises do
+      PrimaryClassTest::AnotherAppRecord.primary_abstract_class
+    end
+  ensure
+    ActiveRecord.application_record_class = nil
+  end
+
+  def test_primary_abstract_class_is_used_over_application_record_if_set
+    PrimaryClassTest::PrimaryAppRecord.primary_abstract_class
+    Object.const_set(:ApplicationRecord, ApplicationRecord)
+
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :primary_class?
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :application_record_class?
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :abstract_class?
+
+    assert_not_predicate ApplicationRecord, :primary_class?
+    assert_not_predicate ApplicationRecord, :application_record_class?
+    assert_predicate ApplicationRecord, :abstract_class?
+
+    assert_predicate ActiveRecord::Base, :primary_class?
+    assert_not_predicate ActiveRecord::Base, :application_record_class?
+    assert_not_predicate ActiveRecord::Base, :abstract_class?
+  ensure
+    ActiveRecord.application_record_class = nil
+    Object.send(:remove_const, :ApplicationRecord)
+  end
+
+  def test_setting_primary_abstract_class_explicitly_wins_over_application_record_set_implicitly
+    Object.const_set(:ApplicationRecord, ApplicationRecord)
+
+    assert_predicate ApplicationRecord, :primary_class?
+    assert_predicate ApplicationRecord, :application_record_class?
+    assert_predicate ApplicationRecord, :abstract_class?
+
+    PrimaryClassTest::PrimaryAppRecord.primary_abstract_class
+
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :primary_class?
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :application_record_class?
+    assert_predicate PrimaryClassTest::PrimaryAppRecord, :abstract_class?
+
+    assert_not_predicate ApplicationRecord, :primary_class?
+    assert_not_predicate ApplicationRecord, :application_record_class?
+    assert_predicate ApplicationRecord, :abstract_class?
+  ensure
+    ActiveRecord.application_record_class = nil
+    Object.send(:remove_const, :ApplicationRecord)
+  end
+
+  unless in_memory_db?
+    def test_application_record_shares_a_connection_with_active_record_by_default
+      Object.const_set(:ApplicationRecord, ApplicationRecord)
+
+      ApplicationRecord.connects_to(database: { writing: :arunit, reading: :arunit })
+
+      assert_predicate ApplicationRecord, :primary_class?
+      assert_predicate ApplicationRecord, :application_record_class?
+      assert_equal ActiveRecord::Base.lease_connection, ApplicationRecord.lease_connection
+    ensure
+      ApplicationRecord.remove_connection
+      ActiveRecord.application_record_class = nil
+      Object.send(:remove_const, :ApplicationRecord)
+      ActiveRecord::Base.establish_connection :arunit
+    end
+
+    def test_application_record_shares_a_connection_with_the_primary_abstract_class_if_set
+      PrimaryClassTest::PrimaryAppRecord.primary_abstract_class
+
+      PrimaryClassTest::PrimaryAppRecord.connects_to(database: { writing: :arunit, reading: :arunit })
+
+      assert_predicate PrimaryClassTest::PrimaryAppRecord, :primary_class?
+      assert_predicate PrimaryClassTest::PrimaryAppRecord, :application_record_class?
+      assert_predicate PrimaryClassTest::PrimaryAppRecord, :abstract_class?
+      assert_equal ActiveRecord::Base.lease_connection, PrimaryClassTest::PrimaryAppRecord.lease_connection
+    ensure
+      PrimaryClassTest::PrimaryAppRecord.remove_connection
+      ActiveRecord.application_record_class = nil
+      ActiveRecord::Base.establish_connection :arunit
+    end
+  end
+end

data/test/cases/primary_keys_test.rb

@@ -10,6 +10,7 @@ require "models/keyboard"
 require "models/mixed_case_monkey"
 require "models/dashboard"
 require "models/non_primary_key"
+require "models/cpk"
 
 class PrimaryKeysTest < ActiveRecord::TestCase
   fixtures :topics, :subscribers, :movies, :mixed_case_monkeys
@@ -28,9 +29,36 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal keyboard.to_key, [keyboard.id]
   end
 
-  def test_read_attribute_with_custom_primary_key
+  def test_to_key_with_composite_primary_key
+    order = Cpk::Order.new
+    assert_equal [nil, nil], order.to_key
+    order.id = [1, 2]
+    assert_equal [1, 2], order.to_key
+  end
+
+  def test_read_attribute_id
+    topic = Topic.find(1)
+    id = assert_not_deprecated(ActiveRecord.deprecator) do
+      topic.read_attribute(:id)
+    end
+
+    assert_equal 1, id
+  end
+
+  def test_read_attribute_with_custom_primary_key_does_not_return_it_when_reading_the_id_attribute
     keyboard = Keyboard.create!
-    assert_equal keyboard.key_number, keyboard.read_attribute(:id)
+    id = keyboard.read_attribute(:id)
+
+    assert_nil id
+  end
+
+  def test_read_attribute_with_composite_primary_key
+    book = Cpk::Book.new(id: [1, 2])
+    id = assert_not_deprecated(ActiveRecord.deprecator) do
+      book.read_attribute(:id)
+    end
+
+    assert_equal 2, id
   end
 
   def test_to_key_with_primary_key_after_destroy
@@ -39,6 +67,24 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal [1], topic.to_key
   end
 
+  def test_id_was
+    topic = Topic.find(1)
+    assert_equal 1, topic.id
+
+    topic.id = 3
+
+    assert_equal 1, topic.id_was
+    assert_equal 3, topic.id
+  end
+
+  def test_id?
+    topic = Topic.find(1)
+
+    assert_changes("topic.id?", from: true, to: false) do
+      topic.id = nil
+    end
+  end
+
   def test_integer_key
     topic = Topic.find(1)
     assert_equal(topics(:first).author_name, topic.author_name)
@@ -174,9 +220,10 @@ class PrimaryKeysTest < ActiveRecord::TestCase
 
   def test_quoted_primary_key_after_set_primary_key
     k = Class.new(ActiveRecord::Base)
-    assert_equal k.connection.quote_column_name("id"), k.quoted_primary_key
+    k.table_name = "bar"
+    assert_equal k.lease_connection.quote_column_name("id"), k.quoted_primary_key
     k.primary_key = "foo"
-    assert_equal k.connection.quote_column_name("foo"), k.quoted_primary_key
+    assert_equal k.lease_connection.quote_column_name("foo"), k.quoted_primary_key
   end
 
   def test_auto_detect_primary_key_from_schema
@@ -194,13 +241,11 @@ class PrimaryKeysTest < ActiveRecord::TestCase
   end
 
   def test_create_without_primary_key_no_extra_query
-    skip if current_adapter?(:OracleAdapter, :IBM_DBAdapter)
-
     klass = Class.new(ActiveRecord::Base) do
       self.table_name = "dashboards"
     end
     klass.create! # warmup schema cache
-    assert_queries(3, ignore_none: true) { klass.create! }
+    assert_queries_count(3, include_schema: true) { klass.create! }
   end
 
   def test_assign_id_raises_error_if_primary_key_doesnt_exist
@@ -211,6 +256,28 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_raises(ActiveModel::MissingAttributeError) { dashboard.id = "1" }
   end
 
+  def test_reconfiguring_primary_key_resets_composite_primary_key
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = "cpk_books"
+    end
+
+    assert_predicate klass, :composite_primary_key?
+
+    klass.primary_key = :id
+    assert_not_predicate klass, :composite_primary_key?
+  end
+
+  def composite_primary_key_is_false_for_a_non_cpk_model
+    assert_not_predicate Dashboard, :composite_primary_key?
+  end
+
+  def test_primary_key_values_present
+    assert_predicate Topic.new(id: 1), :primary_key_values_present?
+
+    assert_not_predicate Topic.new, :primary_key_values_present?
+    assert_not_predicate Topic.new(title: "Topic A"), :primary_key_values_present?
+  end
+
   if current_adapter?(:PostgreSQLAdapter)
     def test_serial_with_quoted_sequence_name
       column = MixedCaseMonkey.columns_hash[MixedCaseMonkey.primary_key]
@@ -226,25 +293,6 @@ class PrimaryKeysTest < ActiveRecord::TestCase
   end
 end
 
-class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase
-  self.use_transactional_tests = false
-
-  unless in_memory_db?
-    def test_set_primary_key_with_no_connection
-      connection = ActiveRecord::Base.remove_connection
-
-      model = Class.new(ActiveRecord::Base)
-      model.primary_key = "foo"
-
-      assert_equal "foo", model.primary_key
-
-      ActiveRecord::Base.establish_connection(connection)
-
-      assert_equal "foo", model.primary_key
-    end
-  end
-end
-
 class PrimaryKeyWithAutoIncrementTest < ActiveRecord::TestCase
   self.use_transactional_tests = false
 
@@ -252,7 +300,7 @@ class PrimaryKeyWithAutoIncrementTest < ActiveRecord::TestCase
   end
 
   def setup
-    @connection = ActiveRecord::Base.connection
+    @connection = ActiveRecord::Base.lease_connection
   end
 
   def teardown
@@ -285,13 +333,11 @@ end
 class PrimaryKeyAnyTypeTest < ActiveRecord::TestCase
   include SchemaDumpingHelper
 
-  self.use_transactional_tests = false
-
   class Barcode < ActiveRecord::Base
   end
 
   setup do
-    @connection = ActiveRecord::Base.connection
+    @connection = ActiveRecord::Base.lease_connection
     @connection.create_table(:barcodes, primary_key: "code", id: :string, limit: 42, force: true)
   end
 
@@ -316,11 +362,11 @@ class PrimaryKeyAnyTypeTest < ActiveRecord::TestCase
     assert_no_match %r{t\.index \["code"\]}, schema
   end
 
-  if current_adapter?(:Mysql2Adapter) && supports_datetime_with_precision?
+  if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
     test "schema typed primary key column" do
       @connection.create_table(:scheduled_logs, id: :timestamp, precision: 6, force: true)
       schema = dump_table_schema("scheduled_logs")
-      assert_match %r/create_table "scheduled_logs", id: { type: :timestamp, precision: 6.* }/, schema
+      assert_match %r/create_table "scheduled_logs", id: :timestamp.*/, schema
     end
   end
 end
@@ -330,20 +376,22 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase
 
   self.use_transactional_tests = false
 
+  fixtures :cpk_books, :cpk_orders
+
   def setup
-    @connection = ActiveRecord::Base.connection
-    @connection.schema_cache.clear!
+    ActiveRecord::Base.schema_cache.clear!
+    @connection = ActiveRecord::Base.lease_connection
     @connection.create_table(:uber_barcodes, primary_key: ["region", "code"], force: true) do |t|
-      t.string :region, null: false
-      t.integer :code, null: false
+      t.string :region
+      t.integer :code
     end
     @connection.create_table(:barcodes_reverse, primary_key: ["code", "region"], force: true) do |t|
-      t.string :region, null: false
-      t.integer :code, null: false
+      t.string :region
+      t.integer :code
     end
     @connection.create_table(:travels, primary_key: ["from", "to"], force: true) do |t|
-      t.string :from, null: false
-      t.string :to, null: false
+      t.string :from
+      t.string :to
     end
   end
 
@@ -354,7 +402,6 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase
   end
 
   def test_composite_primary_key
-    pri =  @connection.primary_keys("uber_barcodes")
     assert_equal ["region", "code"], @connection.primary_keys("uber_barcodes")
   end
 
@@ -366,16 +413,66 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase
     assert_equal ["code", "region"], @connection.primary_keys("barcodes_reverse")
   end
 
-  def test_primary_key_issues_warning
+  def test_assigning_a_composite_primary_key
+    book = Cpk::Book.new
+    book.id = [1, 2]
+    book.save!
+
+    assert_equal [1, 2], book.id
+  ensure
+    Cpk::Book.delete_all
+  end
+
+  def test_assigning_a_non_array_value_to_model_with_composite_primary_key_raises
+    book = Cpk::Book.new
+
+    error = assert_raises(TypeError) do
+      book.id = 1
+    end
+
+    assert_equal("Expected value matching [\"author_id\", \"id\"], got 1.", error.message)
+  end
+
+  def test_id_was_composite
+    book = cpk_books(:cpk_great_author_first_book)
+    book_id = book.id
+
+    assert_not_equal [42, 42], book_id
+
+    book.id = [42, 42]
+
+    assert_equal book_id, book.id_was
+    assert_equal [42, 42], book.id
+  end
+
+  def test_id_predicate_composite
+    book = cpk_books(:cpk_great_author_first_book)
+
+    valid_id = [42, 42]
+
+    invalid_ids = [
+      [42, nil],
+      [nil, 42],
+      [nil, nil],
+    ]
+
+    invalid_ids.each do |invalid_id|
+      book.id = valid_id
+
+      assert_changes("book.id?", from: true, to: false) do
+        book.id = invalid_id
+      end
+    end
+  end
+
+  def test_derives_composite_primary_key
     model = Class.new(ActiveRecord::Base) do
       def self.table_name
         "uber_barcodes"
       end
     end
-    warning = capture(:stderr) do
-      assert_nil model.primary_key
-    end
-    assert_match(/WARNING: Active Record does not support composite primary key\./, warning)
+
+    assert_equal ["region", "code"], model.primary_key
   end
 
   def test_collectly_dump_composite_primary_key
@@ -387,15 +484,32 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase
     schema = dump_table_schema "barcodes_reverse"
     assert_match %r{create_table "barcodes_reverse", primary_key: \["code", "region"\]}, schema
   end
+
+  def test_model_with_a_composite_primary_key
+    assert_equal(["author_id", "id"], Cpk::Book.primary_key)
+    assert_equal(["shop_id", "id"], Cpk::Order.primary_key)
+  end
+
+  def composite_primary_key_is_true_for_a_cpk_model
+    assert_predicate Cpk::Book, :composite_primary_key?
+  end
+
+  def test_primary_key_values_present_for_a_composite_pk_model
+    assert_predicate Cpk::Book.new(id: [1, 1]), :primary_key_values_present?
+
+    assert_not_predicate Cpk::Book.new, :primary_key_values_present?
+    assert_not_predicate Cpk::Book.new(author_id: 1), :primary_key_values_present?
+    assert_not_predicate Cpk::Book.new(id: [nil, 1]), :primary_key_values_present?
+    assert_not_predicate Cpk::Book.new(title: "Book A"), :primary_key_values_present?
+    assert_not_predicate Cpk::Book.new(author_id: 1, title: "Book A"), :primary_key_values_present?
+  end
 end
 
 class PrimaryKeyIntegerNilDefaultTest < ActiveRecord::TestCase
   include SchemaDumpingHelper
 
-  self.use_transactional_tests = false
-
   def setup
-    @connection = ActiveRecord::Base.connection
+    @connection = ActiveRecord::Base.lease_connection
   end
 
   def teardown
@@ -403,10 +517,12 @@ class PrimaryKeyIntegerNilDefaultTest < ActiveRecord::TestCase
   end
 
   def test_schema_dump_primary_key_integer_with_default_nil
-    skip if current_adapter?(:SQLite3Adapter, :IBM_DBAdapter)
     @connection.create_table(:int_defaults, id: :integer, default: nil, force: true)
     schema = dump_table_schema "int_defaults"
-    assert_match %r{create_table "int_defaults", id: :integer, default: nil}, schema
+    assert_match(
+      %r{create_table "int_defaults", (?:id: :integer, default: nil|force: :cascade)},
+      schema
+    )
   end
 
   def test_schema_dump_primary_key_bigint_with_default_nil
@@ -416,8 +532,8 @@ class PrimaryKeyIntegerNilDefaultTest < ActiveRecord::TestCase
   end
 end
 
-if current_adapter?(:PostgreSQLAdapter, :Mysql2Adapter)
-  class PrimaryKeyIntegerTest < ActiveRecord::TestCase
+class PrimaryKeyIntegerTest < ActiveRecord::TestCase
+  if current_adapter?(:PostgreSQLAdapter, :Mysql2Adapter, :TrilogyAdapter)
     include SchemaDumpingHelper
 
     self.use_transactional_tests = false
@@ -426,7 +542,7 @@ if current_adapter?(:PostgreSQLAdapter, :Mysql2Adapter)
     end
 
     setup do
-      @connection = ActiveRecord::Base.connection
+      @connection = ActiveRecord::Base.lease_connection
       @pk_type = current_adapter?(:PostgreSQLAdapter) ? :serial : :integer
     end
 
@@ -453,7 +569,7 @@ if current_adapter?(:PostgreSQLAdapter, :Mysql2Adapter)
       assert_match %r{create_table "widgets", id: :#{@pk_type}, }, schema
     end
 
-    if current_adapter?(:Mysql2Adapter)
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
       test "primary key column type with options" do
         @connection.create_table(:widgets, id: :primary_key, limit: 4, unsigned: true, force: true)
         column = @connection.columns(:widgets).find { |c| c.name == "id" }