composite_primary_keys 13.0.1 → 14.0.1

data/lib/composite_primary_keys/persistence.rb

@@ -30,11 +30,18 @@ module ActiveRecord
           end
         end
 
-        constraints = _substitute_values(constraints).map { |attr, bind| attr.eq(bind) }
+        constraints = constraints.map { |name, value| predicate_builder[name, value] }
 
-        um = arel_table.where(
-          constraints.reduce(&:and)
-        ).compile_update(_substitute_values(values), primary_key)
+        default_constraint = build_default_constraint
+        constraints << default_constraint if default_constraint
+
+        if current_scope = self.global_current_scope
+          constraints << current_scope.where_clause.ast
+        end
+
+        um = Arel::UpdateManager.new(arel_table)
+        um.set(values.transform_keys { |name| arel_table[name] })
+        um.wheres = constraints
 
         connection.update(um, "#{self} Update")
       end
@@ -48,10 +55,16 @@ module ActiveRecord
           end
         end
 
-        constraints = _substitute_values(constraints).map { |attr, bind| attr.eq(bind) }
+        constraints = constraints.map { |name, value| predicate_builder[name, value] }
+
+        default_constraint = build_default_constraint
+        constraints << default_constraint if default_constraint
+
+        if current_scope = self.global_current_scope
+          constraints << current_scope.where_clause.ast
+        end
 
-        dm = Arel::DeleteManager.new
-        dm.from(arel_table)
+        dm = Arel::DeleteManager.new(arel_table)
         dm.wheres = constraints
 
         connection.delete(dm, "#{self} Destroy")
@@ -73,6 +86,7 @@ module ActiveRecord
       end
 
       @new_record = false
+      @previously_new_record = true
 
       yield(self) if block_given?
 

data/lib/composite_primary_keys/relation/calculations.rb

@@ -42,7 +42,13 @@ module CompositePrimaryKeys
 
         result = skip_query_cache_if_necessary { @klass.connection.select_all(query_builder) }
 
-        type_cast_calculated_value(result.cast_values.first, operation) do |value|
+        if operation != "count"
+          type = column.try(:type_caster) ||
+            lookup_cast_type_from_join_dependencies(column_name.to_s) || ::ActiveRecord::Type.default_value
+          type = type.subtype if ::ActiveRecord::Enum::EnumType === type
+        end
+
+        type_cast_calculated_value(result.cast_values.first, operation, type) do |value|
           type = column.try(:type_caster) ||
             # CPK
             # lookup_cast_type_from_join_dependencies(column_name.to_s) || Type.default_value

data/lib/composite_primary_keys/sanitization.rb

@@ -1,43 +1,43 @@
-module ActiveRecord
-  module Sanitization
-    module ClassMethods
-    #   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
-    #       elsif aggregation = reflect_on_aggregation(attr.to_sym)
-    #         mapping = aggregation.mapping
-    #         mapping.each do |field_attr, aggregate_attr|
-    #           if mapping.size == 1 && !value.respond_to?(aggregate_attr)
-    #             expanded_attrs[field_attr] = value
-    #           else
-    #             expanded_attrs[field_attr] = value.send(aggregate_attr)
-    #           end
-    #         end
-    #       else
-    #         expanded_attrs[attr] = value
-    #       end
-    #     end
-    #     expanded_attrs
-    #   end
-    #
-    #   def quoted_id
-    #     # CPK
-    #     # 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(@attributes[attr_name].value_for_database)
-    #       }
-    #     else
-    #       self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
-    #     end
-    #   end
-    end
-  end
+module ActiveRecord
+  module Sanitization
+    module ClassMethods
+    #   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
+    #       elsif aggregation = reflect_on_aggregation(attr.to_sym)
+    #         mapping = aggregation.mapping
+    #         mapping.each do |field_attr, aggregate_attr|
+    #           if mapping.size == 1 && !value.respond_to?(aggregate_attr)
+    #             expanded_attrs[field_attr] = value
+    #           else
+    #             expanded_attrs[field_attr] = value.send(aggregate_attr)
+    #           end
+    #         end
+    #       else
+    #         expanded_attrs[attr] = value
+    #       end
+    #     end
+    #     expanded_attrs
+    #   end
+    #
+    #   def quoted_id
+    #     # CPK
+    #     # 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(@attributes[attr_name].value_for_database)
+    #       }
+    #     else
+    #       self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
+    #     end
+    #   end
+    end
+  end
 end

data/lib/composite_primary_keys/transactions.rb

