composite_primary_keys 14.0.3 → 14.0.9

data/lib/composite_primary_keys/relation/query_methods.rb

@@ -18,23 +18,21 @@ module CompositePrimaryKeys
         end
 
         order_query.flat_map do |o|
-          order_query.flat_map do |o|
-            case o
-            when Arel::Attribute
-              o.desc
-            when Arel::Nodes::Ordering
-              o.reverse
-            when String
-              if does_not_support_reverse?(o)
-                raise IrreversibleOrderError, "Order #{o.inspect} can not be reversed automatically"
-              end
-              o.split(",").map! do |s|
-                s.strip!
-                s.gsub!(/\sasc\Z/i, " DESC") || s.gsub!(/\sdesc\Z/i, " ASC") || (s << " DESC")
-              end
-            else
-              o
+          case o
+          when Arel::Attribute
+            o.desc
+          when Arel::Nodes::Ordering
+            o.reverse
+          when String
+            if does_not_support_reverse?(o)
+              raise IrreversibleOrderError, "Order #{o.inspect} can not be reversed automatically"
             end
+            o.split(",").map! do |s|
+              s.strip!
+              s.gsub!(/\sasc\Z/i, " DESC") || s.gsub!(/\sdesc\Z/i, " ASC") || (s << " DESC")
+            end
+          else
+            o
           end
         end
       end

data/lib/composite_primary_keys/relation.rb

@@ -29,7 +29,7 @@ module ActiveRecord
       stmt.key = table[primary_key]
 
       # CPK
