composite_primary_keys 12.0.9 → 13.0.2

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -1,235 +1,235 @@
-module CompositePrimaryKeys
-  module ActiveRecord
-    module FinderMethods
-      def apply_join_dependency(eager_loading: group_values.empty?)
-        join_dependency = construct_join_dependency(eager_load_values + includes_values, Arel::Nodes::OuterJoin)
-        relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
-
-        if eager_loading && !using_limitable_reflections?(join_dependency.reflections)
-          if has_limit_or_offset?
-            limited_ids = limited_ids_for(relation)
-
-            # CPK
-            # limited_ids.empty? ? relation.none! : relation.where!(primary_key => limited_ids)
-            limited_ids.empty? ? relation.none! : relation.where!(cpk_in_predicate(table, self.primary_keys, limited_ids))
-          end
-          relation.limit_value = relation.offset_value = nil
-        end
-
-        if block_given?
-          yield relation, join_dependency
-        else
-          relation
-        end
-      end
-
-      def limited_ids_for(relation)
-        # CPK
-        # values = @klass.connection.columns_for_distinct(
-        #     connection.column_name_from_arel_node(arel_attribute(primary_key)),
-        #     relation.order_values
-        # )
-
-        columns = @klass.primary_keys.map do |key|
-          connection.visitor.compile(arel_attribute(key))
-        end
-        values = @klass.connection.columns_for_distinct(columns, relation.order_values)
-
-        relation = relation.except(:select).select(values).distinct!
-
-        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|
-            row[key]
-          end
-        end
-      end
-
-      def construct_relation_for_exists(conditions)
-        conditions = sanitize_forbidden_attributes(conditions)
-
-        if distinct_value && offset_value
-          relation = except(:order).limit!(1)
-        else
-          relation = except(:select, :distinct, :order)._select!(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit!(1)
-        end
-
-        case conditions
-          # CPK
-          when CompositePrimaryKeys::CompositeKeys
-            relation = relation.where(cpk_id_predicate(table, primary_key, conditions))
-          # CPK
-          when Array
-            pk_length = @klass.primary_keys.length
-
-            if conditions.length == pk_length # E.g. conditions = ['France', 'Paris']
-              return self.construct_relation_for_exists(conditions.to_composite_keys)
-            else # Assume that conditions contains where relation
-              relation = relation.where(conditions)
-            end
-          when Array, Hash
-            relation.where!(conditions) unless conditions.empty?
-          else
-            relation.where!(primary_key => conditions) unless conditions == :none
-        end
-
-        relation
-      end
-
-      def find_with_ids(*ids)
-        raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
-
-        # CPK
-        # expects_array = ids.first.kind_of?(Array)
-        ids = CompositePrimaryKeys.normalize(ids, @klass.primary_keys.length)
-        expects_array = ids.flatten != ids.flatten(1)
-        return ids.first if expects_array && ids.first.empty?
-
-        # CPK
-        # ids = ids.flatten.compact.uniq
-        ids = expects_array ? ids.first : ids
-
-        model_name = @klass.name
-
-        case ids.size
-        when 0
-          error_message = "Couldn't find #{model_name} without an ID"
-          raise ::ActiveRecord::RecordNotFound.new(error_message, model_name, primary_key)
-        when 1
-          result = find_one(ids.first)
-          expects_array ? [ result ] : result
-        else
-          find_some(ids)
-        end
-      end
-
-      # def last(limit = nil)
-      #   return find_last(limit) if loaded? || has_limit_or_offset?
-      #
-      #   result = limit(limit || 1)
-      #   # CPK
-      #   # result.order!(arel_attribute(primary_key)) if order_values.empty? && primary_key
-      #   if order_values.empty? && primary_key
-      #     if composite?
-      #       result.order!(primary_keys.map { |pk| arel_attribute(pk).asc })
-      #     elsif
-      #       result.order!(arel_attribute(primary_key))
-      #     end
-      #   end
-      #
-      #   result = result.reverse_order!
-      #
-      #   limit ? result.reverse : result.first
-      # rescue ::ActiveRecord::IrreversibleOrderError
-      #   ActiveSupport::Deprecation.warn(<<-WARNING.squish)
-      #       Finding a last element by loading the relation when SQL ORDER
-      #       can not be reversed is deprecated.
-      #       Rails 5.1 will raise ActiveRecord::IrreversibleOrderError in this case.
-      #       Please call `to_a.last` if you still want to load the relation.
-      #   WARNING
-      #   find_last(limit)
-      # end
-
-      def find_one(id)
-        if ::ActiveRecord::Base === id
-          raise ArgumentError, <<-MSG.squish
-            You are passing an instance of ActiveRecord::Base to `find`.
-            Please pass the id of the object by calling `.id`.
-          MSG
-        end
-
-        # CPK
-        #relation = where(primary_key => id)
-        relation = where(cpk_id_predicate(table, primary_keys, id))
-        record = relation.take
-
-        raise_record_not_found_exception!(id, 0, 1) unless record
-
-        record
-      end
-
-      def find_some(ids)
-        # CPK
-        if composite?
-          ids = if ids.length == 1
-                  CompositePrimaryKeys::CompositeKeys.parse(ids.first)
-                else
-                  ids.to_composite_keys
-                end
-        end
-
-        return find_some_ordered(ids) unless order_values.present?
-
-        # CPK
-        # result = where(primary_key => ids).to_a
-        result = if composite?
-          result = where(cpk_in_predicate(table, primary_keys, ids)).to_a
-        else
-          result = where(primary_key => ids).to_a
-        end
-
-        expected_size =
-          if limit_value && ids.size > limit_value
-            limit_value
-          else
-            ids.size
-          end
-
-        # 11 ids with limit 3, offset 9 should give 2 results.
-        if offset_value && (ids.size - offset_value < expected_size)
-          expected_size = ids.size - offset_value
-        end
-
-        if result.size == expected_size
-          result
-        else
-          raise_record_not_found_exception!(ids, result.size, expected_size)
-        end
-      end
-
-      def find_some_ordered(ids)
-        ids = ids.slice(offset_value || 0, limit_value || ids.size) || []
-
-        # CPK
-        # result = except(:limit, :offset).where(primary_key => ids).records
-        result = if composite?
-          except(:limit, :offset).where(cpk_in_predicate(table, primary_keys, ids)).records
-        else
-          except(:limit, :offset).where(primary_key => ids).records
-        end
-
-        if result.size == ids.size
-          pk_type = @klass.type_for_attribute(primary_key)
-
-          records_by_id = result.index_by(&:id)
-          # CPK
-          # ids.map { |id| records_by_id.fetch(pk_type.cast(id)) }
-          if composite?
-            ids.map do |id|
-              typecasted_id = primary_keys.zip(id).map do |col, val|
-                @klass.type_for_attribute(col).cast(val)
-              end
-              records_by_id.fetch(typecasted_id)
-            end
-          else
-            ids.map { |id| records_by_id.fetch(pk_type.cast(id)) }
-          end
-        else
-          raise_record_not_found_exception!(ids, result.size, ids.size)
-        end
-      end
-
-      def ordered_relation
-        if order_values.empty? && (implicit_order_column || primary_key)
-          # CPK
-          # order(arel_attribute(implicit_order_column || primary_key).asc)
-          order(Array(implicit_order_column || primary_key).map {|key| arel_attribute(key).asc})
-        else
-          self
-        end
-      end
-    end
-  end
-end
+module CompositePrimaryKeys
+  module ActiveRecord
+    module FinderMethods
+      def apply_join_dependency(eager_loading: group_values.empty?)
+        join_dependency = construct_join_dependency(eager_load_values + includes_values, Arel::Nodes::OuterJoin)
+        relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
+
+        if eager_loading && !using_limitable_reflections?(join_dependency.reflections)
+          if has_limit_or_offset?
+            limited_ids = limited_ids_for(relation)
+
+            # CPK
+            # limited_ids.empty? ? relation.none! : relation.where!(primary_key => limited_ids)
+            limited_ids.empty? ? relation.none! : relation.where!(cpk_in_predicate(table, self.primary_keys, limited_ids))
+          end
+          relation.limit_value = relation.offset_value = nil
+        end
+
+        if block_given?
+          yield relation, join_dependency
+        else
+          relation
+        end
+      end
+
+      def limited_ids_for(relation)
+        # CPK
+        # values = @klass.connection.columns_for_distinct(
+        #     connection.column_name_from_arel_node(table[primary_key]),
+        #     relation.order_values
+        # )
+
+        columns = @klass.primary_keys.map do |key|
+          connection.visitor.compile(table[key])
+        end
+        values = @klass.connection.columns_for_distinct(columns, relation.order_values)
+
+        relation = relation.except(:select).select(values).distinct!
+
+        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|
+            row[key]
+          end
+        end
+      end
+
+      def construct_relation_for_exists(conditions)
+        conditions = sanitize_forbidden_attributes(conditions)
+
+        if distinct_value && offset_value
+          relation = except(:order).limit!(1)
+        else
+          relation = except(:select, :distinct, :order)._select!(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit!(1)
+        end
+
+        case conditions
+          # CPK
+          when CompositePrimaryKeys::CompositeKeys
+            relation = relation.where(cpk_id_predicate(table, primary_key, conditions))
+          # CPK
+          when Array
+            pk_length = @klass.primary_keys.length
+
+            if conditions.length == pk_length # E.g. conditions = ['France', 'Paris']
+              return self.construct_relation_for_exists(conditions.to_composite_keys)
+            else # Assume that conditions contains where relation
+              relation = relation.where(conditions)
+            end
+          when Array, Hash
+            relation.where!(conditions) unless conditions.empty?
+          else
+            relation.where!(primary_key => conditions) unless conditions == :none
+        end
+
+        relation
+      end
+
+      def find_with_ids(*ids)
+        raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
+
+        # CPK
+        # expects_array = ids.first.kind_of?(Array)
+        ids = CompositePrimaryKeys.normalize(ids, @klass.primary_keys.length)
+        expects_array = ids.flatten != ids.flatten(1)
+        return ids.first if expects_array && ids.first.empty?
+
+        # CPK
+        # ids = ids.flatten.compact.uniq
+        ids = expects_array ? ids.first : ids
+
+        model_name = @klass.name
+
+        case ids.size
+        when 0
+          error_message = "Couldn't find #{model_name} without an ID"
+          raise ::ActiveRecord::RecordNotFound.new(error_message, model_name, primary_key)
+        when 1
+          result = find_one(ids.first)
+          expects_array ? [ result ] : result
+        else
+          find_some(ids)
+        end
+      end
+
+      # def last(limit = nil)
+      #   return find_last(limit) if loaded? || has_limit_or_offset?
+      #
+      #   result = limit(limit || 1)
+      #   # CPK
+      #   # result.order!(table[primary_key]) if order_values.empty? && primary_key
+      #   if order_values.empty? && primary_key
+      #     if composite?
+      #       result.order!(primary_keys.map { |pk| table[pk].asc })
+      #     elsif
+      #       result.order!(table[primary_key])
+      #     end
+      #   end
+      #
+      #   result = result.reverse_order!
+      #
+      #   limit ? result.reverse : result.first
+      # rescue ::ActiveRecord::IrreversibleOrderError
+      #   ActiveSupport::Deprecation.warn(<<-WARNING.squish)
+      #       Finding a last element by loading the relation when SQL ORDER
+      #       can not be reversed is deprecated.
+      #       Rails 5.1 will raise ActiveRecord::IrreversibleOrderError in this case.
+      #       Please call `to_a.last` if you still want to load the relation.
+      #   WARNING
+      #   find_last(limit)
+      # end
+
+      def find_one(id)
+        if ::ActiveRecord::Base === id
+          raise ArgumentError, <<-MSG.squish
+            You are passing an instance of ActiveRecord::Base to `find`.
+            Please pass the id of the object by calling `.id`.
+          MSG
+        end
+
+        # CPK
+        #relation = where(primary_key => id)
+        relation = where(cpk_id_predicate(table, primary_keys, id))
+        record = relation.take
+
+        raise_record_not_found_exception!(id, 0, 1) unless record
+
+        record
+      end
+
+      def find_some(ids)
+        # CPK
+        if composite?
+          ids = if ids.length == 1
+                  CompositePrimaryKeys::CompositeKeys.parse(ids.first)
+                else
+                  ids.to_composite_keys
+                end
+        end
+
+        return find_some_ordered(ids) unless order_values.present?
+
+        # CPK
+        # result = where(primary_key => ids).to_a
+        result = if composite?
+          result = where(cpk_in_predicate(table, primary_keys, ids)).to_a
+        else
+          result = where(primary_key => ids).to_a
+        end
+
+        expected_size =
+          if limit_value && ids.size > limit_value
+            limit_value
+          else
+            ids.size
+          end
+
+        # 11 ids with limit 3, offset 9 should give 2 results.
+        if offset_value && (ids.size - offset_value < expected_size)
+          expected_size = ids.size - offset_value
+        end
+
+        if result.size == expected_size
+          result
+        else
+          raise_record_not_found_exception!(ids, result.size, expected_size)
+        end
+      end
+
+      def find_some_ordered(ids)
+        ids = ids.slice(offset_value || 0, limit_value || ids.size) || []
+
+        # CPK
+        # result = except(:limit, :offset).where(primary_key => ids).records
+        result = if composite?
+          except(:limit, :offset).where(cpk_in_predicate(table, primary_keys, ids)).records
+        else
+          except(:limit, :offset).where(primary_key => ids).records
+        end
+
+        if result.size == ids.size
+          pk_type = @klass.type_for_attribute(primary_key)
+
+          records_by_id = result.index_by(&:id)
+          # CPK
+          # ids.map { |id| records_by_id.fetch(pk_type.cast(id)) }
+          if composite?
+            ids.map do |id|
+              typecasted_id = primary_keys.zip(id).map do |col, val|
+                @klass.type_for_attribute(col).cast(val)
+              end
+              records_by_id.fetch(typecasted_id)
+            end
+          else
+            ids.map { |id| records_by_id.fetch(pk_type.cast(id)) }
+          end
+        else
+          raise_record_not_found_exception!(ids, result.size, ids.size)
+        end
+      end
+
+      def ordered_relation
+        if order_values.empty? && (implicit_order_column || primary_key)
+          # CPK
+          # order(table[implicit_order_column || primary_key].asc)
+          order(Array(implicit_order_column || primary_key).map {|key| table[key].asc})
+        else
+          self
+        end
+      end
+    end
+  end
+end

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

@@ -1,20 +1,39 @@
-module ActiveRecord
-  class PredicateBuilder
-    class AssociationQueryValue
-      def queries
-        # CPK
-        if associated_table.association_join_foreign_key.is_a?(Array)
-          if ids.is_a?(ActiveRecord::Relation)
-            ids.map do |id|
-              associated_table.association_join_foreign_key.zip(id.id).to_h
-            end
-          else
-            [associated_table.association_join_foreign_key.zip(ids).to_h]
-          end
-        else
-          [associated_table.association_join_foreign_key.to_s => ids]
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  class PredicateBuilder
+    class AssociationQueryValue
+      def queries
+        # CPK
+        if associated_table.join_foreign_key.is_a?(Array)
+          if ids.is_a?(ActiveRecord::Relation)
+            ids.map do |id|
+              associated_table.join_foreign_key.zip(id.id).to_h
+            end
+          else
+            [associated_table.join_foreign_key.zip(ids).to_h]
+          end
+        else
+          [associated_table.join_foreign_key => ids]
+        end
+      end
+
+      def ids
+        case value
+        when Relation
+          value.select_values.empty? ? value.select(primary_key) : value
+        when Array
+          value.map { |v| convert_to_id(v) }
+        else
+          # CPK
+          # convert_to_id(value)
+          if value.nil?
+            nil
+          elsif value.respond_to?(:composite?) && value.composite?
+            value.class.primary_keys.zip(value.id)
+          else
+            convert_to_id(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/relation/query_methods.rb

@@ -1,43 +1,43 @@
-module CompositePrimaryKeys
-  module ActiveRecord
-    module QueryMethods
-      def reverse_sql_order(order_query)
-        if order_query.empty?
-          # CPK
-          # return [arel_attribute(primary_key).desc] if primary_key
-
-          if primary_key
-            # break apart CPKs
-            return primary_key.map do |key|
-              arel_attribute(key).desc
-            end
-          else
-            raise IrreversibleOrderError,
-                  "Relation has no current order and table has no primary key to be used as default order"
-          end
-        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
-            end
-          end
-        end
-      end
-    end
-  end
+module CompositePrimaryKeys
+  module ActiveRecord
+    module QueryMethods
+      def reverse_sql_order(order_query)
+        if order_query.empty?
+          # CPK
+          # return [table[primary_key].desc] if primary_key
+
+          if primary_key
+            # break apart CPKs
+            return primary_key.map do |key|
+              table[key].desc
+            end
+          else
+            raise IrreversibleOrderError,
+                  "Relation has no current order and table has no primary key to be used as default order"
+          end
+        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
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/lib/composite_primary_keys/relation/where_clause.rb

@@ -1,24 +1,19 @@
-module ActiveRecord
-  class Relation
-    class WhereClause
-      def to_h(table_name = nil)
-        equalities = equalities(predicates)
-
-        # CPK Adds this line, because ours are coming in with AND->{EQUALITY, EQUALITY}
-        equalities = predicates.grep(Arel::Nodes::And).map(&:children).flatten.grep(Arel::Nodes::Equality) if equalities.empty?
-
-        if table_name
-          equalities = equalities.select do |node|
-            node.left.relation.name == table_name
-          end
-        end
-
-        equalities.map { |node|
-          name = node.left.name.to_s
-          value = extract_node_value(node.right)
-          [name, value]
-        }.to_h
-      end
-    end
-  end
+module ActiveRecord
+  class Relation
+    class WhereClause
+      def to_h(table_name = nil, equality_only: false)
+        equalities = equalities(predicates, equality_only)
+
+        # CPK Adds this line, because ours are coming in with AND->{EQUALITY, EQUALITY}
+        equalities = predicates.grep(Arel::Nodes::And).map(&:children).flatten.grep(Arel::Nodes::Equality) if equalities.empty?
+
+        equalities.each_with_object({}) do |node, hash|
+          next if table_name&.!= node.left.relation.name
+          name = node.left.name.to_s
+          value = extract_node_value(node.right)
+          hash[name] = value
+        end
+      end
+    end
+  end
 end