composite_primary_keys 11.0.0.beta4 → 11.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82bde494ba8ade055be42d3e57d7d6f4eb31aebe5417e5e7c92590963943cab
-  data.tar.gz: 28805dfbc66e70f35452d852a7f2a5f20248ec64a6798d844505c6a2aec7fc73
+  metadata.gz: bfbfea33787da9b0c727a2f72624aa10cab7f1fd7d00ff925cf6332bbb7eab5e
+  data.tar.gz: d357900c434c2b9a9574ecfbf616298197b7c1351391c874dea4a878e61b4beb
 SHA512:
-  metadata.gz: 2e67fdc2a3846cc17ed323ffcbdc3d4eb2c2da3c898436f667ac071a3f6f1abc25983f77dd68798055a6a9365556d36c8631798f9bfed71cafe1a6ab3156e001
-  data.tar.gz: facd88fcfacbc76cf14d0ca0c6f9c9ecce5d5ef39856f32eb40ed20d91e9e8b48bc40829bbcf2013c95249f689a0c32e189aba054cd580a2ec74b6075fc71908
+  metadata.gz: 9fb6e448aae23c666782fa4a2f70225cd8834207f3b1eb853f342cf0f65d3d5c07ecadba8ae8a79f4b1e1830e2ee67596ad247e27c7c17abbc5343bbb07896b2
+  data.tar.gz: d7707078d862451d42f5c98b4fc2625b846beb478bcd5e91b8ab830d77e02dca083f8994e1ff681b3c35262687cbfbe0dbfb174161cef5ab2dcd4c8c7755b9af

data/History.rdoc

@@ -1,3 +1,8 @@
+== 11.0.0.rc1 (2018-02-25)
+
+* Update to ActiveRecord 5.2.rc1 (Charlie Savage)
+* Fix uniquness check (Charlie Savage)
+
 == 11.0.0.beta4 (2018-01-08)
 
 * Try again on Calculations#execute_simple_calculation for ActiveRecord 5.2.beta2 (Charlie Savage)

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~> 5.2.0.beta2'
+  gem 'activerecord', '~> 5.2.0.rc1'
   require 'active_record'
 end
 
@@ -68,6 +68,8 @@ require 'active_record/relation/finder_methods'
 require 'active_record/relation/query_methods'
 require 'active_record/relation/predicate_builder/association_query_value'
 
+require 'active_record/validations/uniqueness'
+
 # CPK files
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/base'
@@ -108,7 +110,12 @@ require 'composite_primary_keys/relation/finder_methods'
 require 'composite_primary_keys/relation/predicate_builder/association_query_value'
 require 'composite_primary_keys/relation/query_methods'
 
+require 'composite_primary_keys/validations/uniqueness'
+
 require 'composite_primary_keys/composite_relation'
 
 require 'composite_primary_keys/arel/to_sql'
-require 'composite_primary_keys/arel/sqlserver'
+
+# SQL Servers Support - uncomment these lines
+#require 'activerecord-sqlserver-adapter/arel/visitors/sqlserver'
+#require 'composite_primary_keys/arel/sqlserver'

data/lib/composite_primary_keys/associations/collection_association.rb

@@ -1,18 +1,18 @@
 module CompositePrimaryKeys
   module CollectionAssociation
     def ids_writer(ids)
-      pk_type = reflection.association_primary_key_type
+      primary_key = reflection.association_primary_key
+      pk_type = klass.type_for_attribute(primary_key)
       ids = Array(ids).reject(&:blank?)
       ids.map! { |i| pk_type.cast(i) }
 
-      # CPK
-      if reflection.association_primary_key.is_a?(Array)
+      # CPK-
+      if primary_key.is_a?(Array)
         predicate = CompositePrimaryKeys::Predicates.cpk_in_predicate(klass.arel_table, reflection.association_primary_key, ids)
         records = klass.where(predicate).index_by do |r|
           reflection.association_primary_key.map{ |k| r.send(k) }
         end.values_at(*ids)
       else
-        primary_key = reflection.association_primary_key
         records = klass.where(primary_key => ids).index_by do |r|
           r.public_send(primary_key)
         end.values_at(*ids).compact

data/lib/composite_primary_keys/persistence.rb

@@ -30,22 +30,22 @@ module ActiveRecord
       end
     end
 
-    # def relation_for_destroy
-    #   # CPK
-    #   if self.composite?
-    #     relation = self.class.unscoped
-    #
-    #     Array(self.class.primary_key).each do |key|
-    #       column     = self.class.arel_table[key]
-    #       value      = self[key]
-    #       relation = relation.where(column.eq(value))
-    #     end
-    #
-    #     relation
-    #   else
-    #     self.class.unscoped.where(self.class.primary_key => id)
-    #   end
-    # end
+    def _relation_for_itself
+      # CPK
+      if self.composite?
+        relation = self.class.unscoped
+
+        Array(self.class.primary_key).each do |key|
+          column     = self.class.arel_table[key]
+          value      = self[key]
+          relation = relation.where(column.eq(value))
+        end
+
+        relation
+      else
+        self.class.unscoped.where(self.class.primary_key => id)
+      end
+    end
 
     def touch(*names, time: nil)
       raise ActiveRecordError, "cannot touch on a new record object" unless persisted?

data/lib/composite_primary_keys/relation.rb

@@ -1,8 +1,8 @@
 module ActiveRecord
   class Relation
     alias :initialize_without_cpk :initialize
-    def initialize(klass, table, predicate_builder, values = {})
-      initialize_without_cpk(klass, table, predicate_builder, values)
+    def initialize(klass, table: klass.arel_table, predicate_builder: klass.predicate_builder, values: {})
+      initialize_without_cpk(klass, table: table, predicate_builder: predicate_builder, values: values)
       add_cpk_support if klass && klass.composite?
     end
 
@@ -68,12 +68,12 @@ module ActiveRecord
       stmt.from(table)
 
       # CPK
-      if joins_values.any? && @klass.composite?
+      if has_join_values? && @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 has_join_values?
+      elsif has_join_values? || has_limit_or_offset?
         @klass.connection.join_to_delete(stmt, arel, arel_attribute(primary_key))
       else
         stmt.wheres = arel.constraints

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -58,11 +58,9 @@ module CompositePrimaryKeys
               relation = relation.where(conditions)
             end
           when Array, Hash
-            relation = relation.where(conditions)
+            relation.where!(conditions)
           else
-            unless conditions == :none
-              relation = relation.where(primary_key => conditions)
-            end
+            relation.where!(primary_key => conditions) unless conditions == :none
         end
 
         relation

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

@@ -4,11 +4,13 @@ module ActiveRecord
       def queries
         # CPK
         if associated_table.association_join_foreign_key.is_a?(Array)
-          result = associated_table.association_join_foreign_key.zip(ids).reduce(Hash.new) do |hash, pair|
-            hash[pair.first.to_s] = pair.last
-            hash
+          if ids.is_a?(ActiveRecord::Relation)
+            ids.map do |id|
+              id.ids_hash
+            end
+          else
+            [associated_table.association_join_foreign_key.zip(ids).to_h]
           end
-          [result]
         else
           [associated_table.association_join_foreign_key.to_s => ids]
         end

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -0,0 +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 || record.id)
+          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

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 11
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta4'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'rc1'].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.beta4
+  version: 11.0.0.rc1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,6 +128,7 @@ files:
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation/where_clause.rb
 - lib/composite_primary_keys/sanitization.rb
+- lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
 - scripts/console.rb
 - scripts/txt2html