composite_primary_keys 7.0.16 → 8.0.0

data/test/test_touch.rb

@@ -1,23 +1,23 @@
-# Test cases devised by Santiago that broke the Composite Primary Keys
-# code at one point in time. But no more!!!
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestTouch < ActiveSupport::TestCase
-  fixtures :products, :tariffs
-
-  def test_touching_a_record_updates_its_timestamp
-    tariff                = tariffs(:flat)
-    previous_amount       = tariff.amount
-    previously_updated_at = tariff.updated_at
-
-    tariff.amount         = previous_amount + 1
-    sleep 1.0 # we need to sleep for 1 second because the times updated (on mysql, at least) are only precise to 1 second.
-    tariff.touch
-    assert_not_equal previously_updated_at, tariff.updated_at
-    assert_equal previous_amount + 1, tariff.amount
-    assert tariff.amount_changed?, 'tarif amount should have changed'
-    assert tariff.changed?, 'tarif should be marked as changed'
-    tariff.reload
-    assert_not_equal previously_updated_at, tariff.updated_at
-  end
-end
+# Test cases devised by Santiago that broke the Composite Primary Keys
+# code at one point in time. But no more!!!
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestTouch < ActiveSupport::TestCase
+  fixtures :products, :tariffs
+
+  def test_touching_a_record_updates_its_timestamp
+    tariff                = tariffs(:flat)
+    previous_amount       = tariff.amount
+    previously_updated_at = tariff.updated_at
+
+    tariff.amount         = previous_amount + 1
+    sleep 1.0 # we need to sleep for 1 second because the times updated (on mysql, at least) are only precise to 1 second.
+    tariff.touch
+    assert_not_equal previously_updated_at, tariff.updated_at
+    assert_equal previous_amount + 1, tariff.amount
+    assert tariff.amount_changed?, 'tarif amount should have changed'
+    assert tariff.changed?, 'tarif should be marked as changed'
+    tariff.reload
+    assert_not_equal previously_updated_at, tariff.updated_at
+  end
+end

data/test/test_tutorial_example.rb

@@ -1,22 +1,22 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestTutorialExample < ActiveSupport::TestCase
-  fixtures :users, :groups, :memberships, :membership_statuses
-  
-  def test_membership
-    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
-    assert(membership.user)
-    assert(membership.group)
-  end
-  
-  def test_status
-    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
-    assert(statuses = membership.statuses, "No has_many association to status")
-    assert_equal(membership, statuses.first.membership)
-  end
-  
-  def test_count
-    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
-    assert_equal(1, membership.statuses.count)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestTutorialExample < ActiveSupport::TestCase
+  fixtures :users, :groups, :memberships, :membership_statuses
+  
+  def test_membership
+    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
+    assert(membership.user)
+    assert(membership.group)
+  end
+  
+  def test_status
+    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
+    assert(statuses = membership.statuses, "No has_many association to status")
+    assert_equal(membership, statuses.first.membership)
+  end
+  
+  def test_count
+    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
+    assert_equal(1, membership.statuses.count)
+  end
 end

data/test/test_update.rb

@@ -1,71 +1,71 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestUpdate < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-      :update => { :description => 'RT Desc' },
-    },
-    :dual   => {
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-      :update => { :description => 'RT Desc' },
-    },
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_setup
-    testing_with do
-      assert_not_nil @klass_info[:update]
-    end
-  end
-
-  def test_update_attributes
-    testing_with do
-      assert(@first.update_attributes(@klass_info[:update]))
-      assert(@first.reload)
-      @klass_info[:update].each_pair do |attr_name, new_value|
-        assert_equal(new_value, @first[attr_name])
-      end
-    end
-  end
-
-  def test_update_primary_key
-    obj = ReferenceCode.find([1,1])
-    obj.reference_type_id = 2
-    obj.reference_code = 3
-    assert(obj.primary_key_changed?)
-    assert_equal({"reference_type_id" => 1, "reference_code" => 1}, obj.primary_key_was)
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal(2, obj.reference_type_id)
-    assert_equal(3, obj.reference_code)
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert_equal([2, 3], obj.id)
-  end
-
-  def test_update_attribute
-    obj = ReferenceType.find(1)
-    obj[:abbreviation] = 'a'
-    obj['abbreviation'] = 'b'
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal('b', obj.abbreviation)
-  end
-
-  def test_update_all
-    assert_nothing_raised do
-      reference_code = ReferenceCode.create
-      primary_key = reference_code.class.primary_key
-      ReferenceCode.where(primary_key => reference_code[primary_key]).
-        update_all(description: 'random value')
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestUpdate < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+      :update => { :description => 'RT Desc' },
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+      :update => { :description => 'RT Desc' },
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_setup
+    testing_with do
+      assert_not_nil @klass_info[:update]
+    end
+  end
+
+  def test_update_attributes
+    testing_with do
+      assert(@first.update_attributes(@klass_info[:update]))
+      assert(@first.reload)
+      @klass_info[:update].each_pair do |attr_name, new_value|
+        assert_equal(new_value, @first[attr_name])
+      end
+    end
+  end
+
+  def test_update_primary_key
+    obj = ReferenceCode.find([1,1])
+    obj.reference_type_id = 2
+    obj.reference_code = 3
+    assert(obj.primary_key_changed?)
+    assert_equal({"reference_type_id" => 1, "reference_code" => 1}, obj.primary_key_was)
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal(2, obj.reference_type_id)
+    assert_equal(3, obj.reference_code)
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert_equal([2, 3], obj.id)
+  end
+
+  def test_update_attribute
+    obj = ReferenceType.find(1)
+    obj[:abbreviation] = 'a'
+    obj['abbreviation'] = 'b'
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal('b', obj.abbreviation)
+  end
+
+  def test_update_all
+    assert_nothing_raised do
+      reference_code = ReferenceCode.create
+      primary_key = reference_code.class.primary_key
+      ReferenceCode.where(primary_key => reference_code[primary_key]).
+        update_all(description: 'random value')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.16
+  version: 8.0.0
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.2.0
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -35,22 +35,22 @@ files:
 - README_DB2.rdoc
 - Rakefile
 - lib/composite_primary_keys.rb
-- lib/composite_primary_keys/arel/visitors/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_scope.rb
-- lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb
+- lib/composite_primary_keys/associations/collection_association.rb
 - lib/composite_primary_keys/associations/has_many_association.rb
 - lib/composite_primary_keys/associations/has_many_through_association.rb
 - lib/composite_primary_keys/associations/join_dependency.rb
 - lib/composite_primary_keys/associations/join_dependency/join_association.rb
-- lib/composite_primary_keys/associations/join_dependency/join_part.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
 - lib/composite_primary_keys/associations/preloader/belongs_to.rb
-- lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb
+- lib/composite_primary_keys/associations/singular_association.rb
+- lib/composite_primary_keys/attribute_methods.rb
 - lib/composite_primary_keys/attribute_methods/dirty.rb
 - lib/composite_primary_keys/attribute_methods/primary_key.rb
 - lib/composite_primary_keys/attribute_methods/read.rb
 - lib/composite_primary_keys/attribute_methods/write.rb
+- lib/composite_primary_keys/attribute_set/builder.rb
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
@@ -58,11 +58,9 @@ files:
 - lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
-- lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb
 - lib/composite_primary_keys/core.rb
 - lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
-- lib/composite_primary_keys/locking/optimistic.rb
 - lib/composite_primary_keys/model_schema.rb
 - lib/composite_primary_keys/nested_attributes.rb
 - lib/composite_primary_keys/persistence.rb
@@ -191,7 +189,6 @@ files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
-- test/test_optimistic.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb
@@ -222,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
@@ -252,7 +249,6 @@ test_files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
-- test/test_optimistic.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb

data/lib/composite_primary_keys/arel/visitors/to_sql.rb

@@ -1,20 +0,0 @@
-module Arel
-  module Visitors
-    class ToSql
-      def visit_Arel_Nodes_In o, a
-        if Array === o.right && o.right.empty?
-          '1=0'
-        else
-          a = o.left if Arel::Attributes::Attribute === o.left
-          # CPK
-          #"#{visit o.left, a} IN (#{visit o.right, a})"
-          if o.left.name.is_a?(Array)
-          "(#{visit o.left, a}) IN (#{visit o.right, a})"
-          else
-            "#{visit o.left, a} IN (#{visit o.right, a})"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -1,59 +0,0 @@
-module ActiveRecord
-  module Associations
-    class HasAndBelongsToManyAssociation
-      def insert_record(record, validate = true, raise = false)
-        if record.new_record?
-          if raise
-            record.save!(:validate => validate)
-          else
-            return unless record.save(:validate => validate)
-          end
-        end
-
-        if options[:insert_sql]
-          owner.class.connection.insert(interpolate(options[:insert_sql], record))
-        else
-          # CPK
-          #stmt = join_table.compile_insert(
-          #  join_table[reflection.foreign_key]             => owner.id,
-          #  join_table[reflection.association_foreign_key] => record.id
-          #)
-          join_values = Hash.new
-          Array(reflection.foreign_key).zip(Array(owner.id)) do |name, value|
-            attribute = join_table[name]
-            join_values[attribute] = value
-          end
-
-          Array(reflection.association_foreign_key).zip(Array(record.id)) do |name, value|
-            attribute = join_table[name]
-            join_values[attribute] = value
-          end
-
-          stmt = join_table.compile_insert(join_values)
-
-          owner.class.connection.insert stmt.to_sql
-        end
-
-        record
-      end
-
-      def delete_records(records, method)
-        if sql = options[:delete_sql]
-          records.each { |record| owner.class.connection.delete(interpolate(sql, record)) }
-        else
-          relation = join_table
-          # CPK
-          # stmt = relation.where(relation[reflection.foreign_key].eq(owner.id).
-          #  and(relation[reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
-          #).compile_delete
-
-          predicate1 = cpk_id_predicate(relation, Array(reflection.foreign_key), Array(owner.id))
-          predicate2 = cpk_in_predicate(relation, Array(reflection.association_foreign_key), records.map { |x| x.id }) unless records == :all
-          stmt = relation.where(predicate1.and(predicate2)).compile_delete
-
-          owner.class.connection.delete stmt.to_sql
-        end
-      end
-    end    
-  end
-end

data/lib/composite_primary_keys/associations/join_dependency/join_part.rb

@@ -1,39 +0,0 @@
-module ActiveRecord
-  module Associations
-    class JoinDependency
-      class JoinPart
-        def aliased_primary_key
-          # CPK
-          # "#{aliased_prefix}_r0"
-
-          base_klass.composite? ?
-            primary_key.inject([]) {|aliased_keys, key| aliased_keys << "#{ aliased_prefix }_r#{aliased_keys.length}"} :
-            "#{ aliased_prefix }_r0"
-        end
-
-        def record_id(row)
-          # CPK
-          # row[aliased_primary_key]
-          base_klass.composite? ?
-            aliased_primary_key.map {|key| row[key]}.to_composite_keys :
-            row[aliased_primary_key]
-        end
-
-        def column_names_with_alias
-          unless @column_names_with_alias
-            @column_names_with_alias = []
-
-            # CPK
-            #([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
-            keys = base_klass.composite? ? primary_key.map(&:to_s) : [primary_key]
-
-            (keys + (column_names - keys)).each_with_index do |column_name, i|
-              @column_names_with_alias << [column_name, "#{aliased_prefix}_r#{i}"]
-            end
-          end
-          @column_names_with_alias
-        end
-      end
-    end
-  end
-end