composite_primary_keys 14.0.5 → 14.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4feff3a4f8ce272695c7a081666b99f3e9b79b206dce5acf9728c0c2c0cb2d9a
-  data.tar.gz: f5d7533a624427d056ad9fd7576242a2b6318ed584939bea834de44bd8d618af
+  metadata.gz: de97dfff0f237f22dd32a32189824739087b30c0ea0e14cdd996bd8b69359caf
+  data.tar.gz: 722a9e0d02b6fa8ee2010d47e5a37705a43b302df6abf7c7a6d199b0a84b0201
 SHA512:
-  metadata.gz: a2e52091afe3577f46df1e0093ad6d4d6167a250e27ec7776af7706b8ec01fce0539f15a0bcaa1d12273ac2ed8055cddcc6fef5536b5e7ae8761d4158c2f9a6a
-  data.tar.gz: 8159181dd45c05ba6aad2a57ff482bdf8471904d6990517e04a992bc177e42b5cb201dfb48ff7e645ecfb2e23270ed129a9a6666b87a6412d07a3163200e4d72
+  metadata.gz: e57b5330dc2b0cdb7374f14ed6c7efed22c269cf42298527efc1ec26ee2e2ea8ab9edd97e97a7f4c656662e54a1faa5da28fef365c602060878d375e4caa646a
+  data.tar.gz: c2981385774399cdd3e64385d9f7595dd2a3972706b04e825b604f83ed4fe59438df2f114f196ff0fb6ceb389060554259cab7132c2a75073a382101da533bd0

data/History.rdoc

@@ -1,3 +1,13 @@
+== 14.0.7 (2023-11-04)
+* Add support for Trilogy Adapter (Zack Mariscal)
+* Add Dockerfile and Docker compose support (Zack Mariscal)
+* Support polymorphic_name (Vladimir Kochnev)
+* Fix HasOneThrough association (kyori19)
+
+== 14.0.6 (2023-02-04)
+* Port fix for #573 (Charlie Savage)
+* Port fix for fix #577 (Charlie Savage)
+
 == 14.0.5 (2023-02-04)
 * Improve query generation for cpk_in_predicate. This reduces the length of
 queries when loading many keys and enables Postgres to use index scans
@@ -27,6 +37,17 @@ more frequently. (Andrew Kiellor)
 == 14.0.0 (2022-01-9)
 * Update to ActiveRecord 7.0 (Sammy Larbi)
 
+== 13.0.7 (2023-02-04)
+* Fix #573 (Charlie Savage)
+
+== 13.0.6 (2023-02-04)
+* Fix #577 (Charlie Savage)
+
+== 13.0.5 (2023-02-04)
+* Improve query generation for cpk_in_predicate. This reduces the length of
+queries when loading many keys and enables Postgres to use index scans
+more frequently. (Andrew Kiellor)
+
 == 13.0.4 (2022-12-05)
 * Fix previously_new_record? not being set to true after create (Akinori MUSHA)
 

data/Rakefile

@@ -23,7 +23,7 @@ Dir.glob('tasks/**/*.rake').each do |rake_file|
 end
 
 # Set up test tasks for each supported connection adapter
-%w(mysql sqlite oracle oracle_enhanced postgresql ibm_db sqlserver).each do |adapter|
+%w(mysql sqlite oracle oracle_enhanced postgresql ibm_db sqlserver trilogy).each do |adapter|
   namespace adapter do
     desc "Run tests using the #{adapter} adapter"
     task "test" do

data/lib/composite_primary_keys/associations/association.rb

@@ -11,8 +11,8 @@ module ActiveRecord
             attributes[key1] = owner[key2]
           end
 
-          if reflection.options[:as]
-            attributes[reflection.type] = owner.class.base_class.name
+          if reflection.type
+            attributes[reflection.type] = owner.class.polymorphic_name
           end
         end
 

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -64,4 +64,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/associations/has_many_through_association.rb

@@ -23,6 +23,25 @@ module ActiveRecord
           end
         end
       end
+
+      alias :original_construct_join_attributes :construct_join_attributes
+
+      def construct_join_attributes(*records)
+        # CPK
+        if !self.source_reflection.polymorphic? && source_reflection.klass.composite?
+          ensure_mutable
+
+          ids = records.map do |record|
+            source_reflection.association_primary_key(reflection.klass).map do |key|
+              record.send(key)
+            end
+          end
+
+          cpk_in_predicate(through_association.scope.klass.arel_table, source_reflection.foreign_key, ids)
+        else
+          original_construct_join_attributes(*records)
+        end
+      end
     end
   end
 end

data/lib/composite_primary_keys/associations/preloader/association.rb

@@ -46,22 +46,6 @@ module ActiveRecord
             (result[key] ||= []) << owner if key
           end
         end
-
-        # TODO: is records_by_owner needed anymore? Rails' implementation has changed significantly
-        def records_by_owner
-          @records_by_owner ||= preloaded_records.each_with_object({}) do |record, result|
-            key = if association_key_name.is_a?(Array)
-                    Array(record[association_key_name]).map do |key|
-                      convert_key(key)
-                    end
-                  else
-                    convert_key(record[association_key_name])
-                  end
-            owners_by_key[key].each do |owner|
-              (result[owner] ||= []) << record
-            end
-          end
-        end
       end
     end
   end

data/lib/composite_primary_keys/connection_adapters/abstract/database_statements.rb

@@ -6,8 +6,7 @@ module ActiveRecord
         value = exec_insert(sql, name, binds, pk, sequence_name)
 
         return id_value if id_value
-
-        if pk.is_a?(Array) && !value.empty?
+        if pk.is_a?(Array) && value.respond_to?(:empty?) && !value.empty?
           # This is a CPK model and the query result is not empty. Thus we can figure out the new ids for each
           # auto incremented field
           pk.map {|key| value.first[key]}

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/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 14
     MINOR = 0
-    TINY  = 5
+    TINY  = 7
     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