composite_primary_keys 10.0.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d393427145f3047288fffba8fc3434fa41518f4e
-  data.tar.gz: f828598d6e09660c798a7735510c5130084b85b9
+  metadata.gz: ec792a1a934ab5a71880968f63579a5f4558ee3c
+  data.tar.gz: b253ff76697c55e458afdb2fff11d12356cf008d
 SHA512:
-  metadata.gz: fb6c3cfc3c74ddd3eca736945a5e70cebc2a093e704d0407cbe2983670be5282958cffa24507069e623b1099984fceeb02864b55a76d29c3712bcfac91686a58
-  data.tar.gz: eeef7b365078357a92b2167f200458bde725b3b3e2032bb17d0799bd19a02e93314e758f89dcf97144d3d39a315cb22fa2120f9848d3496f9f2355190c447dd2
+  metadata.gz: bd9b2cfd6098aa20094306f7605bfce2332834e97a4b50c073d124d6a1bee19ded28854a8ea27e3ff2f50ae1745bf2e320fafd54fd6d70c4a8b9fa9643017779
+  data.tar.gz: 350b8a33f062bef98f21e419ed229124705d2ccca8303c47ada9528cd8522d691d1af138c7534e49fe869c317810249b2c3c24aa138cf110dbf1cae401595764

data/History.rdoc

@@ -1,3 +1,7 @@
+== 10.0.1 (2017-10-08)
+
+* Fixed an error that happened when a table attribute had the same name as the table (Taishi Kasuga)
+
 == 10.0.0 (2017-10-08)
 
 * Support ActiveRecord 5.1.x (Pinak Thakkar, Jordan Owens)
@@ -5,6 +9,10 @@
 * Fix typo in Readme (Mike Gunderloy)
 * Improved sql server support (Artyom Nikolaev)
 
+== 9.0.8 (2017-10-11)
+
+* Fix Paper Trail compatibility (Sean Linsley)
+
 == 9.0.7 (2017-05-22)
 
 * Update sqlite3 to support deletes and updates (Charlie Savage)

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -1,7 +1,6 @@
 module ActiveRecord
   module Associations
     class AssociationScope
-
       def self.get_bind_values(owner, chain)
         binds = []
         last_reflection = chain.last
@@ -29,18 +28,16 @@ module ActiveRecord
         foreign_key = join_keys.foreign_key
 
         # CPK
-        #value = transform_value(owner[foreign_key])
-        #scope = scope.where(table.name => { key => value })
-        mappings = Array(key).zip(Array(foreign_key))
-        joins = mappings.reduce(Hash.new) do |hash, mapping|
-          hash[mapping.first] = transform_value(owner[mapping.last])
-          hash
+        # value = transform_value(owner[foreign_key])
+        # scope = apply_scope(scope, table, key, value)
+        Array(key).zip(Array(foreign_key)).each do |a_join_key, a_foreign_key|
+          value = transform_value(owner[a_foreign_key])
+          scope = apply_scope(scope, table, a_join_key, value)
         end
-        scope = scope.where(table.name => joins)
 
         if reflection.type
           polymorphic_type = transform_value(owner.class.base_class.name)
-          scope = scope.where(table.name => { reflection.type => polymorphic_type })
+          scope = apply_scope(scope, table, reflection.type, polymorphic_type)
         end
 
         scope
@@ -57,11 +54,11 @@ module ActiveRecord
 
         if reflection.type
           value = transform_value(next_reflection.klass.base_class.name)
-          scope = scope.where(table.name => { reflection.type => value })
+          scope = apply_scope(scope, table, reflection.type, value)
         end
 
-        scope = scope.joins(join(foreign_table, constraint))
+        scope.joins!(join(foreign_table, constraint))
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/relation/predicate_builder/association_query_handler.rb

@@ -1,33 +1,33 @@
-module ActiveRecord
-  class PredicateBuilder
-    class AssociationQueryHandler
-      def call(attribute, value)
-        queries = {}
-
-        table = value.associated_table
-        if value.base_class
-          queries[table.association_foreign_type.to_s] = value.base_class.name
-        end
-
-        # CPK
-        # queries[table.association_foreign_key.to_s] = value.ids
-        # predicate_builder.build_from_hash(queries)
-        if table.association_foreign_key.is_a?(Array)
-          values = case value.value
-                    when Relation
-                      value.ids.map {|record| record.ids}
-                    when Array
-                      value.ids
-                    else
-                      [value.ids]
-                    end
-
-          CompositePrimaryKeys::Predicates.cpk_in_predicate(attribute.relation, table.association_foreign_key, values)
-        else
-          queries[table.association_foreign_key.to_s] = value.ids
-          predicate_builder.build_from_hash(queries)
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  class PredicateBuilder
+    class AssociationQueryHandler
+      def call(attribute, value)
+        queries = {}
+
+        table = value.associated_table
+        if value.base_class
+          queries[table.association_foreign_type.to_s] = value.base_class.name
+        end
+
+        # CPK
+        # queries[table.association_foreign_key.to_s] = value.ids
+        # predicate_builder.build_from_hash(queries)
+        if table.association_foreign_key.is_a?(Array)
+          values = case value.value
+                    when Relation
+                      value.ids.map {|record| record.ids}
+                    when Array
+                      value.ids
+                    else
+                      [value.ids]
+                    end
+
+          CompositePrimaryKeys::Predicates.cpk_in_predicate(attribute.relation, table.association_foreign_key, values)
+        else
+          queries[table.association_foreign_key.to_s] = value.ids
+          predicate_builder.build_from_hash(queries)
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord