composite_primary_keys 8.1.5 → 8.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abff4d9e394b49dc7b5202df306d247ac92cbcd4
-  data.tar.gz: f0faa4bff366aba7dd02ce375eb1ba69b0b33cff
+  metadata.gz: 1f837ed1d8f5f9a5af46c14b91dfed1101e55de3
+  data.tar.gz: e115fe2d97338b6d2aa19132be1f936f107dea74
 SHA512:
-  metadata.gz: 25822213d2b20007dfa81137f7504e6df9b86b75e41592bf9adfb75ef903c234d3d5dcda2a4df8a82a0579701b1db8bea0a4320b9db62ce3aae2c96999236d48
-  data.tar.gz: 9734252590c4f158064e6c8f8ef1e695892f97084731639bd5875c9b0f67c18bc51070b3a7cc458b1477a53b85ebcdc915f561735b3f780d147fd9d77affd0e5
+  metadata.gz: f81ee887e2a3145def527fbdce440bd2cc986fa2a03d4fef914e269e642ba355d09c307cb8be25723d6d79fed632fe238cd28376fb6734a549de54d7b9f16a2a
+  data.tar.gz: 2e0166164b07de368e07758d72029c6461fab1596d311c11634b8c4e97dfd4159a3593d5acde2af2b60eec7701b7214f8487824b3b6185d687df064b5ebe91ef

data/History.rdoc

@@ -1,3 +1,12 @@
+== 8.1.6 (2017-05-20)
+
+Query cache with bind params (ttw)
+Fix TestIds#test_set_ids_string. Sqlite's serial and integer are a bit different (Boris Peterbarg)
+Associations with inverse fix (Boris Peterbarg)
+Fix save_has_one_association and add a test for it (Boris Peterbarg)
+Fix save_belongs_to_association override (Boris Peterbarg)
+Extend approach from #344 to fix autosave for has_one associations as well (Cameron Finucane)
+
 == 8.1.5 (2017-01-01)
 
 * Don't nest PK twice when looking up id, fixes #319 (Kerey Roper)

data/README_DB2.rdoc

@@ -1,33 +1,33 @@
-Composite Primary key support for db2 
-
-== Driver Support
-
-DB2 support requires the IBM_DB driver provided by http://rubyforge.org/projects/rubyibm/
-project. Install using gem install ibm_db. Tested against version 0.60 of the driver.
-This rubyforge project appears to be permenant location for the IBM adapter.
-Older versions of the driver available from IBM Alphaworks will not work. 
-
-== Driver Bug and workaround provided as part of this plugin
-
-Unlike the basic quote routine available for Rails AR, the DB2 adapter's quote
-method doesn't return " column_name = 1 " when string values (integers in string type variable) 
-are passed for quoting numeric column. Rather it returns "column_name = '1'. 
-DB2 doesn't accept single quoting numeric columns in SQL. Currently, as part of 
-this plugin a fix is provided for the DB2 adapter since this plugin does 
-pass string values like this. Perhaps a patch should be sent to the DB2 adapter
-project for a permanant fix.
-
-== Database Setup
-
-Database must be manually created using a separate command. Read the rake task
-for creating tables and change the db name, user and passwords accordingly.
-
-== Tested Database Server version
-
-This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
-
-== Tested Database Client version
-
-This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
-
-
+Composite Primary key support for db2 
+
+== Driver Support
+
+DB2 support requires the IBM_DB driver provided by http://rubyforge.org/projects/rubyibm/
+project. Install using gem install ibm_db. Tested against version 0.60 of the driver.
+This rubyforge project appears to be permenant location for the IBM adapter.
+Older versions of the driver available from IBM Alphaworks will not work. 
+
+== Driver Bug and workaround provided as part of this plugin
+
+Unlike the basic quote routine available for Rails AR, the DB2 adapter's quote
+method doesn't return " column_name = 1 " when string values (integers in string type variable) 
+are passed for quoting numeric column. Rather it returns "column_name = '1'. 
+DB2 doesn't accept single quoting numeric columns in SQL. Currently, as part of 
+this plugin a fix is provided for the DB2 adapter since this plugin does 
+pass string values like this. Perhaps a patch should be sent to the DB2 adapter
+project for a permanant fix.
+
+== Database Setup
+
+Database must be manually created using a separate command. Read the rake task
+for creating tables and change the db name, user and passwords accordingly.
+
+== Tested Database Server version
+
+This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
+
+== Tested Database Client version
+
+This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
+
+

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -2,6 +2,27 @@ module ActiveRecord
   module Associations
     class AssociationScope
 
+      def self.get_bind_values(owner, chain)
+        binds = []
+        last_reflection = chain.last
+
+        # CPK
+        # binds << last_reflection.join_id_for(owner)
+        values = last_reflection.join_id_for(owner)
+        binds += Array(values)
+
+        if last_reflection.type
+          binds << owner.class.base_class.name
+        end
+
+        chain.each_cons(2).each do |reflection, next_reflection|
+          if reflection.type
+            binds << next_reflection.klass.base_class.name
+          end
+        end
+        binds
+      end
+
       def next_chain_scope(scope, table, reflection, tracker, assoc_klass, foreign_table, next_reflection)
         join_keys = reflection.join_keys(assoc_klass)
         key = join_keys.key
@@ -26,8 +47,12 @@ module ActiveRecord
         foreign_key = join_keys.foreign_key
 
         if key.kind_of?(Array) || foreign_key.kind_of?(Array)
-          predicate = cpk_join_predicate(table, key, owner, foreign_key)
-          scope = scope.where(predicate)
+          key = Array(key) unless key.kind_of?(Array)
+          foreign_key = Array(foreign_key) unless foreign_key.kind_of?(Array)
+          key.zip(foreign_key).map do |k, fk|
+            bind_val = bind scope, table.table_name, k.to_s, owner[fk], tracker
+            scope    = scope.where(table[k].eq(bind_val))
+          end
         else
           bind_val = bind scope, table.table_name, key.to_s, owner[foreign_key], tracker
           scope    = scope.where(table[key].eq(bind_val))

data/lib/composite_primary_keys/autosave_association.rb

@@ -17,8 +17,9 @@ module ActiveRecord
             saved = record.save(:validate => !autosave) if record.new_record? || (autosave && record.changed_for_autosave?)
 
             if association.updated?
-              # it will fail to use "#record.send(reflection.options[:primary_key] || :id)" for CPK
-              association_id = record.read_attribute(reflection.options[:primary_key] || :id)
+              # CPK
+              # association_id = record.send(reflection.options[:primary_key] || :id)
+              association_id = reflection.options[:primary_key] ? record.read_attribute(reflection.options[:primary_key]) : record.id
               self[reflection.foreign_key] = association_id
               association.loaded!
             end
@@ -27,5 +28,40 @@ module ActiveRecord
           end
         end
       end
+
+      # Saves the associated record if it's new or <tt>:autosave</tt> is enabled
+      # on the association.
+      #
+      # In addition, it will destroy the association if it was marked for
+      # destruction with mark_for_destruction.
+      #
+      # This all happens inside a transaction, _if_ the Transactions module is included into
+      # ActiveRecord::Base after the AutosaveAssociation module, which it does by default.
+      def save_has_one_association(reflection)
+        association = association_instance_get(reflection.name)
+        record      = association && association.load_target
+
+        if record && !record.destroyed?
+          autosave = reflection.options[:autosave]
+
+          if autosave && record.marked_for_destruction?
+            record.destroy
+          elsif autosave != false
+            # CPK
+            #key = reflection.options[:primary_key] ? send(reflection.options[:primary_key]) : id
+            key = reflection.options[:primary_key] ? read_attribute(reflection.options[:primary_key]) : id
+
+            if (autosave && record.changed_for_autosave?) || new_record? || record_changed?(reflection, record, key)
+              unless reflection.through_reflection
+                record[reflection.foreign_key] = key
+              end
+
+              saved = record.save(:validate => !autosave)
+              raise ActiveRecord::Rollback if !saved && autosave
+              saved
+            end
+          end
+        end
+      end
   end
 end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/db_definitions/mysql.sql

@@ -116,6 +116,7 @@ create table employees (
     id int not null auto_increment,
     department_id int default null,
     location_id int default null,
+    name varchar(100) not null default 'anonymous',
     primary key (id)
 );
 
@@ -216,3 +217,12 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
+
+create table pk_called_ids (
+    id serial not null,
+    reference_code    int         not null,
+    code_label        varchar(50) default null,
+    abbreviation      varchar(50) default null,
+    description       varchar(50) default null,
+    primary key (id, reference_code)
+);

data/test/fixtures/db_definitions/oracle.sql

@@ -124,7 +124,8 @@ create sequence employees_seq start with 1000;
 create table employees (
     id            number(11) not null primary key,
     department_id number(11) default null,
-    location_id   number(11) default null
+    location_id   number(11) default null,
+    name          varchar2(100) default 'anonymous'
 );
 
 create sequence salaries_seq start with 1000;

data/test/fixtures/db_definitions/postgresql.sql

@@ -118,6 +118,7 @@ create table employees (
     id            serial not null,
     department_id int default null,
     location_id   int default null,
+    name          text not null default 'anonymous',
     primary key (id)
 );
 

data/test/fixtures/db_definitions/sqlite.sql

@@ -109,6 +109,7 @@ create table departments (
 create table employees (
     id integer not null primary key autoincrement,
     department_id integer null,
+    name text not null default 'anonymous',
     location_id integer null
 );
 
@@ -204,3 +205,11 @@ create table employees_groups (
   group_id integer not null
 );
 
+create table pk_called_ids (
+    id integer not null,
+    reference_code    int         not null,
+    code_label        varchar(50) default null,
+    abbreviation      varchar(50) default null,
+    description       varchar(50) default null,
+    primary key (id, reference_code)
+);

data/test/fixtures/db_definitions/sqlserver.sql

@@ -126,7 +126,8 @@ go
 CREATE TABLE employees (
     id            [int] IDENTITY(1000,1) NOT NULL,
     department_id [int] NULL,
-    location_id   [int] NULL
+    location_id   [int] NULL,
+    name          varchar(100) NOT NULL
 );
 go
 

data/test/fixtures/employee.rb

@@ -7,5 +7,6 @@ class Employee < ActiveRecord::Base
           :foreign_key => [:employee_id, :location_id]
         has_one :one_salary, :class_name => "Salary",
           :primary_key => [:id, :location_id],
-          :foreign_key => [:employee_id, :location_id]
+          :foreign_key => [:employee_id, :location_id],
+          :inverse_of => :employee
 end

data/test/fixtures/employees.yml

@@ -1,19 +1,23 @@
-steve:
-  id: 1
-  department_id: 1
-  location_id: 1
-
-jill:
-  id: 2
-  department_id: 1
-  location_id: 1
-
-sarah:
-  id: 3
-  department_id: 2
-  location_id: 1
-
-robert:
-  id: 4
-  department_id: 2
-  location_id: 1
+steve:
+  id: 1
+  department_id: 1
+  location_id: 1
+  name: steve
+
+jill:
+  id: 2
+  department_id: 1
+  location_id: 1
+  name: jill
+
+sarah:
+  id: 3
+  department_id: 2
+  location_id: 1
+  name: sarah
+
+robert:
+  id: 4
+  department_id: 2
+  location_id: 1
+  name: robert

data/test/test_associations.rb

@@ -91,6 +91,13 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(room_assignment.room_id, 1001)
   end
 
+  def test_association_with_composite_primary_key_can_be_autosaved_on_update
+    robert = employees(:robert)
+    robert_salary = robert.create_one_salary(year: "2015", month: "1")
+    robert.update(name: robert.name.reverse)
+    assert_equal(robert.id, robert_salary.employee_id)
+  end
+
   def test_has_one_association_primary_key_and_foreign_key_are_present
     steve = employees(:steve)
     steve_salary = steve.create_one_salary(year: "2015", month: "1")

data/test/test_create.rb

@@ -123,7 +123,7 @@ class TestCreate < ActiveSupport::TestCase
     assignment1 = RoomAssignment.new(:student_id => student1.id, :dorm_id => room.dorm_id, :room_id => room.room_id)
     assignment1.save!
 
-    room.room_assignment_ids = [[assignment1.student_id, assignment1.dorm_id, assignment1.room_id]]
+    room.room_assignments = [assignment1]
     room.save!
 
     assert_equal(1, room.room_assignments.length)
@@ -146,8 +146,7 @@ class TestCreate < ActiveSupport::TestCase
     assignment2 = RoomAssignment.new(:student_id => student2.id, :dorm_id => room.dorm_id, :room_id => room.room_id)
     assignment2.save!
 
-    room.room_assignment_ids = [[assignment1.student_id, assignment1.dorm_id, assignment1.room_id],
-                                [assignment2.student_id, assignment2.dorm_id, assignment2.room_id]]
+    room.room_assignments = [assignment1,assignment2]
     room.save!
 
     assert_equal(2, room.room_assignments.length)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 8.1.5
+  version: 8.1.6
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -271,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord