composite_primary_keys 11.3.1 → 12.0.0.rc1

data/lib/composite_primary_keys/relation/query_methods.rb

@@ -18,7 +18,8 @@ module CompositePrimaryKeys
         end
 
         order_query.flat_map do |o|
-          case o
+          order_query.flat_map do |o|
+            case o
             when Arel::Attribute
               o.desc
             when Arel::Nodes::Ordering
@@ -33,10 +34,10 @@ module CompositePrimaryKeys
               end
             else
               o
+            end
           end
         end
       end
     end
   end
-end
-
+end

data/lib/composite_primary_keys/relation/where_clause.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   class Relation
     class WhereClause
       def to_h(table_name = nil)
-        equalities = predicates.grep(Arel::Nodes::Equality)
+        equalities = equalities(predicates)
 
         # CPK Adds this line, because ours are coming in with AND->{EQUALITY, EQUALITY}
         equalities = predicates.grep(Arel::Nodes::And).map(&:children).flatten.grep(Arel::Nodes::Equality) if equalities.empty?
@@ -21,4 +21,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/sanitization.rb

@@ -1,43 +1,43 @@
 module ActiveRecord
   module Sanitization
     module ClassMethods
-      def expand_hash_conditions_for_aggregates(attrs)
-        expanded_attrs = {}
-        attrs.each do |attr, value|
-          # CPK
-          # if aggregation = reflect_on_aggregation(attr.to_sym)
-          if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
-            value = value.split('/') if value.is_a?(String)
-            attr.each_with_index do |key,i|
-              expanded_attrs[key] = value.respond_to?(:flatten) ? value.flatten[i] : value
-            end
-          elsif aggregation = reflect_on_aggregation(attr.to_sym)
-            mapping = aggregation.mapping
-            mapping.each do |field_attr, aggregate_attr|
-              if mapping.size == 1 && !value.respond_to?(aggregate_attr)
-                expanded_attrs[field_attr] = value
-              else
-                expanded_attrs[field_attr] = value.send(aggregate_attr)
-              end
-            end
-          else
-            expanded_attrs[attr] = value
-          end
-        end
-        expanded_attrs
-      end
-
-      def quoted_id
-        # CPK
-        # self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
-        if self.composite?
-          [self.class.primary_keys, ids].transpose.map { |attr_name,id|
-            self.class.quote_value(@attributes[attr_name].value_for_database)
-          }
-        else
-          self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
-        end
-      end
+    #   def expand_hash_conditions_for_aggregates(attrs)
+    #     expanded_attrs = {}
+    #     attrs.each do |attr, value|
+    #       # CPK
+    #       # if aggregation = reflect_on_aggregation(attr.to_sym)
+    #       if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
+    #         value = value.split('/') if value.is_a?(String)
+    #         attr.each_with_index do |key,i|
+    #           expanded_attrs[key] = value.respond_to?(:flatten) ? value.flatten[i] : value
+    #         end
+    #       elsif aggregation = reflect_on_aggregation(attr.to_sym)
+    #         mapping = aggregation.mapping
+    #         mapping.each do |field_attr, aggregate_attr|
+    #           if mapping.size == 1 && !value.respond_to?(aggregate_attr)
+    #             expanded_attrs[field_attr] = value
+    #           else
+    #             expanded_attrs[field_attr] = value.send(aggregate_attr)
+    #           end
+    #         end
+    #       else
+    #         expanded_attrs[attr] = value
+    #       end
+    #     end
+    #     expanded_attrs
+    #   end
+    #
+    #   def quoted_id
+    #     # CPK
+    #     # self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
+    #     if self.composite?
+    #       [self.class.primary_keys, ids].transpose.map { |attr_name,id|
+    #         self.class.quote_value(@attributes[attr_name].value_for_database)
+    #       }
+    #     else
+    #       self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
+    #     end
+    #   end
     end
   end
 end

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -12,7 +12,7 @@ module ActiveRecord
             predicate = finder_class.cpk_id_predicate(finder_class.arel_table, finder_class.primary_key, record.id_in_database || record.id)
             relation = relation.where.not(predicate)
           elsif finder_class.primary_key
-            relation = relation.where.not(finder_class.primary_key => record.id_in_database || record.id)
+            relation = relation.where.not(finder_class.primary_key => record.id_in_database)
           else
             raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
           end
@@ -29,4 +29,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

@@ -1,8 +1,8 @@
 module CompositePrimaryKeys
   module VERSION
-    MAJOR = 11
-    MINOR = 3
-    TINY  = 1
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    MAJOR = 12
+    MINOR = 0
+    TINY  = 0
+    STRING = [MAJOR, MINOR, TINY, 'rc1'].join('.')
   end
 end

data/tasks/databases/mysql.rake

@@ -10,7 +10,7 @@ namespace :mysql do
     new_spec = spec.dup
     new_spec.delete('database')
     connection = ActiveRecord::Base.establish_connection(new_spec)
-    ActiveRecord::Base.connection.create_database(spec['database'])
+    ActiveRecord::Base.connection.create_database(spec['database'], charset: spec['charset'] || 'utf8mb4')
     ActiveRecord::Base.clear_all_connections!
   end
 

data/test/abstract_unit.rb

@@ -18,12 +18,8 @@ puts "Loaded #{spec_name}"
 # And now connect to the database
 ActiveRecord::Base.establish_connection(spec)
 
-if defined?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
-  require 'composite_primary_keys/connection_adapters/sqlite3_adapter'
-end
-
 # Tell active record about the configuration
-ActiveRecord::Base.configurations[:test] = spec
+ActiveRecord::Base.configurations = {test: spec}
 
 # Tell ActiveRecord where to find models
 ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')

data/test/connections/databases.ci.yml

@@ -2,6 +2,9 @@ mysql:
   adapter: mysql2
   username: travis
   password: ""
+  encoding: utf8mb4
+  charset: utf8mb4
+  collation: utf8mb4_bin
   database: composite_primary_keys_unittest
 
 postgresql:

data/test/db_test.rb

@@ -0,0 +1,53 @@
+# 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/db_definitions/mysql.sql

@@ -215,10 +215,4 @@ create table pk_called_ids (
   abbreviation varchar(50) default null,
   description varchar(50) default null,
   primary key (id, reference_code)
-);
-
-create table cpk_with_default_values (
-  record_id integer not null,
-  record_version varchar(50) default '' not null,
-  primary key (record_id, record_version)
-);
+);

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

@@ -45,6 +45,4 @@ drop table capitols;
 drop table products_restaurants;
 drop table employees_groups;
 drop table pk_called_ids;
-drop sequence pk_called_ids_seq;
-drop table cpk_with_default_values;
-drop sequence cpk_with_default_values_seq;
+drop sequence pk_called_ids_seq;

data/test/fixtures/db_definitions/oracle.sql

@@ -234,11 +234,3 @@ create table pk_called_ids (
     description       varchar(50) default null,
     constraint pk_called_ids_pk primary key (id, reference_code)
 );
-
-create sequence cpk_with_default_values_seq start with 1000;
-
-create table cpk_with_default_values (
-    record_id         int not null,
-    record_version    varchar(50) default '' not null,
-    constraint cpk_with_default_values_pk primary key (record_id, record_version)
-);

data/test/fixtures/db_definitions/postgresql.sql

@@ -218,9 +218,3 @@ create table pk_called_ids (
     description       varchar(50) default null,
     primary key (id, reference_code)
 );
-
-create table cpk_with_default_values (
-    record_id serial not null,
-    record_version varchar(50) default '' not null,
-    primary key (record_id, record_version)
-);

data/test/fixtures/db_definitions/sqlite.sql

@@ -204,9 +204,3 @@ create table pk_called_ids (
     description       varchar(50) default null,
     primary key (id, reference_code)
 );
-
-create table cpk_with_default_values (
-    record_id integer not null,
-    record_version    varchar(50) default '' not null,
-    primary key (record_id, record_version)
-);

data/test/fixtures/db_definitions/sqlserver.sql

@@ -210,11 +210,4 @@ CREATE TABLE pk_called_ids (
     description       [varchar](50) default null
     CONSTRAINT [pk_called_ids_pk] PRIMARY KEY
         ( [id], [reference_code] )
-);
-
-CREATE TABLE cpk_with_default_values (
-    record_id         [int] IDENTITY(1000,1) NOT NULL,
-    record_version    [varchar](50) default '' NOT NULL
-    CONSTRAINT [cpk_with_default_values_pk] PRIMARY KEY
-        ( [record_id], [record_version] )
-);
+);

data/test/test_associations.rb

@@ -135,7 +135,7 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal('Steve', department.employees[0].name)
     assert_equal('Jill', department.employees[1].name)
 
-    head = department.employees.create(name: 'Rick')
+    department.employees.create(name: 'Rick')
 
     department.reload
     assert_equal(3, department.employees.count)

data/test/test_composite_arrays.rb

@@ -21,18 +21,4 @@ class CompositeArraysTest < ActiveSupport::TestCase
     assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
     assert_equal '1,2,3', keys.to_s
   end
-
-  def test_parse
-    assert_equal ['1', '2'], CompositePrimaryKeys::CompositeKeys.parse('1,2')
-    assert_equal ['The USA', '^Washington, D.C.'],
-                 CompositePrimaryKeys::CompositeKeys.parse('The USA,^5EWashington^2C D.C.')
-    assert_equal ['The USA', '^Washington, D.C.'],
-                 CompositePrimaryKeys::CompositeKeys.parse(['The USA', '^Washington, D.C.'])
-  end
-
-  def test_to_s
-    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_s
-    assert_equal 'The USA,^5EWashington^2C D.C.',
-                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_s
-  end
 end

data/test/test_create.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestCreate < ActiveSupport::TestCase
-  fixtures :articles, :students, :dorms, :rooms, :room_assignments, :reference_types, :reference_codes, :streets, :suburbs, :cpk_with_default_values
+  fixtures :articles, :students, :dorms, :rooms, :room_assignments, :reference_types, :reference_codes, :streets, :suburbs
 
   CLASSES = {
     :single => {
@@ -48,16 +48,16 @@ class TestCreate < ActiveSupport::TestCase
     end
   end
 
-  def test_create_generated_keys
-    # Not all databases support columns with multiple identity fields
-    if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) ||
-       defined?(ActiveRecord::ConnectionAdapters::SQLite3)
-
-      suburb = Suburb.create!(:name => 'Capitol Hill')
-      refute_nil(suburb.city_id)
-      refute_nil(suburb.suburb_id)
-    end
-  end
+  # def test_create_generated_keys
+  #   # Not all databases support columns with multiple identity fields
+  #   if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) ||
+  #      defined?(ActiveRecord::ConnectionAdapters::SQLite3)
+  #
+  #     suburb = Suburb.create!(:name => 'Capitol Hill')
+  #     refute_nil(suburb.city_id)
+  #     refute_nil(suburb.suburb_id)
+  #   end
+  # end
 
   def test_create_on_association
     suburb = Suburb.first
@@ -167,7 +167,7 @@ class TestCreate < ActiveSupport::TestCase
 
   def test_create_article_invalid_id
     error = assert_raises(ActiveRecord::RecordInvalid) do
-      article = Article.create!(:id => 1)
+      Article.create!(:id => 1)
     end
 
     assert_equal('Validation failed: Id has already been taken', error.to_s)
@@ -180,18 +180,4 @@ class TestCreate < ActiveSupport::TestCase
     suburb = Suburb.find_or_create_by!(:name => 'New Suburb', :city_id => 3, :suburb_id => 1)
     refute_nil(suburb)
   end
-
-  def test_create_when_pk_has_default_value
-    first = CpkWithDefaultValue.create!
-    refute_nil(first.record_id)
-    assert_equal('', first.record_version)
-
-    second = CpkWithDefaultValue.create!(record_id: first.record_id, record_version: 'Same id, different version')
-    assert_equal(first.record_id, second.record_id)
-    assert_equal('Same id, different version', second.record_version)
-
-    third = CpkWithDefaultValue.create!(record_version: 'Created by version only')
-    refute_nil(third.record_id)
-    assert_equal('Created by version only', third.record_version)
-  end
 end

data/test/test_find.rb

@@ -41,14 +41,6 @@ class TestFind < ActiveSupport::TestCase
     assert_equal(['The Netherlands', 'Amsterdam'], capitol.id)
   end
 
-  def test_find_with_strings_with_comma_as_composite_keys
-    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
-    assert_equal ['The USA', 'Washington, D.C.'], capitol.id
-
-    assert_equal capitol, Capitol.find(['The USA', 'Washington, D.C.'])
-    assert_equal capitol, Capitol.find(capitol.to_param)
-  end
-
   def test_find_each
     room_assignments = []
     RoomAssignment.find_each(:batch_size => 2) do |assignment|

data/test/test_ids.rb

@@ -40,9 +40,6 @@ class TestIds < ActiveSupport::TestCase
     testing_with do
       assert_equal '1,1', @first.to_param if composite?
     end
-
-    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
-    assert_equal 'The USA,Washington^2C D.C.', capitol.to_param
   end
 
   def test_ids_to_s

data/test/test_nested_attributes.rb

@@ -8,7 +8,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     code_id = 1001
 
     reference_type = reference_types(:name_prefix)
-    reference_type.update_attributes :reference_codes_attributes => [{
+    reference_type.update :reference_codes_attributes => [{
       :reference_code => code_id,
       :code_label => 'XX',
       :abbreviation => 'Xx'
@@ -20,7 +20,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     code_id = 1002
 
     reference_type = reference_types(:name_prefix)
-    reference_type.update_attributes :reference_codes_attributes => [{
+    reference_type.update :reference_codes_attributes => [{
       :reference_code => code_id,
       :code_label => 'XX',
       :abbreviation => 'Xx'
@@ -28,7 +28,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
 
     reference_code = ReferenceCode.find_by_reference_code(code_id)
     cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
-    reference_type.update_attributes :reference_codes_attributes => [{
+    reference_type.update :reference_codes_attributes => [{
       :id => cpk,
       :code_label => 'AAA',
       :abbreviation => 'Aaa'
@@ -43,7 +43,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     reference_type = reference_types(:gender)
     reference_code = reference_codes(:gender_male)
 
-    reference_type.update_attributes(:reference_codes_attributes => [{:id => reference_code.id,
+    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id,
                                                                       :code_label => 'XX',
                                                                       :abbreviation => 'Xx'}])
 
@@ -56,7 +56,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     reference_type = reference_types(:gender)
     reference_code = reference_codes(:gender_male)
 
-    reference_type.update_attributes(:reference_codes_attributes => [{:id => reference_code.id.to_s,
+    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id.to_s,
                                                                       :code_label => 'XX',
                                                                       :abbreviation => 'Xx'}])
 
@@ -71,7 +71,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     platform = 'instagram'
 
     topic = topics(:music)
-    topic.update_attributes :topic_sources_attributes => [{
+    topic.update :topic_sources_attributes => [{
       :platform => platform,
       :keywords => 'funk'
     }]
@@ -82,7 +82,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     platform = 'instagram'
 
     topic = topics(:music)
-    topic.update_attributes :topic_sources_attributes => [{
+    topic.update :topic_sources_attributes => [{
       :platform => platform,
       :keywords => 'funk'
     }]
@@ -90,7 +90,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
 
     topic_source = TopicSource.find_by_platform(platform)
     cpk = CompositePrimaryKeys::CompositeKeys[topic.id, platform]
-    topic.update_attributes :topic_sources_attributes => [{
+    topic.update :topic_sources_attributes => [{
       :id => cpk,
       :keywords => 'jazz'
     }]
@@ -104,7 +104,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     topic = topics(:music)
     topic_source = topic_sources(:music_source)
 
-    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id,
+    topic.update(:topic_sources_attributes => [{:id => topic_source.id,
                                                            :keywords => 'classical, jazz'}])
 
     topic_source.reload
@@ -115,7 +115,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     topic = topics(:music)
     topic_source = topic_sources(:music_source)
 
-    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id.to_s,
+    topic.update(:topic_sources_attributes => [{:id => topic_source.id.to_s,
                                                            :keywords => 'classical, jazz'}])
 
     topic_source.reload