composite_primary_keys 9.0.10 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 133a4025b9fe7ee82617de7c3c34373d8f52d38d5e88c03ab742ebd954bf6064
-  data.tar.gz: 579e4d9e564e4c9e40f976d0d56b76533296c8f7e5b5ba925d7244141604fb08
+SHA1:
+  metadata.gz: d393427145f3047288fffba8fc3434fa41518f4e
+  data.tar.gz: f828598d6e09660c798a7735510c5130084b85b9
 SHA512:
-  metadata.gz: 334933952b9a84db67746c48c074c38d197215fa607640e134bf7aedd564e122a0c809318fab4529e0ad5bd181081baa792395419b25a4b19149066122cdfdfc
-  data.tar.gz: 2820381f390429bbdf61b0a04434c0432faa88d2cffdb04c5cd74f9dfc26682893809531b2d4dc14b03620614bec0ce1a69e128624b6a511b5718b19e24c9970
+  metadata.gz: fb6c3cfc3c74ddd3eca736945a5e70cebc2a093e704d0407cbe2983670be5282958cffa24507069e623b1099984fceeb02864b55a76d29c3712bcfac91686a58
+  data.tar.gz: eeef7b365078357a92b2167f200458bde725b3b3e2032bb17d0799bd19a02e93314e758f89dcf97144d3d39a315cb22fa2120f9848d3496f9f2355190c447dd2

data/History.rdoc

@@ -1,14 +1,9 @@
-== 9.0.10 (2018-06-24)
-
-* Fix AR 5.0.7 (Jordan Owens)
-
-== 9.0.9 (2018-03-06)
-
-* Fix update statements that incorrectly pass NULL values for the primary key components (Sean Linsley)
-
-== 9.0.8 (2017-10-11)
+== 10.0.0 (2017-10-08)
 
+* Support ActiveRecord 5.1.x (Pinak Thakkar, Jordan Owens)
 * Fix Paper Trail compatibility (Sean Linsley)
+* Fix typo in Readme (Mike Gunderloy)
+* Improved sql server support (Artyom Nikolaev)
 
 == 9.0.7 (2017-05-22)
 

data/README.rdoc

@@ -12,7 +12,7 @@ to support composite keys.
 
 If you are using Rails add the following to your Gemfile:
 
-  gem 'composite_primary_keys', '=x.x.x' (see next section about what verison to use)
+  gem 'composite_primary_keys', '=x.x.x' (see next section about what version to use)
 
 == Versions
 
@@ -20,12 +20,13 @@ Every major version of ActiveRecord has included numerous internal changes.  As
 CPK has to be rewritten for each version of ActiveRecord.  To help keep
 things straight, here is the mapping:
 
-    Version 9.x is designed to work with ActiveRecord 5.0.x
-    Version 8.x is designed to work with ActiveRecord 4.2.x
-    Version 7.x is designed to work with ActiveRecord 4.1.x
-    Version 6.x is designed to work with ActiveRecord 4.0.x
-    Version 5.x is designed to work with ActiveRecord 3.2.x
-    Version 4.x is designed to work with ActiveRecord 3.1.x
+    Version 10.x is designed to work with ActiveRecord 5.1.x (note this is in progress)
+    Version  9.x is designed to work with ActiveRecord 5.0.x
+    Version  8.x is designed to work with ActiveRecord 4.2.x
+    Version  7.x is designed to work with ActiveRecord 4.1.x
+    Version  6.x is designed to work with ActiveRecord 4.0.x
+    Version  5.x is designed to work with ActiveRecord 3.2.x
+    Version  4.x is designed to work with ActiveRecord 3.1.x
 
 Run the following command to list available versions:
 
@@ -155,8 +156,8 @@ built-in rake task before running tests:
 
   rake sqlite:build_database
 
-Note not all tests currently pass on sqlite3.  These failures happen when trying to DELETE records where the query
-includes a JOIN.
+For sqlite3 to work correctly, you must manually require 'composite_primary_keys/connection_adapters/sqlite3_adapter' after
+loading the CPK gem.
 
 === SqlServer
 

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>5.0.0.beta3'
+  gem 'activerecord', '~>5.1.0'
   require 'active_record'
 end
 
