composite_primary_keys 8.1.6 → 9.0.10

data/lib/composite_primary_keys/relation.rb

@@ -1,8 +1,8 @@
 module ActiveRecord
   class Relation
     alias :initialize_without_cpk :initialize
-    def initialize(klass, table, values = {})
-      initialize_without_cpk(klass, table, values)
+    def initialize(klass, table, predicate_builder, values = {})
+      initialize_without_cpk(klass, table, predicate_builder, values)
       add_cpk_support if klass && klass.composite?
     end
 
@@ -16,60 +16,113 @@ module ActiveRecord
       extend CompositePrimaryKeys::CompositeRelation
     end
 
-    alias :where_values_hash_without_cpk :where_values_hash
-    def where_values_hash(relation_table_name = table_name)
-      # CPK
-      nodes_from_and = where_values.grep(Arel::Nodes::And).map { |and_node|
-        and_node.children.grep(Arel::Nodes::Equality)
-      }.flatten
-
-      # CPK
-      # equalities = where_values.grep(Arel::Nodes::Equality).find_all { |node|
-      #   node.left.relation.name == relation_table_name
-      # }
-      equalities = (nodes_from_and + where_values.grep(Arel::Nodes::Equality)).find_all { |node|
-        node.left.relation.name == relation_table_name
-      }
+    silence_warnings do
+      def _update_record(values, id, id_was) # :nodoc:
+        substitutes, binds = substitute_values values
+
+        scope = @klass.unscoped
 
-      binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
+        if @klass.finder_needs_type_condition?
+          scope.unscope!(where: @klass.inheritance_column)
+        end
 
-      Hash[equalities.map { |where|
-        name = where.left.name
-        [name, binds.fetch(name.to_s) {
-          case where.right
-          when Array then where.right.map(&:val)
-          else
-            where.right.val
+        # CPK
+        if self.composite?
+          # Not sure if this is a good idea, but replace nil id_was with the new id
+          id_update = id_was.each_with_index.map do |value, i|
+            value || id[i]
           end
-        }]
-      }]
+
+          relation = @klass.unscoped.where(cpk_id_predicate(@klass.arel_table, @klass.primary_key, id_update))
+        else
+          relation = scope.where(@klass.primary_key => (id_was || id))
+        end
+
+
+        bvs = binds + relation.bound_attributes
+        um = relation
+          .arel
+          .compile_update(substitutes, @klass.primary_key)
+
+        @klass.connection.update(
+          um,
+          'SQL',
+          bvs,
+        )
+      end
     end
 
-    def _update_record(values, id, id_was)
-      substitutes, binds = substitute_values values
+    def update_all(updates)
+      raise ArgumentError, "Empty list of attributes to change" if updates.blank?
 
-      # CPK
-      um = if self.composite?
-        relation = @klass.unscoped.where(cpk_id_predicate(@klass.arel_table, @klass.primary_key, id_was || id))
+      stmt = Arel::UpdateManager.new
 
-        relation.arel.compile_update(substitutes, @klass.primary_key)
-      else
-        scope = @klass.unscoped
+      stmt.set Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates))
+      stmt.table(table)
 
-        if @klass.finder_needs_type_condition?
-          scope.unscope!(where: @klass.inheritance_column)
+      if joins_values.any?
+        # CPK
+        #@klass.connection.join_to_update(stmt, arel, arel_attribute(primary_key))
+        if primary_key.kind_of?(Array)
+          attributes = primary_key.map do |key|
+            arel_attribute(key)
+          end
+          @klass.connection.join_to_update(stmt, arel, attributes.to_composite_keys)
+        else
+          @klass.connection.join_to_update(stmt, arel, arel_attribute(primary_key))
         end
+      else
+        stmt.key = arel_attribute(primary_key)
+        stmt.take(arel.limit)
+        stmt.order(*arel.orders)
+        stmt.wheres = arel.constraints
+      end
+
+      @klass.connection.update stmt, 'SQL', bound_attributes
+    end
 
-        relation = scope.where(@klass.primary_key => (id_was || id))
-        binds += relation.bind_values
 
