composite_primary_keys 11.0.0.beta1 → 11.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d06bf922f3eb20b48d379ecac345de0ba325c713
-  data.tar.gz: 6d76da0b87220520f5cd255637c587ca5d1ec16a
+  metadata.gz: a08042363d370a0d0dfd0a9299fab51dd7eeb82d
+  data.tar.gz: 17ee927164d58a2f018cbab91d6019b19870ba6d
 SHA512:
-  metadata.gz: fafab03151230da90b5891b4f821685869bcd3e745b803ce812e4ee85091153a11c076a3f97ebf56b1f6d0fcc57bf7c45c30a7976be90241a3f3dd8b9e09d688
-  data.tar.gz: dade89e143c24027b39a99166798e467fbf6ca5fe83689b31838756d57ecfd27604277b89b016c3effa9538576e4d3267b72ae1d4c5882454455051e55310856
+  metadata.gz: b59369b4e4da7602adbdd189849ff00fb6759c3f772d46668b613323fb69b0f8bd853318800622ea0d9757ef98dd68d21e0c5150b5f68c508f2bcc412e1b6a0a
+  data.tar.gz: ffeee036dfe8ee31a6cbd184feccf00109d4d871200d7f9568e74823f1e5acc57ac2069792e01e4a29a53eeb5c1c3d7c19d0bc94effb0e8510aebe19e65f3641

data/History.rdoc

@@ -1,3 +1,7 @@
+== 11.0.0.beta2 (2017-12-10)
+
+* Minor updates for ActiveRecord 5.2.beta2 support (Charlie Savage)
+
 == 11.0.0.beta1 (2017-12-03)
 
 * ActiveRecord 5.2.beta2 support (Charlie Savage)

data/lib/composite_primary_keys/associations/collection_association.rb

@@ -1,28 +1,5 @@
 module CompositePrimaryKeys
   module CollectionAssociation
-    def get_records
-      cpk_applies = target.try(:composite?) || owner.try(:composite?)
-      return scope.to_a if cpk_applies
-      super
-    end
-
-    def ids_reader
-      if loaded?
-        load_target.map do |record|
-          if reflection.association_primary_key.is_a?(Array)
-            reflection.association_primary_key.map { |key| record.send(key) }
-          else
-            record.send(reflection.association_primary_key)
-          end
-        end
-      else
-        @association_ids ||= (
-        column = "#{reflection.quoted_table_name}.#{reflection.association_primary_key}"
-        scope.pluck(column)
-        )
-      end
-    end
-
     def ids_writer(ids)
       pk_type = reflection.association_primary_key_type
       ids = Array(ids).reject(&:blank?)

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -23,8 +23,9 @@ module CompositePrimaryKeys
         #     connection.column_name_from_arel_node(arel_attribute(primary_key)),
         #     relation.order_values
         # )
+
         columns = @klass.primary_keys.map do |key|
-          "#{quoted_table_name}.#{connection.quote_column_name(key)}"
+          connection.column_name_from_arel_node(arel_attribute(key))
         end
         values = @klass.connection.columns_for_distinct(columns, relation.order_values)
 
@@ -32,12 +33,12 @@ module CompositePrimaryKeys
 
         id_rows = skip_query_cache_if_necessary { @klass.connection.select_all(relation.arel, "SQL") }
         # CPK
-        # id_rows.map { |row| row[primary_key] }
-         id_rows.map do |row|
-           @klass.primary_keys.map do |key|
+        #id_rows.map { |row| row[primary_key] }
+        id_rows.map do |row|
+          @klass.primary_keys.map do |key|
             row[key]
-           end
-         end
+          end
+        end
       end
 
       def construct_relation_for_exists(conditions)

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 11
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta1'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta2'].join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 11.0.0.beta1
+  version: 11.0.0.beta2
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord