composite_primary_keys 6.0.8 → 7.0.0

data/test/fixtures/db_definitions/sqlserver.drop.sql

@@ -83,7 +83,4 @@ DROP TABLE capitols;
 go
 
 DROP TABLE products_restaurants;
-go
-
-DROP TABLE model_with_callbacks;
-go
+go

data/test/fixtures/db_definitions/sqlserver.sql

@@ -28,7 +28,7 @@ CREATE TABLE tariffs (
     [tariff_id]  [int],
     [start_date] [date],
     [amount]     [int] NULL
-    CONSTRAINT [tariffs_pk] PRIMARY KEY
+    CONSTRAINT [tariffs_pk] PRIMARY KEY 
         ( [tariff_id], [start_date] )
 );
 go
@@ -88,7 +88,7 @@ go
 CREATE TABLE memberships (
     user_id  [int] NOT NULL,
     group_id [int] NOT NULL
-    CONSTRAINT [memberships_pk] PRIMARY KEY
+    CONSTRAINT [memberships_pk] PRIMARY KEY 
         ( [user_id], [group_id] )
 );
 go
@@ -133,9 +133,8 @@ go
 CREATE TABLE restaurants (
     franchise_id [int] NOT NULL,
     store_id     [int] NOT NULL,
-    name         [varchar](100),
-    lock_version [int] DEFAULT 0
-    CONSTRAINT [restaurants_pk] PRIMARY KEY CLUSTERED
+    name         [varchar](100)
+    CONSTRAINT [restaurants_pk] PRIMARY KEY CLUSTERED 
         ( [franchise_id], [store_id] )
 );
 go
@@ -156,7 +155,7 @@ go
 CREATE TABLE rooms (
     dorm_id [int] NOT NULL,
     room_id [int] NOT NULL,
-    CONSTRAINT [rooms_pk] PRIMARY KEY CLUSTERED
+    CONSTRAINT [rooms_pk] PRIMARY KEY CLUSTERED 
         ( [dorm_id], [room_id] )
 );
 go
@@ -198,7 +197,7 @@ go
 CREATE TABLE capitols (
     country varchar(450) NOT NULL,
     city varchar(450) NOT NULL
-    CONSTRAINT [capitols_pk] PRIMARY KEY
+    CONSTRAINT [capitols_pk] PRIMARY KEY 
         ( [country], [city] )
 );
 go
@@ -208,12 +207,4 @@ CREATE TABLE products_restaurants (
     franchise_id [int] NOT NULL,
     store_id     [int] NOT NULL
 );
-go
-
-CREATE TABLE model_with_callbacks (
-    reference_type_id [int],
-    reference_code    [int],
-    CONSTRAINT [model_with_callbacks_pk] PRIMARY KEY
-        ( [reference_type_id], [reference_code] )
-);
-go
+go

data/test/fixtures/dorm.rb

@@ -1,3 +1,3 @@
 class Dorm < ActiveRecord::Base
-  has_many :rooms, -> { includes(:room_attributes) }, :primary_key => [:id]
-end
+  has_many :rooms, -> {includes(:room_attributes)}, :primary_key => [:id]
+end

data/test/fixtures/suburb.rb

@@ -1,6 +1,6 @@
 class Suburb < ActiveRecord::Base
   self.primary_keys = :city_id, :suburb_id
   has_many :streets,  :foreign_key => [:city_id, :suburb_id]
-  has_many :first_streets, -> { where "streets.name = 'First Street'" },
+  has_many :first_streets, -> {where("streets.name = 'First Street'")},
            :foreign_key => [:city_id, :suburb_id], :class_name => 'Street'
-end
+end

data/test/test_associations.rb

@@ -260,7 +260,7 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_limitable_reflections
-    memberships = Membership.includes(:statuses).where("membership_statuses.status = ?", 'Active').limit(1)
+    memberships = Membership.includes(:statuses).where("membership_statuses.status = ?", 'Active').references(:membership_statuses).limit(1)
     assert_equal(1, memberships.length)
     assert_equal([1,1], memberships[0].id)
   end
@@ -271,5 +271,4 @@ class TestAssociations < ActiveSupport::TestCase
     associations = group.association_cache[:memberships]
     assert_equal(false, associations.send('foreign_key_present?'))
   end
-
 end

data/test/test_attribute_methods.rb

@@ -11,7 +11,7 @@ class TestAttributeMethods < ActiveSupport::TestCase
   end
 
   def test_read_attribute_with_composite_keys