-        relation.arel.compile_update(substitutes, @klass.primary_key)
+    def delete_all(conditions = nil)
+      invalid_methods = INVALID_METHODS_FOR_DELETE_ALL.select { |method|
+        if MULTI_VALUE_METHODS.include?(method)
+          send("#{method}_values").any?
+        elsif SINGLE_VALUE_METHODS.include?(method)
+          send("#{method}_value")
+        elsif CLAUSE_METHODS.include?(method)
+          send("#{method}_clause").any?
+        end
+      }
+      if invalid_methods.any?
+        raise ActiveRecordError.new("delete_all doesn't support #{invalid_methods.join(', ')}")
       end
 
-      @klass.connection.update(
-        um,
-        'SQL',
-        binds)
+      if conditions
+        ActiveSupport::Deprecation.warn(<<-MESSAGE.squish)
+          Passing conditions to delete_all is deprecated and will be removed in Rails 5.1.
+          To achieve the same use where(conditions).delete_all.
+        MESSAGE
+        where(conditions).delete_all
+      else
+        stmt = Arel::DeleteManager.new
+        stmt.from(table)
+
+        # CPK
+        if joins_values.any? && @klass.composite?
+          arel_attributes = Array(primary_key).map do |key|
+            arel_attribute(key)
+          end.to_composite_keys
+          @klass.connection.join_to_delete(stmt, arel, arel_attributes)
+        elsif joins_values.any?
+          @klass.connection.join_to_delete(stmt, arel, arel_attribute(primary_key))
+        else
+          stmt.wheres = arel.constraints
+        end
+
+        affected = @klass.connection.delete(stmt, 'SQL', bound_attributes)
+
+        reset
+        affected
+      end
     end
   end
 end

data/lib/composite_primary_keys/sanitization.rb

@@ -2,23 +2,14 @@ module ActiveRecord
   module Sanitization
     module ClassMethods
       protected
-      # Accepts a hash of SQL conditions and replaces those attributes
-      # that correspond to a +composed_of+ relationship with their expanded
-      # aggregate attribute values.
-      # Given:
-      #     class Person < ActiveRecord::Base
-      #       composed_of :address, class_name: "Address",
-      #         mapping: [%w(address_street street), %w(address_city city)]
-      #     end
-      # Then:
-      #     { address: Address.new("813 abc st.", "chicago") }
-      #       # => { address_street: "813 abc st.", address_city: "chicago" }
+
       def expand_hash_conditions_for_aggregates(attrs)
         expanded_attrs = {}
         attrs.each do |attr, value|
           # CPK
           # if aggregation = reflect_on_aggregation(attr.to_sym)
           if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
+            value = value.split('/') if value.is_a?(String)
             attr.each_with_index do |key,i|
               expanded_attrs[key] = value.respond_to?(:flatten) ? value.flatten[i] : value
             end
@@ -40,15 +31,15 @@ module ActiveRecord
 
       def quoted_id
         # CPK
-        # self.class.quote_value(id, column_for_attribute(self.class.primary_key))
+        # self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
         if self.composite?
           [self.class.primary_keys, ids].transpose.map { |attr_name,id|
-            self.class.quote_value(id, column_for_attribute(attr_name))
+            self.class.quote_value(@attributes[attr_name].value_for_database)
           }
         else
-          self.class.quote_value(id, column_for_attribute(self.class.primary_key))
+          self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
         end
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

data/lib/composite_primary_keys.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2012 Nic Williams and Charlie Savage
+# 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
@@ -26,13 +26,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>4.2.0'
+  gem 'activerecord', '~>5.0.0.beta3'
   require 'active_record'
 end
 
-# Arel files we override
-require 'arel/visitors/to_sql'
-
 # AR files we override
 require 'active_record/counter_cache'
 require 'active_record/fixtures'
@@ -41,6 +38,7 @@ 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'
@@ -53,7 +51,6 @@ 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'
@@ -64,16 +61,13 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
 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'
 
-require 'active_record/validations/uniqueness'
-
 # CPK files
-require 'composite_primary_keys/arel/visitors/to_sql'
-
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/core'
@@ -82,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'
@@ -94,14 +88,9 @@ require 'composite_primary_keys/associations/join_dependency'
 require 'composite_primary_keys/associations/join_dependency/join_association'
 require 'composite_primary_keys/associations/preloader/association'
 require 'composite_primary_keys/associations/preloader/belongs_to'