-      if @klass.composite? && @klass.connection.visitor.compile(stmt.ast) =~ /['"]#{primary_key.to_s}['"]/
+      if @klass.composite?
         stmt = Arel::UpdateManager.new
         stmt.table(arel_table)
         cpk_subquery(stmt)
@@ -74,7 +74,7 @@ module ActiveRecord
       stmt.key = table[primary_key]
 
       # CPK
-      if @klass.composite? && @klass.connection.visitor.compile(stmt.ast) =~ /['"]#{primary_key.to_s}['"]/
+      if @klass.composite?
         stmt = Arel::DeleteManager.new
         stmt.from(arel_table)
         cpk_subquery(stmt)
@@ -102,6 +102,8 @@ module ActiveRecord
       # database adapter to decide how to proceed.
       if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) && connection.is_a?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
         cpk_mysql_subquery(stmt)
+      elsif defined?(ActiveRecord::ConnectionAdapters::TrilogyAdapter) && connection.is_a?(ActiveRecord::ConnectionAdapters::TrilogyAdapter)
+        cpk_mysql_subquery(stmt)
       elsif defined?(ActiveRecord::ConnectionAdapters::SQLServerAdapter) && connection.is_a?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
         cpk_exists_subquery(stmt)
       else

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -18,7 +18,15 @@ module ActiveRecord
           end
         end
         relation = scope_relation(record, relation)
-        relation = relation.merge(options[:conditions]) if options[:conditions]
+        if options[:conditions]
+          conditions = options[:conditions]
+
+          relation = if conditions.arity.zero?
+            relation.instance_exec(&conditions)
+          else
+            relation.instance_exec(record, &conditions)
+          end
+        end
 
         if relation.exists?
           error_options = options.except(:case_sensitive, :scope, :conditions)
@@ -29,4 +37,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 14
     MINOR = 0
-    TINY  = 3
+    TINY  = 9
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/lib/composite_primary_keys.rb

@@ -1,119 +1,117 @@
-#--
-# Copyright (c) 2006-2016 Nic Williams and Charlie Savage
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-unless defined?(ActiveRecord)
-  require 'rubygems'
-  gem 'activerecord', '~>7.0.0', '>= 7.0.1'
-  require 'active_record'
-end
-
-# ActiveModel files we override
-# _write_attribute
-require 'active_model/attribute_assignment'
-
-# ActiveRecord files we override
-require 'active_record/attribute_methods'
-require 'active_record/autosave_association'
-require 'active_record/counter_cache'
-require 'active_record/fixtures'
-require 'active_record/model_schema'
-require 'active_record/persistence'
-require 'active_record/reflection'
-require 'active_record/relation'
-require 'active_record/sanitization'
-require 'active_record/transactions'
-
-require 'active_record/associations/association'
-require 'active_record/associations/association_scope'
-require 'active_record/associations/foreign_association'
-require 'active_record/associations/has_many_association'
-require 'active_record/associations/has_many_through_association'
-require 'active_record/associations/join_dependency'
-require 'active_record/associations/preloader/association'
-require 'active_record/associations/singular_association'
-require 'active_record/associations/collection_association'
-require 'active_record/associations/through_association'
-
-require 'active_record/attribute_methods/primary_key'
-require 'active_record/attribute_methods/read'
-require 'active_record/attribute_methods/write'
-require 'active_record/nested_attributes'
-
-require 'active_record/connection_adapters/abstract/database_statements'
-require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/postgresql/database_statements'
-
-require 'active_record/relation/where_clause'
-require 'active_record/table_metadata'
-
-# CPK overrides
-require_relative 'composite_primary_keys/active_model/attribute_assignment'
-require_relative 'composite_primary_keys/attribute_methods'
-require_relative 'composite_primary_keys/autosave_association'
-require_relative 'composite_primary_keys/persistence'
-require_relative 'composite_primary_keys/base'
-require_relative 'composite_primary_keys/core'
-require_relative 'composite_primary_keys/composite_arrays'
-require_relative 'composite_primary_keys/composite_predicates'
-require_relative 'composite_primary_keys/counter_cache'
-require_relative 'composite_primary_keys/fixtures'
-require_relative 'composite_primary_keys/reflection'
-require_relative 'composite_primary_keys/relation'
-require_relative 'composite_primary_keys/sanitization'
-require_relative 'composite_primary_keys/transactions'
-require_relative 'composite_primary_keys/version'
-
-require_relative 'composite_primary_keys/associations/association'
-require_relative 'composite_primary_keys/associations/association_scope'
-require_relative 'composite_primary_keys/associations/foreign_association'
-require_relative 'composite_primary_keys/associations/has_many_association'
-require_relative 'composite_primary_keys/associations/has_many_through_association'
-require_relative 'composite_primary_keys/associations/join_association'
-require_relative 'composite_primary_keys/associations/preloader/association'
-require_relative 'composite_primary_keys/associations/collection_association'
-require_relative 'composite_primary_keys/associations/through_association'
-
-require_relative 'composite_primary_keys/attribute_methods/primary_key'
-require_relative 'composite_primary_keys/attribute_methods/read'
-require_relative 'composite_primary_keys/attribute_methods/write'
-require_relative 'composite_primary_keys/nested_attributes'
-
-require_relative 'composite_primary_keys/connection_adapters/abstract/database_statements'
-require_relative 'composite_primary_keys/connection_adapters/abstract_adapter'
-require_relative 'composite_primary_keys/connection_adapters/postgresql/database_statements'
-require_relative 'composite_primary_keys/connection_adapters/sqlserver/database_statements'
-
-require_relative 'composite_primary_keys/relation/batches'
-require_relative 'composite_primary_keys/relation/where_clause'
-require_relative 'composite_primary_keys/relation/calculations'
-require_relative 'composite_primary_keys/relation/finder_methods'
-require_relative 'composite_primary_keys/relation/predicate_builder/association_query_value'
-require_relative 'composite_primary_keys/relation/query_methods'
-
-require_relative 'composite_primary_keys/validations/uniqueness'
-
-require_relative 'composite_primary_keys/composite_relation'
-
-require_relative 'composite_primary_keys/arel/to_sql'
-require_relative 'composite_primary_keys/arel/sqlserver'
-require_relative 'composite_primary_keys/table_metadata'
+#--
+# Copyright (c) 2006-2016 Nic Williams and Charlie Savage
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+unless defined?(ActiveRecord)
+  require 'rubygems'
+  gem 'activerecord', '~>7.0.0', '>= 7.0.1'
+  require 'active_record'
+end
+
+# ActiveModel files we override
+# _write_attribute
+require 'active_model/attribute_assignment'
+
+# ActiveRecord files we override
+require 'active_record/attribute_methods'
+require 'active_record/autosave_association'
+require 'active_record/counter_cache'
+require 'active_record/fixtures'
+require 'active_record/model_schema'
+require 'active_record/persistence'
+require 'active_record/reflection'
+require 'active_record/relation'
+require 'active_record/sanitization'
+require 'active_record/transactions'
+
+require 'active_record/associations/association'
+require 'active_record/associations/association_scope'
+require 'active_record/associations/foreign_association'
+require 'active_record/associations/has_many_association'
+require 'active_record/associations/has_many_through_association'
+require 'active_record/associations/join_dependency'
+require 'active_record/associations/preloader/association'
+require 'active_record/associations/singular_association'
+require 'active_record/associations/collection_association'
+
+require 'active_record/attribute_methods/primary_key'
+require 'active_record/attribute_methods/read'
+require 'active_record/attribute_methods/write'
+require 'active_record/nested_attributes'
+
+require 'active_record/connection_adapters/abstract/database_statements'
+require 'active_record/connection_adapters/abstract_adapter'
+require 'active_record/connection_adapters/postgresql/database_statements'
+
+require 'active_record/relation/where_clause'
+require 'active_record/table_metadata'
+
+# CPK overrides
+require_relative 'composite_primary_keys/active_model/attribute_assignment'
+require_relative 'composite_primary_keys/attribute_methods'
+require_relative 'composite_primary_keys/autosave_association'
+require_relative 'composite_primary_keys/persistence'
+require_relative 'composite_primary_keys/base'
+require_relative 'composite_primary_keys/core'
+require_relative 'composite_primary_keys/composite_arrays'
+require_relative 'composite_primary_keys/composite_predicates'
+require_relative 'composite_primary_keys/counter_cache'
+require_relative 'composite_primary_keys/fixtures'
+require_relative 'composite_primary_keys/reflection'
+require_relative 'composite_primary_keys/relation'
+require_relative 'composite_primary_keys/sanitization'
+require_relative 'composite_primary_keys/transactions'
+require_relative 'composite_primary_keys/version'
+
+require_relative 'composite_primary_keys/associations/association'
+require_relative 'composite_primary_keys/associations/association_scope'
+require_relative 'composite_primary_keys/associations/foreign_association'
+require_relative 'composite_primary_keys/associations/has_many_association'
+require_relative 'composite_primary_keys/associations/has_many_through_association'
+require_relative 'composite_primary_keys/associations/join_association'
+require_relative 'composite_primary_keys/associations/preloader/association'
+require_relative 'composite_primary_keys/associations/collection_association'
+
+require_relative 'composite_primary_keys/attribute_methods/primary_key'
+require_relative 'composite_primary_keys/attribute_methods/read'
+require_relative 'composite_primary_keys/attribute_methods/write'
+require_relative 'composite_primary_keys/nested_attributes'
+
+require_relative 'composite_primary_keys/connection_adapters/abstract/database_statements'
+require_relative 'composite_primary_keys/connection_adapters/abstract_adapter'
+require_relative 'composite_primary_keys/connection_adapters/postgresql/database_statements'
+require_relative 'composite_primary_keys/connection_adapters/sqlserver/database_statements'
+
+require_relative 'composite_primary_keys/relation/batches'
+require_relative 'composite_primary_keys/relation/where_clause'
+require_relative 'composite_primary_keys/relation/calculations'
+require_relative 'composite_primary_keys/relation/finder_methods'
+require_relative 'composite_primary_keys/relation/predicate_builder/association_query_value'
+require_relative 'composite_primary_keys/relation/query_methods'
+
+require_relative 'composite_primary_keys/validations/uniqueness'
+
+require_relative 'composite_primary_keys/composite_relation'
+
+require_relative 'composite_primary_keys/arel/to_sql'
+require_relative 'composite_primary_keys/arel/sqlserver'
+require_relative 'composite_primary_keys/table_metadata'

data/scripts/console.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #
-# if run as script, load the file as library while starting irb 
+# if run as script, load the file as library while starting irb
 #
 if __FILE__ == $0
   irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
@@ -12,7 +12,7 @@ end
 #
 # check if the given adapter is supported (default: mysql)
 #
-adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
+adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db trilogy]
 adapter = ENV['ADAPTER'] || 'mysql'
 unless adapters.include? adapter
   puts "Usage: #{__FILE__} <adapter>"