@@ -1,34 +1,34 @@
-module ActiveRecord
-  module Transactions
-    # Restore the new record state and id of a record that was previously saved by a call to save_record_state.
-    def restore_transaction_record_state(force_restore_state = false)
-      if restore_state = @_start_transaction_state
-        if force_restore_state || restore_state[:level] <= 1
-          @new_record = restore_state[:new_record]
-          @destroyed  = restore_state[:destroyed]
-          @attributes = restore_state[:attributes].map do |attr|
-            value = @attributes.fetch_value(attr.name)
-            attr = attr.with_value_from_user(value) if attr.value != value
-            attr
-          end
-          @mutations_from_database = nil
-          @mutations_before_last_save = nil
-
-          # CPK
-          if self.composite?
-            values = @primary_key.map {|attribute| @attributes.fetch_value(attribute)}
-            restore_id = restore_state[:id]
-            if values != restore_id
-              @primary_key.each_with_index do |attribute, i|
-                @attributes.write_from_user(attribute, restore_id[i])
-              end
-            end
-          elsif @attributes.fetch_value(@primary_key) != restore_state[:id]
-            @attributes.write_from_user(@primary_key, restore_state[:id])
-          end
-          freeze if restore_state[:frozen?]
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Transactions
+    # Restore the new record state and id of a record that was previously saved by a call to save_record_state.
+    def restore_transaction_record_state(force_restore_state = false)
+      if restore_state = @_start_transaction_state
+        if force_restore_state || restore_state[:level] <= 1
+          @new_record = restore_state[:new_record]
+          @destroyed  = restore_state[:destroyed]
+          @attributes = restore_state[:attributes].map do |attr|
+            value = @attributes.fetch_value(attr.name)
+            attr = attr.with_value_from_user(value) if attr.value != value
+            attr
+          end
+          @mutations_from_database = nil
+          @mutations_before_last_save = nil
+
+          # CPK
+          if self.composite?
+            values = @primary_key.map {|attribute| @attributes.fetch_value(attribute)}
+            restore_id = restore_state[:id]
+            if values != restore_id
+              @primary_key.each_with_index do |attribute, i|
+                @attributes.write_from_user(attribute, restore_id[i])
+              end
+            end
+          elsif @attributes.fetch_value(@primary_key) != restore_state[:id]
+            @attributes.write_from_user(@primary_key, restore_state[:id])
+          end
+          freeze if restore_state[:frozen?]
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -1,32 +1,32 @@
-module ActiveRecord
-  module Validations
-    class UniquenessValidator
-      def validate_each(record, attribute, value)
-        finder_class = find_finder_class_for(record)
-        value = map_enum_attribute(finder_class, attribute, value)
-
-        relation = build_relation(finder_class, attribute, value)
-        if record.persisted?
-          # CPK
-          if finder_class.primary_key.is_a?(Array)
-            predicate = finder_class.cpk_id_predicate(finder_class.arel_table, finder_class.primary_key, record.id_in_database || record.id)
-            relation = relation.where.not(predicate)
-          elsif finder_class.primary_key
-            relation = relation.where.not(finder_class.primary_key => record.id_in_database)
-          else
-            raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
-          end
-        end
-        relation = scope_relation(record, relation)
-        relation = relation.merge(options[:conditions]) if options[:conditions]
-
-        if relation.exists?
-          error_options = options.except(:case_sensitive, :scope, :conditions)
-          error_options[:value] = value
-
-          record.errors.add(attribute, :taken, **error_options)
-        end
-      end
-    end
-  end
+module ActiveRecord
+  module Validations
+    class UniquenessValidator
+      def validate_each(record, attribute, value)
+        finder_class = find_finder_class_for(record)
+        value = map_enum_attribute(finder_class, attribute, value)
+
+        relation = build_relation(finder_class, attribute, value)
+        if record.persisted?
+          # CPK
+          if finder_class.primary_key.is_a?(Array)
+            predicate = finder_class.cpk_id_predicate(finder_class.arel_table, finder_class.primary_key, record.id_in_database || record.id)
+            relation = relation.where.not(predicate)
+          elsif finder_class.primary_key
+            relation = relation.where.not(finder_class.primary_key => record.id_in_database)
+          else
+            raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
+          end
+        end
+        relation = scope_relation(record, relation)
+        relation = relation.merge(options[:conditions]) if options[:conditions]
+
+        if relation.exists?
+          error_options = options.except(:case_sensitive, :scope, :conditions)
+          error_options[:value] = value
+
+          record.errors.add(attribute, :taken, **error_options)
+        end
+      end
+    end
+  end
 end

data/lib/composite_primary_keys/version.rb

@@ -1,6 +1,6 @@
 module CompositePrimaryKeys
   module VERSION
-    MAJOR = 13
+    MAJOR = 14
     MINOR = 0
     TINY  = 1
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/composite_primary_keys.rb

@@ -23,7 +23,7 @@
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>6.1.0'
+  gem 'activerecord', '~>7.0.0', '>= 7.0.1'
   require 'active_record'
 end
 

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)