-require 'composite_primary_keys/associations/singular_association'
 require 'composite_primary_keys/associations/collection_association'
 
-require 'composite_primary_keys/dirty'
-require 'composite_primary_keys/autosave_association'
-
 require 'composite_primary_keys/attribute_methods/primary_key'
-require 'composite_primary_keys/attribute_methods/dirty'
 require 'composite_primary_keys/attribute_methods/read'
 require 'composite_primary_keys/attribute_methods/write'
 require 'composite_primary_keys/locking/optimistic'
@@ -109,14 +98,16 @@ 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/abstract/connection_specification_changes'
 
 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/query_methods'
 
-require 'composite_primary_keys/validations/uniqueness'
-
 require 'composite_primary_keys/composite_relation'
+
+require 'composite_primary_keys/arel/in'
+require 'composite_primary_keys/arel/to_sql'
+require 'composite_primary_keys/arel/sqlserver'

data/scripts/console.rb

@@ -1,48 +1,48 @@
-#!/usr/bin/env ruby
-
-#
-# if run as script, load the file as library while starting irb 
-#
-if __FILE__ == $0
-  irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-  ENV['ADAPTER'] = ARGV[0]
-  exec "#{irb} -f -r #{$0} --simple-prompt"
-end
-
-#
-# check if the given adapter is supported (default: mysql)
-#
-adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
-adapter = ENV['ADAPTER'] || 'mysql'
-unless adapters.include? adapter
-  puts "Usage: #{__FILE__} <adapter>"
-  puts ''
-  puts 'Adapters: '
-  puts adapters.map{ |adapter| "    #{adapter}" }.join("\n")
-  exit 1
-end
-
-#
-# load all necessary libraries
-#
-require 'rubygems'
-require 'local/database_connections'
-
-$LOAD_PATH.unshift 'lib'
-
-begin
-  require 'local/paths'
-  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/active_record/lib"  if ENV['EDGE_RAILS_DIR']
-  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
-rescue
-end
-
-require 'active_support'
-require 'active_record'
-
-require "test/connections/native_#{adapter}/connection"
-require 'composite_primary_keys'
-
-PROJECT_ROOT = File.join(File.dirname(__FILE__), '..')
-Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }
-
+#!/usr/bin/env ruby
+
+#
+# if run as script, load the file as library while starting irb 
+#
+if __FILE__ == $0
+  irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+  ENV['ADAPTER'] = ARGV[0]
+  exec "#{irb} -f -r #{$0} --simple-prompt"
+end
+
+#
+# check if the given adapter is supported (default: mysql)
+#
+adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
+adapter = ENV['ADAPTER'] || 'mysql'
+unless adapters.include? adapter
+  puts "Usage: #{__FILE__} <adapter>"
+  puts ''
+  puts 'Adapters: '
+  puts adapters.map{ |adapter| "    #{adapter}" }.join("\n")
+  exit 1
+end
+
+#
+# load all necessary libraries
+#
+require 'rubygems'
+require 'local/database_connections'
+
+$LOAD_PATH.unshift 'lib'
+
+begin
+  require 'local/paths'
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/active_record/lib"  if ENV['EDGE_RAILS_DIR']
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
+rescue
+end
+
+require 'active_support'
+require 'active_record'
+
+require "test/connections/native_#{adapter}/connection"
+require 'composite_primary_keys'
+
+PROJECT_ROOT = File.join(File.dirname(__FILE__), '..')
+Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }
+

data/scripts/txt2html

@@ -1,76 +1,76 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-gem 'RedCloth'
-gem 'syntax'
-
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-
-version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
-require File.expand_path(version_path)
-
-version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubygems.org/gems/composite_primary_keys'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1
-       return 'st'
-    when 2
-      return 'nd'
-    when 3
-      return 'rd'
-    else
-      return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
-  
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class=\"syntax\">#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+#!/usr/bin/env ruby
+
+require 'rubygems'
+gem 'RedCloth'
+gem 'syntax'
+
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
+
+version  = CompositePrimaryKeys::VERSION::STRING
+download = 'http://rubygems.org/gems/composite_primary_keys'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1
+       return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class=\"syntax\">#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)