data/tasks/databases/trilogy.rake

@@ -0,0 +1,23 @@
+namespace :trilogy do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :trilogy)
+  end
+
+  task :create_database => :setup do
+    Rake::Task["mysql:create_database"].invoke
+  end
+
+  desc 'Build the MySQL test database'
+  task :build_database => [:create_database] do
+    Rake::Task["mysql:build_database"].invoke
+  end
+
+  desc 'Drop the MySQL test database'
+  task :drop_database => :setup do
+    Rake::Task["mysql:drop_database"].invoke
+  end
+
+  desc 'Rebuild the MySQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/test/abstract_unit.rb

@@ -1,118 +1,124 @@
-spec_name = ENV['ADAPTER'] || 'postgresql'
-require 'bundler'
-require 'minitest/autorun'
-
-Bundler.setup(:default, spec_name.to_sym)
-Bundler.require(:default, spec_name.to_sym)
-require 'composite_primary_keys'
-
-# Require the connection spec
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
-puts "Loaded #{spec_name}"
-
-# And now connect to the database
-ActiveRecord::Base.establish_connection(spec)
-
-# Tell active record about the configuration
-ActiveRecord::Base.configurations = {test: spec}
-
-# Tell ActiveRecord where to find models
-ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
-Dir[File.join(PROJECT_ROOT, 'test', 'fixtures', '*.rb')].each do |file_path|
-  require_file = file_path.sub(PROJECT_ROOT, '..').sub('.rb', '')
-  require_relative require_file
-end
-
-I18n.config.enforce_available_locales = true
-
-class ActiveSupport::TestCase
-  include ActiveRecord::TestFixtures
-
-  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
-  self.use_instantiated_fixtures = false
-  self.use_transactional_tests = true
-  self.test_order = :random
-
-  def assert_date_from_db(expected, actual, message = nil)
-    # SQL Server doesn't have a separate column type just for dates,
-    # so the time is in the string and incorrectly formatted
-    if current_adapter?(:SQLServerAdapter)
-      assert_equal expected.strftime('%Y/%m/%d 00:00:00'), actual.strftime('%Y/%m/%d 00:00:00')
-    elsif current_adapter?(:SybaseAdapter)
-      assert_equal expected.to_s, actual.to_date.to_s, message
-    else
-      assert_equal expected.to_s, actual.to_s, message
-    end
-  end
-
-  def assert_queries(num = 1)
-    ActiveRecord::Base.connection.class.class_eval do
-      self.query_count = 0
-      alias_method :execute, :execute_with_query_counting
-    end
-    yield
-  ensure
-    ActiveRecord::Base.connection.class.class_eval do
-      alias_method :execute, :execute_without_query_counting
-    end
-    assert_equal num, ActiveRecord::Base.connection.query_count, '#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed.'
-  end
-
-  def assert_no_queries(&block)
-    assert_queries(0, &block)
-  end
-
-  cattr_accessor :classes
-
-  protected
-
-  def testing_with(&block)
-    classes.keys.each do |key_test|
-      @key_test = key_test
-      @klass_info = classes[@key_test]
-      @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
-      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      @first = @klass.order(order).first
-      yield
-    end
-  end
-
-  def first_id
-    ids = (1..@primary_keys.length).map {|num| 1}
-    composite? ? ids.to_composite_ids : ids.first
-  end
-
-  def composite?
-    @key_test != :single
-  end
-
-  # Oracle metadata is in all caps.
-  def with_quoted_identifiers(s)
-    s.gsub(/'(\w+)'/) { |m|
-      if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
-        m.upcase
-      else
-        m
-      end
-    }
-  end
-end
-
-def current_adapter?(type)
-  ActiveRecord::ConnectionAdapters.const_defined?(type) &&
-    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
-end
-
-ActiveRecord::Base.connection.class.class_eval do
-  cattr_accessor :query_count
-  alias_method :execute_without_query_counting, :execute
-  def execute_with_query_counting(sql, name = nil)
-    self.query_count += 1
-    execute_without_query_counting(sql, name)
-  end
-end
-
-ActiveRecord::Base.logger = Logger.new(ENV['CPK_LOGFILE'] || STDOUT)
+spec_name = ENV['ADAPTER'] || 'postgresql'
+require 'bundler'
+require 'minitest/autorun'
+
+Bundler.setup(:default, spec_name.to_sym)
+Bundler.require(:default, spec_name.to_sym)
+require 'composite_primary_keys'
+
+# Require the connection spec
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
+spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
+puts "Loaded #{spec_name}"
+
+# And now connect to the database
+if spec_name == "trilogy"
+  require "activerecord-trilogy-adapter"
+  require "trilogy_adapter/connection"
+  ActiveRecord::Base.extend TrilogyAdapter::Connection
+end
+
+ActiveRecord::Base.establish_connection(spec)
+
+# Tell active record about the configuration
+ActiveRecord::Base.configurations = {test: spec}
+
+# Tell ActiveRecord where to find models
+ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
+Dir[File.join(PROJECT_ROOT, 'test', 'fixtures', '*.rb')].each do |file_path|
+  require_file = file_path.sub(PROJECT_ROOT, '..').sub('.rb', '')
+  require_relative require_file
+end
+
+I18n.config.enforce_available_locales = true
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+
+  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
+  self.use_instantiated_fixtures = false
+  self.use_transactional_tests = true
+  self.test_order = :random
+
+  def assert_date_from_db(expected, actual, message = nil)
+    # SQL Server doesn't have a separate column type just for dates,
+    # so the time is in the string and incorrectly formatted
+    if current_adapter?(:SQLServerAdapter)
+      assert_equal expected.strftime('%Y/%m/%d 00:00:00'), actual.strftime('%Y/%m/%d 00:00:00')
+    elsif current_adapter?(:SybaseAdapter)
+      assert_equal expected.to_s, actual.to_date.to_s, message
+    else
+      assert_equal expected.to_s, actual.to_s, message
+    end
+  end
+
+  def assert_queries(num = 1)
+    ActiveRecord::Base.connection.class.class_eval do
+      self.query_count = 0
+      alias_method :execute, :execute_with_query_counting
+    end
+    yield
+  ensure
+    ActiveRecord::Base.connection.class.class_eval do
+      alias_method :execute, :execute_without_query_counting
+    end
+    assert_equal num, ActiveRecord::Base.connection.query_count, '#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed.'
+  end
+
+  def assert_no_queries(&block)
+    assert_queries(0, &block)
+  end
+
+  cattr_accessor :classes
+
+  protected
+
+  def testing_with(&block)
+    classes.keys.each do |key_test|
+      @key_test = key_test
+      @klass_info = classes[@key_test]
+      @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      @first = @klass.order(order).first
+      yield
+    end
+  end
+
+  def first_id
+    ids = (1..@primary_keys.length).map {|num| 1}
+    composite? ? ids.to_composite_ids : ids.first
+  end
+
+  def composite?
+    @key_test != :single
+  end
+
+  # Oracle metadata is in all caps.
+  def with_quoted_identifiers(s)
+    s.gsub(/'(\w+)'/) { |m|
+      if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
+        m.upcase
+      else
+        m
+      end
+    }
+  end
+end
+
+def current_adapter?(type)
+  ActiveRecord::ConnectionAdapters.const_defined?(type) &&
+    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
+end
+
+ActiveRecord::Base.connection.class.class_eval do
+  cattr_accessor :query_count
+  alias_method :execute_without_query_counting, :execute
+  def execute_with_query_counting(sql, name = nil)
+    self.query_count += 1
+    execute_without_query_counting(sql, name)
+  end
+end
+
+ActiveRecord::Base.logger = Logger.new(ENV['CPK_LOGFILE'] || STDOUT)

data/test/connections/databases.ci.yml

@@ -20,3 +20,13 @@ sqlite:
   adapter: sqlite3
   database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
 
+trilogy:
+  adapter: trilogy
+  username: github
+  password: github
+  host: 127.0.0.1
+  port: 3306
+  encoding: utf8mb4
+  charset: utf8mb4
+  collation: utf8mb4_bin
+  database: composite_primary_keys_unittest

data/test/fixtures/admin.rb

@@ -0,0 +1,4 @@
+class Admin < ActiveRecord::Base
+  belongs_to :moderator, :foreign_key => :id, :inverse_of => :admin
+  has_one :user, :through => :moderator
+end