@@ -38,7 +38,6 @@ require 'active_record/persistence'
 require 'active_record/relation'
 require 'active_record/sanitization'
 require 'active_record/attribute_methods'
-require 'active_record/autosave_association'
 
 require 'active_record/associations/association'
 require 'active_record/associations/association_scope'
@@ -51,6 +50,7 @@ require 'active_record/associations/preloader/belongs_to'
 require 'active_record/associations/singular_association'
 require 'active_record/associations/collection_association'
 
+require 'active_record/attribute_set/builder'
 require 'active_record/attribute_methods/primary_key'
 require 'active_record/attribute_methods/read'
 require 'active_record/attribute_methods/write'
@@ -59,12 +59,12 @@ require 'active_record/nested_attributes'
 
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/abstract_mysql_adapter'
+require 'active_record/connection_adapters/postgresql/database_statements'
 
 require 'active_record/relation/batches'
 require 'active_record/relation/where_clause'
 require 'active_record/relation/calculations'
 require 'active_record/relation/finder_methods'
-require 'active_record/relation/predicate_builder'
 require 'active_record/relation/query_methods'
 
 # CPK files
@@ -76,8 +76,8 @@ require 'composite_primary_keys/composite_predicates'
 require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/relation'
 require 'composite_primary_keys/sanitization'
+require 'composite_primary_keys/attribute_set/builder'
 require 'composite_primary_keys/attribute_methods'
-require 'composite_primary_keys/autosave_association'
 require 'composite_primary_keys/version'
 
 require 'composite_primary_keys/associations/association'
@@ -98,12 +98,13 @@ require 'composite_primary_keys/nested_attributes'
 
 require 'composite_primary_keys/connection_adapters/abstract_adapter'
 require 'composite_primary_keys/connection_adapters/abstract_mysql_adapter'
+require 'composite_primary_keys/connection_adapters/postgresql/database_statements'
 
 require 'composite_primary_keys/relation/batches'
 require 'composite_primary_keys/relation/where_clause'
 require 'composite_primary_keys/relation/calculations'
 require 'composite_primary_keys/relation/finder_methods'
-require 'composite_primary_keys/relation/predicate_builder'
+require 'composite_primary_keys/relation/predicate_builder/association_query_handler'
 require 'composite_primary_keys/relation/query_methods'
 
 require 'composite_primary_keys/composite_relation'

data/lib/composite_primary_keys/arel/sqlserver.rb

@@ -16,7 +16,8 @@ module Arel
 
       def primary_Key_From_Table t
         return unless t
-        column_name = schema_cache.primary_keys(t.name) || column_cache(t.name).first.second.try(:name)
+        column_name = @connection.schema_cache.primary_keys(t.name) ||
+          @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
 
         # CPK
         # column_name ? t[column_name] : nil

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -23,8 +23,8 @@ module ActiveRecord
         binds
       end
 
-      def last_chain_scope(scope, table, reflection, owner, association_klass)
-        join_keys = reflection.join_keys(association_klass)
+      def last_chain_scope(scope, table, reflection, owner)
+        join_keys = reflection.join_keys
         key = join_keys.key
         foreign_key = join_keys.foreign_key
 
@@ -46,8 +46,8 @@ module ActiveRecord
         scope
       end
 
-      def next_chain_scope(scope, table, reflection, association_klass, foreign_table, next_reflection)
-        join_keys = reflection.join_keys(association_klass)
+      def next_chain_scope(scope, table, reflection, foreign_table, next_reflection)
+        join_keys = reflection.join_keys
         key = join_keys.key
         foreign_key = join_keys.foreign_key
 

data/lib/composite_primary_keys/associations/collection_association.rb

@@ -29,7 +29,7 @@ module CompositePrimaryKeys
       ids.map! { |i| pk_type.cast(i) }
       # CPK
       if reflection.association_primary_key.is_a?(Array)