-    ref_code = ReferenceCode.find(1, 1)
+    ref_code = ReferenceCode.find([1, 1])
     assert_equal(1, ref_code.id.first)
     assert_equal(1, ref_code.id.last)
     assert_equal('Mr', ref_code.abbreviation)
@@ -24,7 +24,7 @@ class TestAttributeMethods < ActiveSupport::TestCase
   end
 
   def test_to_key_with_composite_keys
-    ref_code = ReferenceCode.find(1, 1)
+    ref_code = ReferenceCode.find([1, 1])
     assert_equal(1, ref_code.to_key.first)
     assert_equal(1, ref_code.to_key.last)
   end
@@ -46,7 +46,7 @@ class TestAttributeMethods < ActiveSupport::TestCase
   end
 
   def test_to_key_with_composite_key_destroyed
-    ref_code = ReferenceCode.find(1, 1)
+    ref_code = ReferenceCode.find([1, 1])
     ref_code.destroy
     assert_equal([1,1], ref_code.to_key)
   end

data/test/test_delete.rb

@@ -90,13 +90,11 @@ class TestDelete < ActiveSupport::TestCase
   end
   
   def test_destroy_has_and_belongs_to_many_on_non_cpk
+    steve = employees(:steve)
     records_before = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    employee = Employee.create
-    employee.groups << Group.create(name: 'test')
-    employees_groups_count = employee.groups.count
-    employee.destroy!
+    steve.destroy
     records_after = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    assert_equal records_before, records_after
+    assert_equal records_after, records_before - steve.groups.count
   end
 
   def test_delete_not_destroy_on_cpk

data/test/test_equal.rb

@@ -4,7 +4,7 @@ class TestEqual < ActiveSupport::TestCase
   fixtures :capitols
 
   def test_new
-    assert_not_equal(Capitol.new.object_id, Capitol.new.object_id)
+    assert_not_equal(Capitol.new, Capitol.new)
   end
 
   def test_same_new
@@ -13,14 +13,14 @@ class TestEqual < ActiveSupport::TestCase
   end
 
   def test_same
-    first = Capitol.find('Canada', 'Ottawa')
-    second = Capitol.find('Canada', 'Ottawa')
+    first = Capitol.find(['Canada', 'Ottawa'])
+    second = Capitol.find(['Canada', 'Ottawa'])
     assert_equal(first, second)
   end
 
   def test_different
-    first = Capitol.find('Mexico', 'Mexico City')
-    second = Capitol.find('Canada', 'Ottawa')
+    first = Capitol.find(['Mexico', 'Mexico City'])
+    second = Capitol.find(['Canada', 'Ottawa'])
     assert_not_equal(first, second)
   end
 end

data/test/test_find.rb

@@ -22,12 +22,6 @@ class TestFind < ActiveSupport::TestCase
     assert_equal([1,3], ref_code.id)
   end
 
-  def test_find_one_string
-    ref_code = ReferenceCode.find('1,3')
-    assert_kind_of(ReferenceCode, ref_code)
-    assert_equal([1,3], ref_code.id)
-  end
-
   def test_find_some
     ref_codes = ReferenceCode.find([1,3], [2,1])
     assert_kind_of(Array, ref_codes)
@@ -71,14 +65,8 @@ class TestFind < ActiveSupport::TestCase
     ref_type_quoted = "#{connection.quote_table_name('reference_codes')}.#{connection.quote_column_name('reference_type_id')}"
     ref_code_quoted = "#{connection.quote_table_name('reference_codes')}.#{connection.quote_column_name('reference_code')}"
 
-    if current_adapter?(:SQLServerAdapter)
-      expected = "Couldn't find ReferenceCode with ID=999,999 WHERE #{ref_type_quoted} = N'999' AND #{ref_code_quoted} = N'999'"
-    else
-      expected = "Couldn't find ReferenceCode with ID=999,999 WHERE #{ref_type_quoted} = 999 AND #{ref_code_quoted} = 999"
-    end
-
-    assert_equal(with_quoted_identifiers(expected),
-                 error.message)
+    expected = "Couldn't find all ReferenceCodes with 'reference_type_id,reference_code': (999, 999) (found 0 results, but was looking for 1)"
+    assert_equal(with_quoted_identifiers(expected), error.message)
   end
 
   def test_find_last_suburb

data/test/test_predicates.rb

@@ -16,10 +16,10 @@ class TestEqual < ActiveSupport::TestCase
 
     connection = ActiveRecord::Base.connection
     quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    expected = "((#{quoted} = 0) OR (#{quoted} = 1) OR (#{quoted} = 2))"
+    expected = "(#{quoted} = 0 OR #{quoted} = 1 OR #{quoted} = 2)"
 
     pred = cpk_or_predicate(predicates)
-    assert_equal(with_quoted_identifiers(expected), pred.to_s)
+    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
   end
 
   def test_and

data/test/test_santiago.rb

@@ -6,7 +6,7 @@ class TestSantiago < ActiveSupport::TestCase
   fixtures :suburbs, :streets, :users, :articles, :readings
   
   def test_normal_and_composite_associations
-    assert_not_nil @suburb = Suburb.find(1,1)
+    assert_not_nil @suburb = Suburb.find([1, 1])
     assert_equal 1, @suburb.streets.length
     
     assert_not_nil @street = Street.find(1)

data/test/test_serialize.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
-class TestEqual < ActiveSupport::TestCase
+class TestSerialization < ActiveSupport::TestCase
   fixtures :departments
 
   def test_json

data/test/test_suite.rb

@@ -13,7 +13,6 @@
   test_habtm
   test_ids
   test_miscellaneous
-  test_optimistic
   test_pagination
   test_polymorphic
   test_predicates

data/test/test_tutorial_example.rb

@@ -4,19 +4,19 @@ 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 = 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(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(membership = Membership.find([1, 1]), "Cannot find a membership")
     assert_equal(1, membership.statuses.count)
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 6.0.8
+  version: 7.0.0
 platform: ruby
 authors:
-- Dr Nic Williams
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 4.1.0
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -52,11 +37,13 @@ files:
 - init.rb
 - install.rb
 - lib/composite_primary_keys.rb
+- lib/composite_primary_keys/active_model/dirty.rb
 - lib/composite_primary_keys/active_record_overides.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/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
@@ -64,20 +51,18 @@ files:
 - 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/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/base.rb
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
-- lib/composite_primary_keys/composite_relation.rb
 - 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/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
 - lib/composite_primary_keys/relation.rb
@@ -140,8 +125,6 @@ files:
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
 - test/fixtures/memberships.yml
-- test/fixtures/model_with_callback.rb
-- test/fixtures/model_with_callbacks.yml
 - test/fixtures/product.rb
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
@@ -185,12 +168,10 @@ files:
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
 - test/test_calculations.rb
-- test/test_callbacks.rb
 - test/test_composite_arrays.rb
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
-- test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb
@@ -199,7 +180,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
@@ -210,7 +190,7 @@ files:
 - test/test_tutorial_example.rb
 - test/test_update.rb
 - test/test_validations.rb
-homepage: https://github.com/drnic/composite_primary_keys
+homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses: []
 metadata: {}
 post_install_message: 
@@ -229,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
@@ -243,12 +223,10 @@ test_files:
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
 - test/test_calculations.rb
-- test/test_callbacks.rb
 - test/test_composite_arrays.rb
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
-- test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb
@@ -257,7 +235,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/attribute_methods/primary_key.rb

@@ -1,17 +0,0 @@
-module ActiveRecord
-  module AttributeMethods
-    module PrimaryKey
-      def id_was
-        sync_with_transaction_state
-
-        if self.composite?
-          self.class.primary_keys.map do |key_attr|
-            attribute_changed?(key_attr) ? changed_attributes[key_attr] : self.ids_hash[key_attr]
-          end
-        else
-          attribute_was(self.class.primary_key)
-        end
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/composite_relation.rb

@@ -1,44 +0,0 @@
-module CompositePrimaryKeys
-  module CompositeRelation
-    include CompositePrimaryKeys::ActiveRecord::Batches
-    include CompositePrimaryKeys::ActiveRecord::Calculations
-    include CompositePrimaryKeys::ActiveRecord::FinderMethods
-    include CompositePrimaryKeys::ActiveRecord::QueryMethods
-
-    def delete(id_or_array)
-      # Without CPK:
-      # where(primary_key => id_or_array).delete_all
-
-      id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
-        [id_or_array]
-      else
-        Array(id_or_array)
-      end
-
-      id_or_array.each do |id|
-        where(cpk_id_predicate(table, self.primary_key, id)).delete_all
-      end
-    end
-
-    def destroy(id_or_array)
-      # Without CPK:
-      #if id.is_a?(Array)
-      #  id.map { |one_id| destroy(one_id) }
-      #else
-      #  find(id).destroy
-      #end
-
-      id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
-        [id_or_array]
-      else
-        Array(id_or_array)
-      end
-
-      id_or_array.each do |id|
-        where(cpk_id_predicate(table, self.primary_key, id)).each do |record|
-          record.destroy
-        end
-      end
-    end
-  end
-end