composite_primary_keys 13.0.7 → 14.0.1

data/lib/composite_primary_keys.rb

@@ -1,119 +1,119 @@
-#--
-# 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', '~>6.1.0'
-  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'
+#--
+# 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_dependency'
+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'

data/test/abstract_unit.rb

@@ -1,114 +1,118 @@
-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')
-
-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
+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/fixtures/department.rb

@@ -1,16 +1,16 @@
-class Department < ActiveRecord::Base
-  self.primary_keys = :id, :location_id
-
-  has_many :employees,
-           # We intentionally redefine primary key for test purposes. #455
-           :primary_key =>  [:id, :location_id],
-           :foreign_key => [:department_id, :location_id]
-
-  has_many :comments, :through => :employees
-
-  has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
-                 # We intentionally redefine primary key for test purposes. #455
-                 :primary_key =>  [:id, :location_id],
-                 :foreign_key => [:department_id, :location_id]
-
-end
+class Department < ActiveRecord::Base
+  self.primary_keys = :id, :location_id
+
+  has_many :employees,
+           # We intentionally redefine primary key for test purposes. #455
+           :primary_key =>  [:id, :location_id],
+           :foreign_key => [:department_id, :location_id]
+
+  has_many :comments, :through => :employees
+
+  has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
+                 # We intentionally redefine primary key for test purposes. #455
+                 :primary_key =>  [:id, :location_id],
+                 :foreign_key => [:department_id, :location_id]
+
+end

data/test/fixtures/membership.rb

@@ -1,9 +1,9 @@
-class Membership < ActiveRecord::Base
-  self.primary_keys = :user_id, :group_id
-  belongs_to :user
-	belongs_to :group
-	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-  has_many :active_statuses, -> { where('membership_statuses.status = ?', 'Active') },
-           :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
+class Membership < ActiveRecord::Base
+  self.primary_keys = :user_id, :group_id
+  belongs_to :user
+	belongs_to :group
+	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :active_statuses, -> { where('membership_statuses.status = ?', 'Active') },
+           :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
 end

data/test/fixtures/room_assignment.rb

@@ -1,14 +1,14 @@
-class RoomAssignment < ActiveRecord::Base
-  self.primary_keys = :student_id, :dorm_id, :room_id
-  belongs_to :student
-  belongs_to :room, :foreign_key => [:dorm_id, :room_id], :primary_key => [:dorm_id, :room_id]
-  validates_uniqueness_of :student_id
-
-  before_destroy do |record|
-    puts record
-  end
-
-  after_destroy do |record|
-    puts record
-  end
+class RoomAssignment < ActiveRecord::Base
+  self.primary_keys = :student_id, :dorm_id, :room_id
+  belongs_to :student
+  belongs_to :room, :foreign_key => [:dorm_id, :room_id], :primary_key => [:dorm_id, :room_id]
+  validates_uniqueness_of :student_id
+
+  before_destroy do |record|
+    puts record
+  end
+
+  after_destroy do |record|
+    puts record
+  end
 end