-        predicate = Class.new.extend(CompositePrimaryKeys::Predicates).cpk_in_predicate(klass.arel_table, reflection.association_primary_key, ids)
+        predicate = CompositePrimaryKeys::Predicates.cpk_in_predicate(klass.arel_table, reflection.association_primary_key, ids)
         records = klass.where(predicate).index_by do |r|
           reflection.association_primary_key.map{ |k| r.send(k) }
         end.values_at(*ids)

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

@@ -3,9 +3,9 @@ module ActiveRecord
     class Preloader
       class Association
         silence_warnings do
-          def query_scope(ids)
+          def records_for(ids)
             # CPK
-            # scope.where(association_key.in(ids))
+            # scope.where(association_key_name => ids)
 
             if reflection.foreign_key.is_a?(Array)
               predicate = cpk_in_predicate(table, reflection.foreign_key, ids)

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

@@ -2,7 +2,7 @@ module ActiveRecord
   module Associations
     class Preloader
       class BelongsTo
-        def query_scope(ids)
+        def records_for(ids)
           # CPK
           # scope.where(association_key.in(ids))
 
@@ -10,7 +10,7 @@ module ActiveRecord
             predicate = cpk_in_predicate(table, association_key_name, ids)
             scope.where(predicate)
           else
-            scope.where(association_key.in(ids))
+            scope.where(association_key_name => ids)
           end
         end
       end

data/lib/composite_primary_keys/attribute_methods/primary_key.rb

@@ -9,13 +9,26 @@ module ActiveRecord
           # attribute_was(self.class.primary_key)
           if self.composite?
             self.class.primary_keys.map do |key_attr|
-              attribute_was(key_attr)
+              attribute_changed?(key_attr) ? changed_attributes[key_attr] : self.ids_hash[key_attr]
             end
           else
             attribute_was(self.class.primary_key)
           end
 
         end
+
+        def id_in_database
+          sync_with_transaction_state
+          # CPK
+          # attribute_in_database(self.class.primary_key)
+          if self.composite?
+            self.class.primary_keys.map do |key_attr|
+              attribute_in_database(key_attr)
+            end
+          else
+            attribute_in_database(self.class.primary_key)
+          end
+        end
       end
     end
   end

data/lib/composite_primary_keys/attribute_methods/write.rb

@@ -2,6 +2,20 @@ module ActiveRecord
   module AttributeMethods
     module Write
       silence_warnings do
+        def write_attribute(attr_name, value)
+          name = if self.class.attribute_alias?(attr_name)
+            # CPK
+            # self.class.attribute_alias(attr_name).to_s
+            self.class.attribute_alias(attr_name)
+          else
+            # CPK
+            # attr_name.to_s
+            attr_name
+          end
+
+          write_attribute_with_type_cast(name, value, true)
+        end
+
         def write_attribute_with_type_cast(attr_name, value, should_type_cast)
           # CPK
           if attr_name.kind_of?(Array)

data/lib/composite_primary_keys/attribute_set/builder.rb

@@ -0,0 +1,22 @@
+module ActiveRecord
+  class AttributeSet # :nodoc:
+    class Builder # :nodoc:
+      silence_warnings do
+        def build_from_database(values = {}, additional_types = {})
+          # CPK
+          # if always_initialized && !values.key?(always_initialized)
+          #   values[always_initialized] = nil
+          # end
+          Array(always_initialized).each do |always_initialized_attribute|
+            if always_initialized_attribute && !values.key?(always_initialized_attribute)
+              values[always_initialized_attribute] = nil
+            end
+          end
+
+          attributes = LazyAttributeHash.new(types, values, additional_types)
+          AttributeSet.new(attributes)
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/base.rb

@@ -47,15 +47,16 @@ module ActiveRecord
 
     module CompositeClassMethods
       def primary_keys
-        unless defined?(@primary_keys)
-          reset_primary_keys
-        end
+        @primary_keys = reset_primary_keys unless defined? @primary_keys
         @primary_keys
       end
 
       # Don't like this method name, but its modeled after how AR does it
-      def reset_primary_keys
-        if self != base_class
+       def reset_primary_keys #:nodoc:
+        if self == base_class
+          # CPK
+          self.primary_keys = get_primary_key(base_class.name)
+        else
           self.primary_keys = base_class.primary_keys
         end
       end

data/lib/composite_primary_keys/composite_predicates.rb

@@ -1,5 +1,9 @@
 module CompositePrimaryKeys
   module Predicates
+    # Similar to module_function, but does not make instance methods private.
+    # https://idiosyncratic-ruby.com/8-self-improvement.html
+    extend self
+
     def cpk_and_predicate(predicates)
       if predicates.length == 1
         predicates.first

data/lib/composite_primary_keys/connection_adapters/abstract_adapter.rb

@@ -1,11 +1,11 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-      def quote_column_names(name)
-        Array(name).map do |col|
-          quote_column_name(col.to_s)
-        end.join(CompositePrimaryKeys::ID_SEP)
-      end
-    end
-  end
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractAdapter
+      def quote_column_names(name)
+        Array(name).map do |col|
+          quote_column_name(col.to_s)
+        end.join(CompositePrimaryKeys::ID_SEP)
+      end
+    end
+  end
 end

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

@@ -0,0 +1,26 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      module DatabaseStatements
+        def sql_for_insert(sql, pk, id_value, sequence_name, binds) # :nodoc:
+          if pk.nil?
+            # Extract the table from the insert sql. Yuck.
+            table_ref = extract_table_ref_from_insert_sql(sql)
+            pk = primary_key(table_ref) if table_ref
+          end
+
+          # CPK
+          # if pk = suppress_composite_primary_key(pk)
+          #  sql = "#{sql} RETURNING #{quote_column_name(pk)}"
+          #end
+          # NOTE pk can be false.
+          if pk
+            sql = "#{sql} RETURNING #{quote_column_names(pk)}"
+          end
+
+          super
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/core.rb

@@ -27,36 +27,33 @@ module ActiveRecord
           return super if block_given? ||
                           primary_key.nil? ||
                           scope_attributes? ||
-                          columns_hash.include?(inheritance_column) ||
-                          ids.first.kind_of?(Array)
+                          columns_hash.include?(inheritance_column)
+
           # CPK
           return super if self.composite?
 
-          id  = ids.first
-          if ActiveRecord::Base === id
-            id = id.id
-            ActiveSupport::Deprecation.warn(<<-MSG.squish)
-              You are passing an instance of ActiveRecord::Base to `find`.
-              Please pass the id of the object by calling `.id`
-            MSG
-          end
+          id = ids.first
+
+          return super if id.kind_of?(Array) ||
+                           id.is_a?(ActiveRecord::Base)
 
           key = primary_key
 
           statement = cached_find_by_statement(key) { |params|
             where(key => params.bind).limit(1)
           }
+
           record = statement.execute([id], self, connection).first
           unless record
             raise RecordNotFound.new("Couldn't find #{name} with '#{primary_key}'=#{id}",
                                      name, primary_key, id)
           end
           record
-        rescue RangeError
+        rescue ::RangeError
           raise RecordNotFound.new("Couldn't find #{name} with an out of range value for '#{primary_key}'",
                                    name, primary_key)
         end
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/locking/optimistic.rb

@@ -5,7 +5,7 @@ module ActiveRecord
       private
 
       silence_warnings do
-        def _update_record(attribute_names = self.attribute_names) #:nodoc:
+        def _update_record(attribute_names = @attributes.keys) #:nodoc:
           return super unless locking_enabled?
           return 0 if attribute_names.empty?
 
@@ -25,18 +25,18 @@ module ActiveRecord
               ).where(
                   lock_col => previous_lock_value
               ).update_all(
-                  attributes_for_update(attribute_names).map do |name|
-                      [name, _read_attribute(name)]
-                  end.to_h
+                  Hash[attributes_for_update(attribute_names).map do |name|
+                         [name, _read_attribute(name)]
+                       end]
               )
             else
               affected_rows = relation.where(
                   self.class.primary_key => id,
                   lock_col => previous_lock_value,
               ).update_all(
-                  attributes_for_update(attribute_names).map do |name|
-                      [name, _read_attribute(name)]
-                  end.to_h
+                  Hash[attributes_for_update(attribute_names).map do |name|
+                       [name, _read_attribute(name)]
+                     end]
               )
             end