composite_primary_keys 3.1.5 → 3.1.6

data/History.txt

@@ -1,7 +1,14 @@
+== 3.1.6 2011-04-03
+* Updated belongs_to association to be a bit more flexible with non-CPK
+  base models (Jacques Fuentes)
+* Fix uniqueness check (David Rueck)
+* Fix write issue when one of they keys in a composite key is
+  called id (Tom Hughes)
+
 == 3.1.5 2011-03-24
 * Fix simple calculation methods
 * Fix instantiation of cpk records via associations.
-* Fix Relation#delete_all
+* Fix Relation#delete
 * Fix Relation#destroy
 
 == 3.1.4 2011-03-06

data/lib/composite_primary_keys.rb

@@ -62,6 +62,7 @@ require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/reflection'
 require 'composite_primary_keys/relation'
 require 'composite_primary_keys/read'
+require 'composite_primary_keys/write'
 require 'composite_primary_keys/finder_methods'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/calculations'

data/lib/composite_primary_keys/associations/association_proxy.rb

@@ -18,10 +18,11 @@ module ActiveRecord
           record["#{@reflection.options[:as]}_type"] = @owner.class.base_class.name.to_s
         else
           unless @owner.new_record?
-            primary_key = @reflection.options[:primary_key] || :id
+            primary_keys = Array(@reflection.options[:primary_key] || :id)
             # CPK
             # record[@reflection.primary_key_name] = @owner.send(primary_key)
-            values = [@owner.send(primary_key)].flatten
+            # Need to flatten because a key may be :id giving a composite key
+            values = primary_keys.map {|key| @owner.send(key)}.flatten
             key_values = @reflection.cpk_primary_key.zip(values)
             key_values.each {|key, value| record[key] = value}
           end

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -26,7 +26,7 @@ module ActiveRecord
             predicate = nil
             record.ids_hash.each do |key, value|
               neq = relation.table[key].not_eq(value)
-              predicate = predicate ? predicate.and(neq) : neq
+              predicate = predicate ? predicate.or(neq) : neq
             end
             relation = relation.where(predicate)
           else

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/lib/composite_primary_keys/write.rb

@@ -0,0 +1,18 @@
+module ActiveRecord
+  module AttributeMethods
+    module Write
+      def write_attribute(attr_name, value)
+        attr_name = attr_name.to_s
+        # CPK
+        # attr_name = self.class.primary_key if attr_name == 'id'
+        attr_name = self.class.primary_key if (attr_name == 'id' and !self.composite?)
+        @attributes_cache.delete(attr_name)
+        if (column = column_for_attribute(attr_name)) && column.number?
+          @attributes[attr_name] = convert_number_column_value(value)
+        else
+          @attributes[attr_name] = value
+        end
+      end
+    end
+  end
+end

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -111,3 +111,10 @@ create table restaurants_suburbs (
 	city_id integer not null,
 	suburb_id integer not null
 );
+
+create table way_nodes (
+  id integer not null,
+  node_id integer not null,
+  sequence_id integer not null,
+  primary key (id, sequence_id)
+);

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -14,3 +14,4 @@ drop table PRODUCT_TARIFFS;
 drop table KITCHEN_SINK;
 drop table RESTAURANTS;
 drop table RESTAURANTS_SUBURBS;
+drop table WAY_NODES;

data/test/fixtures/db_definitions/mysql.sql

@@ -184,3 +184,10 @@ create table capitols (
   city varchar(100) default null,
   primary key (country, city)
 ) type=InnoDB;
+
+create table way_nodes (
+  id int(11) not null,
+  node_id int(11) not null,
+  sequence_id int(11) not null,
+  primary key (id, sequence_id)
+) type=InnoDB;

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

@@ -37,3 +37,4 @@ drop table room_attribute_assignments;
 drop table room_assignments;
 drop table students;
 drop sequence students_seq;
+drop table way_nodes;

data/test/fixtures/db_definitions/oracle.sql

@@ -186,3 +186,9 @@ create table room_assignments (
     room_id    number(11) not null
 );
 
+create table way_nodes (
+    id number(11) not null,
+    node_id number(11) not null,
+    sequence_id number(11) not null,
+    constraint way_nodes_pk primary key (id, sequence_id)
+);

data/test/fixtures/db_definitions/postgresql.sql

@@ -210,3 +210,10 @@ create table capitols (
   city text not null,
   primary key (country, city)
 );
+
+create table way_nodes (
+  id int not null,
+  node_id int not null,
+  sequence_id int not null,
+  primary key (id, sequence_id)
+);

data/test/fixtures/db_definitions/sqlite.sql

@@ -170,3 +170,10 @@ create table capitols (
   city text not null,
   primary key (country, city)
 );
+
+create table way_nodes (
+  id integer not null,
+  node_id integer not null,
+  sequence_id integer not null,
+  primary key (id, sequence_id)
+);

data/test/fixtures/seats.yml

@@ -2,3 +2,8 @@ seat1:
   flight_number: 1
   seat: 1
   customer: 1
+
+seat2:
+  flight_number: 1
+  seat: 2
+  customer: 2

data/test/fixtures/way_node.rb

@@ -0,0 +1,3 @@
+class WayNode < ActiveRecord::Base
+  set_primary_keys :id, :sequence_id
+end

data/test/test_ids.rb

@@ -8,27 +8,27 @@ class TestIds < ActiveSupport::TestCase
       :class => ReferenceType,
       :primary_keys => [:reference_type_id],
     },
-    :dual   => { 
+    :dual   => {
       :class => ReferenceCode,
       :primary_keys => [:reference_type_id, :reference_code],
     },
-    :dual_strs   => { 
+    :dual_strs   => {
       :class => ReferenceCode,
       :primary_keys => ['reference_type_id', 'reference_code'],
     },
   }
-  
+
   def setup
     self.class.classes = CLASSES
   end
-  
+
   def test_id
     testing_with do
       assert_equal @first.id, @first.ids if composite?
       assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
     end
   end
-  
+
   def test_ids_to_s
     testing_with do
       order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
@@ -37,7 +37,7 @@ class TestIds < ActiveSupport::TestCase
       assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
     end
   end
-  
+
   def test_set_ids_string
     testing_with do
       array = @primary_keys.collect {|key| 5}
@@ -46,7 +46,7 @@ class TestIds < ActiveSupport::TestCase
       assert_equal expected, @first.id
     end
   end
-  
+
   def test_set_ids_array
     testing_with do
       array = @primary_keys.collect {|key| 5}
@@ -55,7 +55,7 @@ class TestIds < ActiveSupport::TestCase
       assert_equal expected, @first.id
     end
   end
-  
+
   def test_set_ids_comp
     testing_with do
       array = @primary_keys.collect {|key| 5}
@@ -64,7 +64,7 @@ class TestIds < ActiveSupport::TestCase
       assert_equal expected, @first.id
     end
   end
-  
+
   def test_primary_keys
     testing_with do
       if composite?
@@ -79,4 +79,20 @@ class TestIds < ActiveSupport::TestCase
       end
     end
   end
-end
+
+  def test_assign_ids
+    ref_code = ReferenceCode.new
+    assert_equal([nil, nil], ref_code.id)
+
+    ref_code.id = [2,1]
+    assert_equal([2,1], ref_code.id)
+  end
+
+  def test_id_as_component
+    way_node = WayNode.new
+    assert_equal([nil, nil], way_node.id)
+
+    way_node.id = [2,1]
+    assert_equal([2,1], way_node.id)
+  end
+end

data/test/test_validations.rb

@@ -3,8 +3,11 @@ require 'abstract_unit'
 class TestValidations < ActiveSupport::TestCase
   fixtures :seats
 
-  def test_uniqueness_validation_on_saved_record
-    s = Seat.find([1,1])
-    assert s.valid?
+  def test_uniqueness_validation_persisted
+    seat = Seat.find([1,1])
+    assert(seat.valid?)
+
+    seat.customer = 2
+    assert(!seat.valid?)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -06:00
+date: 2011-04-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - lib/composite_primary_keys/relation.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
+- lib/composite_primary_keys/write.rb
 - lib/composite_primary_keys.rb
 - scripts/console.rb
 - scripts/txt2html
@@ -179,6 +180,7 @@ files:
 - test/fixtures/tariffs.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
+- test/fixtures/way_node.rb
 - test/hash_tricks.rb
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb