composite_primary_keys 12.0.0.rc5 → 12.0.4

data/test/test_serialize.rb

@@ -5,11 +5,11 @@ class TestSerialization < ActiveSupport::TestCase
 
   def test_json
     department = Department.first
-    assert_equal('{"department_id":1,"location_id":1}', department.to_json)
+    assert_equal('{"id":1,"location_id":1}', department.to_json)
   end
 
   def test_serializable_hash
     department = Department.first
-    assert_equal({"department_id" => 1,"location_id" => 1}, department.serializable_hash)
+    assert_equal({"id" => 1,"location_id" => 1}, department.serializable_hash)
   end
 end

data/test/test_update.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestUpdate < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
+  fixtures :departments, :reference_types, :reference_codes, :rooms, :room_assignments
 
   CLASSES = {
     :single => {
@@ -36,6 +36,13 @@ class TestUpdate < ActiveSupport::TestCase
     end
   end
 
+  def test_update_attributes_with_id_field
+    department = departments(:accounting)
+    department.update_attribute(:location_id, 3)
+    department.reload
+    assert_equal(3, department.location_id)
+  end
+
   def test_update_primary_key
     obj = ReferenceCode.find([1,1])
     obj.reference_type_id = 2
@@ -76,4 +83,15 @@ class TestUpdate < ActiveSupport::TestCase
 
     assert_equal(2, query.count)
   end
+
+  def test_update_with_uniqueness
+    assignment = room_assignments(:jacksons_room)
+    room_1 = rooms(:branner_room_1)
+    room_2 = rooms(:branner_room_3)
+
+    assert_equal(room_1, assignment.room)
+    assignment.room = room_2
+    assignment.save!
+    assert_equal(room_2, assignment.room)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.0.rc5
+  version: 12.0.4
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,48 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -90,6 +48,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/composite_primary_keys.rb
+- lib/composite_primary_keys/active_model/attribute_assignment.rb
 - lib/composite_primary_keys/arel/sqlserver.rb
 - lib/composite_primary_keys/arel/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
@@ -112,6 +71,7 @@ files:
 - lib/composite_primary_keys/composite_relation.rb
 - lib/composite_primary_keys/connection_adapters/abstract/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
+- lib/composite_primary_keys/connection_adapters/mysql/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/postgresql/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/sqlserver/database_statements.rb
 - lib/composite_primary_keys/core.rb
@@ -146,7 +106,6 @@ files:
 - test/connections/databases.ci.yml
 - test/connections/databases.example.yml
 - test/connections/databases.yml
-- test/db_test.rb
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
 - test/fixtures/capitol.rb
@@ -169,14 +128,10 @@ files:
 - test/fixtures/employees.yml
 - test/fixtures/group.rb
 - test/fixtures/groups.yml
-- test/fixtures/hack.rb
-- test/fixtures/hacks.yml
 - test/fixtures/membership.rb
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
 - test/fixtures/memberships.yml
-- test/fixtures/pk_called_id.rb
-- test/fixtures/pk_called_ids.yml
 - test/fixtures/product.rb
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
@@ -184,8 +139,6 @@ files:
 - test/fixtures/reading.rb
 - test/fixtures/readings.yml
 - test/fixtures/reference_code.rb
-- test/fixtures/reference_code_using_composite_key_alias.rb
-- test/fixtures/reference_code_using_simple_key_alias.rb
 - test/fixtures/reference_codes.yml
 - test/fixtures/reference_type.rb
 - test/fixtures/reference_types.yml
@@ -201,8 +154,6 @@ files:
 - test/fixtures/room_attribute_assignments.yml
 - test/fixtures/room_attributes.yml
 - test/fixtures/rooms.yml
-- test/fixtures/seat.rb
-- test/fixtures/seats.yml
 - test/fixtures/street.rb
 - test/fixtures/streets.yml
 - test/fixtures/student.rb
@@ -211,16 +162,12 @@ files:
 - test/fixtures/suburbs.yml
 - test/fixtures/tariff.rb
 - test/fixtures/tariffs.yml
-- test/fixtures/topic.rb
-- test/fixtures/topic_source.rb
 - test/fixtures/topic_sources.yml
 - test/fixtures/topics.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
-- test/setup.rb
-- test/test_aliases.rb
 - test/test_associations.rb
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
@@ -232,7 +179,6 @@ files:
 - test/test_delete.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
-- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -247,7 +193,6 @@ files:
 - test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
-- test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb
 - test/test_update.rb
@@ -264,23 +209,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
 - test/abstract_unit.rb
-- test/db_test.rb
 - test/README_tests.rdoc
-- test/setup.rb
-- test/test_aliases.rb
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
@@ -292,7 +234,6 @@ test_files:
 - test/test_delete.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
-- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -307,7 +248,6 @@ test_files:
 - test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
-- test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb
 - test/test_update.rb

data/test/db_test.rb

@@ -1,53 +0,0 @@
-# assoc_test.rb
-
-path = File.expand_path(File.join(File.basename(__FILE__), "..", "lib", "composite_primary_keys"))
-puts path
-
-require File.join(path)
-require 'active_record'
-
-$configuration = {
-  :adapter  => 'postgresql',
-  :database => 'cpk_test',
-  :username => 'postgres'
-}
-
-ActiveRecord::Base.establish_connection($configuration) unless ActiveRecord::Base.connected?
-
-module GlobePG
-  class PGBase < ActiveRecord::Base
-    self.abstract_class = true
-   # establish_connection($configuration) unless connected?
-  end
-end
-
-module GlobePG
-  class TeacherToSchool < PGBase
-    set_table_name 'teacher_to_school'
-    self.primary_keys = ['teacherid', 'schoolid']
-
-    belongs_to :globe_teacher, :foreign_key => 'teacherid'
-    belongs_to :globe_school, :foreign_key => 'schoolid'
-  end
-end
-
-module GlobePG
-  class GlobeSchool < PGBase
-    set_table_name 'globe_school'
-    self.primary_key = 'schoolid'
-    has_many :teacher_to_schools, :foreign_key => :schoolid
-    has_many :globe_teachers, :through => :teacher_to_schools
-  end
-end
-
-module GlobePG
-  class GlobeTeacher < PGBase
-    set_table_name 'globe_teacher'
-    self.primary_key = 'teacherid'
-    has_many :teacher_to_schools, :foreign_key => :teacherid
-    has_many :globe_schools, :through => :teacher_to_schools
-  end
-end
-
-teacher = GlobePG::GlobeTeacher.find_by_teacherid('ZZGLOBEY')
-p teacher.globe_schools 

data/test/fixtures/hack.rb

@@ -1,5 +0,0 @@
-class Hack < ActiveRecord::Base
-  has_many :comments, :as => :person
-  
-  has_one :first_comment, :as => :person, :class_name => "Comment"
-end

data/test/fixtures/hacks.yml

@@ -1,3 +0,0 @@
-andrew:
-  id: 7
-  name: andrew

data/test/fixtures/pk_called_id.rb

@@ -1,5 +0,0 @@
-class PkCalledId < ActiveRecord::Base
-  self.primary_keys = :id, :reference_code
-
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end

data/test/fixtures/pk_called_ids.yml

@@ -1,11 +0,0 @@
-name_prefix_mr:
-  id: 1
-  reference_code: 1
-  code_label: MR
-  abbreviation: Mr
-
-name_prefix_mrs:
-  id: 2
-  reference_code: 1
-  code_label: MRS
-  abbreviation: Mrs

data/test/fixtures/reference_code_using_composite_key_alias.rb

@@ -1,8 +0,0 @@
-class ReferenceCodeUsingCompositeKeyAlias < ActiveRecord::Base
-  self.table_name = 'reference_codes'
-  self.primary_key = [:reference_type_id, :reference_code]
-  
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end

data/test/fixtures/reference_code_using_simple_key_alias.rb

@@ -1,8 +0,0 @@
-class ReferenceCodeUsingSimpleKeyAlias < ActiveRecord::Base
-  self.table_name = 'reference_codes'
-  self.primary_key = :code_label
-  
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end

data/test/fixtures/seat.rb

@@ -1,5 +0,0 @@
-class Seat < ActiveRecord::Base
-  self.primary_keys = [:flight_number, :seat]
-
-  validates_uniqueness_of :customer
-end

data/test/fixtures/seats.yml

@@ -1,9 +0,0 @@
-seat1:
-  flight_number: 1
-  seat: 1
-  customer: 1
-
-seat2:
-  flight_number: 1
-  seat: 2
-  customer: 2

data/test/fixtures/topic.rb

@@ -1,6 +0,0 @@
-class Topic < ActiveRecord::Base
-	has_many :topic_sources, dependent: :destroy
-	accepts_nested_attributes_for :topic_sources
-
-	validates :name, :feed_size, presence: true
-end

data/test/fixtures/topic_source.rb

@@ -1,7 +0,0 @@
-class TopicSource < ActiveRecord::Base
-	self.primary_keys = :topic_id, :platform
-
-	belongs_to :topic, inverse_of: :topic_sources
-
-	validates :platform, presence: true
-end

data/test/setup.rb

@@ -1,51 +0,0 @@
-# setup_db.rb
-require 'dbi'
-
-# Run "createdb cpk_test" first
-
-teacher_to_school = %Q{
-  create table teacher_to_school(
-    schoolid varchar(8),
-    teacherid varchar(8),
-    datebegin date,
-    teacherrole varchar(20),
-    primary key (schoolid, teacherid)
-  );
-
-}
-
-globe_teacher = %Q{
-  create table globe_teacher(
-    teacherid varchar(8) primary key,
-    currentschoolid varchar(8),
-    userid varchar(16)
-  );
-
-}
-
-globe_school = %Q{
-  create table globe_school(
-    schoolid varchar(8) primary key,
-    schoolname varchar(100) not null,
-    city varchar(35) not null
-  )
-
-}
-
-add_records = [
-  "insert into globe_teacher values ('ZZGLOBEY', 'ZZGLOBE1',
-'dberger');",
-  "insert into globe_school values ('ZZCOUCAR', 'NCAR Foothills Lab',
-'Boulder');",
-  "insert into globe_school values ('ZZGLOBE1', 'The GLOBE Program',
-'Boulder');",
-  "insert into teacher_to_school values('ZZGLOBE1', 'ZZGLOBEY', '1-JUN-2010', 'GLOBE OFFICE');",
-  "insert into teacher_to_school values('ZZCOUCAR', 'ZZGLOBEY', '1-AUG-2010', 'GLOBE Teacher');"
-]
-
-DBI.connect('dbi:Pg:cpk_test', 'postgres') do |dbh|
-  dbh.execute(teacher_to_school)
-  dbh.execute(globe_teacher)
-  dbh.execute(globe_school)
-  add_records.each{ |sql| dbh.execute(sql) }
-end