composite_primary_keys 8.1.1 → 8.1.2

data/test/test_delete.rb

@@ -3,25 +3,25 @@ require File.expand_path('../abstract_unit', __FILE__)
 class TestDelete < ActiveSupport::TestCase
   fixtures :articles, :departments, :employees, :products, :tariffs, :product_tariffs,
            :reference_types, :reference_codes
-  
+
   CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
+      :single => {
+          :class => ReferenceType,
+          :primary_keys => :reference_type_id,
+      },
+      :dual   => {
+          :class => ReferenceCode,
+          :primary_keys => [:reference_type_id, :reference_code],
+      },
   }
-  
+
   def setup
     self.class.classes = CLASSES
   end
-  
+
   def test_destroy_one
     testing_with do
-     assert @first.destroy
+      assert @first.destroy
     end
   end
 
@@ -91,22 +91,29 @@ class TestDelete < ActiveSupport::TestCase
 
   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
+    records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
     steve.destroy
-    records_after = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    assert_equal records_after, records_before - steve.groups.count
+    records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')
+    if records_before.respond_to?(:count)
+      assert_equal records_after.count, records_before.count - steve.groups.count
+    elsif records_before.respond_to?(:row_count) # OCI8:Cursor for oracle adapter
+      assert_equal records_after.row_count, records_before.row_count - steve.groups.count
+    end
   end
 
-  def test_destroy_has_and_belongs_to_many_on_non_cpk
-    records_before = ActiveRecord::Base.connection.execute("select * from employees_groups").count
+  def test_create_destroy_has_and_belongs_to_many_on_non_cpk
+    records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
     employee = Employee.create
     employee.groups << Group.create(name: 'test')
-    employees_groups_count = employee.groups.count
     employee.destroy!
-    records_after = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    assert_equal records_before, records_after
+    records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')
+    if records_before.respond_to?(:count)
+      assert_equal records_before.count, records_after.count
+    elsif records_before.respond_to?(:row_count) # OCI8:Cursor for oracle adapter
+      assert_equal records_before.row_count, records_after.row_count
+    end
   end
-  
+
   def test_delete_not_destroy_on_cpk
     tariff = Tariff.where(tariff_id: 2).first
     tariff.delete

data/test/test_delete_all.rb

@@ -20,14 +20,15 @@ class TestValidations < ActiveSupport::TestCase
     mysql_match = /Unknown column 'employees_groups.' in 'where clause/ =~ exception.message
     sqlite3_match = /no such column: employees_groups./ =~ exception.message
     postgresql_match = /PG::SyntaxError: ERROR:  zero-length delimited identifier/ =~ exception.message
+    oracle_match = /OCIError: ORA-01741: illegal zero-length identifier/ =~ exception.message
 
-    assert(postgresql_match || mysql_match || sqlite3_match)
+    assert(postgresql_match || mysql_match || sqlite3_match || oracle_match)
 
     assert(EmployeesGroup.all.size == 3)
   end
 
   # This test fails, requires fixin arel
-  #def test_delete_all_with_joins
-  #  ReferenceCode.joins(:reference_type).where(:reference_type_id => 1).delete_all
-  #end
+  def test_delete_all_with_joins
+    ReferenceCode.joins(:reference_type).where(:reference_type_id => 1).delete_all
+  end
 end

data/test/test_dumpable.rb

@@ -1,15 +1,15 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestDumpable < ActiveSupport::TestCase
-  fixtures :articles, :readings, :users
-
-  def test_marshal_with_simple_preload
-    articles = Article.preload(:readings).where(id: 1).to_a
-    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
-  end
-
-  def test_marshal_with_comples_preload
-    articles = Article.preload({ readings: :user }).where(id: 1).to_a
-    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestDumpable < ActiveSupport::TestCase
+  fixtures :articles, :readings, :users
+
+  def test_marshal_with_simple_preload
+    articles = Article.preload(:readings).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+
+  def test_marshal_with_comples_preload
+    articles = Article.preload({ readings: :user }).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+end

data/test/test_nested_attributes.rb

@@ -1,124 +1,124 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-# Testing the find action on composite ActiveRecords with two primary keys
-class TestNestedAttributes < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  def test_nested_atttribute_create
-    code_id = 1001
-
-    reference_type = reference_types(:name_prefix)
-    reference_type.update_attribute :reference_codes_attributes, [{
-      :reference_code => code_id,
-      :code_label => 'XX',
-      :abbreviation => 'Xx'
-    }]
-    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
-  end
-
-  def test_nested_atttribute_update
-    code_id = 1002
-
-    reference_type = reference_types(:name_prefix)
-    reference_type.update_attribute :reference_codes_attributes, [{
-      :reference_code => code_id,
-      :code_label => 'XX',
-      :abbreviation => 'Xx'
-    }]
-
-    reference_code = ReferenceCode.find_by_reference_code(code_id)
-    cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
-    reference_type.update_attribute :reference_codes_attributes, [{
-      :id => cpk,
-      :code_label => 'AAA',
-      :abbreviation => 'Aaa'
-    }]
-
-    reference_code = ReferenceCode.find_by_reference_code(code_id)
-    assert_kind_of(ReferenceCode, reference_code)
-    assert_equal(reference_code.code_label, 'AAA')
-  end
-
-  def test_nested_atttribute_update_2
-    reference_type = reference_types(:gender)
-    reference_code = reference_codes(:gender_male)
-
-    reference_type.update_attributes(:reference_codes_attributes => [{:id => reference_code.id,
-                                                                      :code_label => 'XX',
-                                                                      :abbreviation => 'Xx'}])
-
-    reference_code.reload
-    assert_equal(reference_code.code_label, 'XX')
-    assert_equal(reference_code.abbreviation, 'Xx')
-  end
-
-  def test_nested_atttribute_update_3
-    reference_type = reference_types(:gender)
-    reference_code = reference_codes(:gender_male)
-
-    reference_type.update_attributes(:reference_codes_attributes => [{:id => reference_code.id.to_s,
-                                                                      :code_label => 'XX',
-                                                                      :abbreviation => 'Xx'}])
-
-    reference_code.reload
-    assert_equal(reference_code.code_label, 'XX')
-    assert_equal(reference_code.abbreviation, 'Xx')
-  end
-
-  fixtures :topics, :topic_sources
-
-  def test_nested_attributes_create_with_string_in_primary_key
-    platform = 'instagram'
-
-    topic = topics(:music)
-    topic.update_attribute :topic_sources_attributes, [{
-      :platform => platform,
-      :keywords => 'funk'
-    }]
-    assert_not_nil TopicSource.find_by_platform(platform)
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key
-    platform = 'instagram'
-
-    topic = topics(:music)
-    topic.update_attribute :topic_sources_attributes, [{
-      :platform => platform,
-      :keywords => 'funk'
-    }]
-    assert_not_nil TopicSource.find_by_platform(platform)
-
-    topic_source = TopicSource.find_by_platform(platform)
-    cpk = CompositePrimaryKeys::CompositeKeys[topic.id, platform]
-    topic.update_attribute :topic_sources_attributes, [{
-      :id => cpk,
-      :keywords => 'jazz'
-    }]
-
-    topic_source = TopicSource.find_by_platform(platform)
-    assert_kind_of(TopicSource, topic_source)
-    assert_equal(topic_source.keywords, 'jazz')
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key_2
-    topic = topics(:music)
-    topic_source = topic_sources(:music_source)
-
-    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id,
-                                                           :keywords => 'classical, jazz'}])
-
-    topic_source.reload
-    assert_equal(topic_source.keywords, 'classical, jazz')
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key_3
-    topic = topics(:music)
-    topic_source = topic_sources(:music_source)
-
-    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id.to_s,
-                                                           :keywords => 'classical, jazz'}])
-
-    topic_source.reload
-    assert_equal(topic_source.keywords, 'classical, jazz')
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+# Testing the find action on composite ActiveRecords with two primary keys
+class TestNestedAttributes < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+
+  def test_nested_atttribute_create
+    code_id = 1001
+
+    reference_type = reference_types(:name_prefix)
+    reference_type.update_attribute :reference_codes_attributes, [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
+  end
+
+  def test_nested_atttribute_update
+    code_id = 1002
+
+    reference_type = reference_types(:name_prefix)
+    reference_type.update_attribute :reference_codes_attributes, [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
+    reference_type.update_attribute :reference_codes_attributes, [{
+      :id => cpk,
+      :code_label => 'AAA',
+      :abbreviation => 'Aaa'
+    }]
+
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    assert_kind_of(ReferenceCode, reference_code)
+    assert_equal(reference_code.code_label, 'AAA')
+  end
+
+  def test_nested_atttribute_update_2
+    reference_type = reference_types(:gender)
+    reference_code = reference_codes(:gender_male)
+
+    reference_type.update_attributes(:reference_codes_attributes => [{:id => reference_code.id,
+                                                                      :code_label => 'XX',
+                                                                      :abbreviation => 'Xx'}])
+
+    reference_code.reload
+    assert_equal(reference_code.code_label, 'XX')
+    assert_equal(reference_code.abbreviation, 'Xx')
+  end
+
+  def test_nested_atttribute_update_3
+    reference_type = reference_types(:gender)
+    reference_code = reference_codes(:gender_male)
+
+    reference_type.update_attributes(:reference_codes_attributes => [{:id => reference_code.id.to_s,
+                                                                      :code_label => 'XX',
+                                                                      :abbreviation => 'Xx'}])
+
+    reference_code.reload
+    assert_equal(reference_code.code_label, 'XX')
+    assert_equal(reference_code.abbreviation, 'Xx')
+  end
+
+  fixtures :topics, :topic_sources
+
+  def test_nested_attributes_create_with_string_in_primary_key
+    platform = 'instagram'
+
+    topic = topics(:music)
+    topic.update_attribute :topic_sources_attributes, [{
+      :platform => platform,
+      :keywords => 'funk'
+    }]
+    assert_not_nil TopicSource.find_by_platform(platform)
+  end
+
+  def test_nested_attributes_update_with_string_in_primary_key
+    platform = 'instagram'
+
+    topic = topics(:music)
+    topic.update_attribute :topic_sources_attributes, [{
+      :platform => platform,
+      :keywords => 'funk'
+    }]
+    assert_not_nil TopicSource.find_by_platform(platform)
+
+    topic_source = TopicSource.find_by_platform(platform)
+    cpk = CompositePrimaryKeys::CompositeKeys[topic.id, platform]
+    topic.update_attribute :topic_sources_attributes, [{
+      :id => cpk,
+      :keywords => 'jazz'
+    }]
+
+    topic_source = TopicSource.find_by_platform(platform)
+    assert_kind_of(TopicSource, topic_source)
+    assert_equal(topic_source.keywords, 'jazz')
+  end
+
+  def test_nested_attributes_update_with_string_in_primary_key_2
+    topic = topics(:music)
+    topic_source = topic_sources(:music_source)
+
+    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id,
+                                                           :keywords => 'classical, jazz'}])
+
+    topic_source.reload
+    assert_equal(topic_source.keywords, 'classical, jazz')
+  end
+
+  def test_nested_attributes_update_with_string_in_primary_key_3
+    topic = topics(:music)
+    topic_source = topic_sources(:music_source)
+
+    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id.to_s,
+                                                           :keywords => 'classical, jazz'}])
+
+    topic_source.reload
+    assert_equal(topic_source.keywords, 'classical, jazz')
+  end
+end

data/test/test_optimistic.rb

@@ -1,18 +1,18 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestOptimisitic < ActiveSupport::TestCase
-  fixtures :restaurants
-
-  def test_update_with_stale_error
-    restaurant_1 = Restaurant.find([1, 1])
-    restaurant_1['name'] = "McDonalds renamed"
-
-    restaurant_2 = Restaurant.find([1, 1])
-    restaurant_2['name'] = "McDonalds renamed 2"
-
-    assert(restaurant_1.save)
-    assert_raise ActiveRecord::StaleObjectError do
-      restaurant_2.save
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestOptimisitic < ActiveSupport::TestCase
+  fixtures :restaurants
+
+  def test_update_with_stale_error
+    restaurant_1 = Restaurant.find([1, 1])
+    restaurant_1['name'] = "McDonalds renamed"
+
+    restaurant_2 = Restaurant.find([1, 1])
+    restaurant_2['name'] = "McDonalds renamed 2"
+
+    assert(restaurant_1.save)
+    assert_raise ActiveRecord::StaleObjectError do
+      restaurant_2.save
+    end
+  end
+end

data/test/test_polymorphic.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPolymorphic < ActiveSupport::TestCase
-  fixtures :users, :employees, :comments, :hacks, :articles
+  fixtures :users, :employees, :comments, :hacks, :articles, :readings
 
   def test_polymorphic_has_many
     comments = Hack.find(7).comments

data/test/test_predicates.rb

@@ -1,41 +1,41 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestEqual < ActiveSupport::TestCase
-  fixtures :departments
-
-  include CompositePrimaryKeys::Predicates
-
-  def test_or
-    dep = Arel::Table.new(:departments)
-
-    predicates = Array.new
-
-    3.times do |i|
-      predicates << dep[:id].eq(i)
-    end
-
-    connection = ActiveRecord::Base.connection
-    quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    expected = "((#{quoted} = 0) OR (#{quoted} = 1) OR (#{quoted} = 2))"
-
-    pred = cpk_or_predicate(predicates)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
-
-  def test_and
-    dep = Arel::Table.new(:departments)
-
-    predicates = Array.new
-
-    3.times do |i|
-      predicates << dep[:id].eq(i)
-    end
-
-    connection = ActiveRecord::Base.connection
-    quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    expected = "#{quoted} = 0 AND #{quoted} = 1 AND #{quoted} = 2"
-
-    pred = cpk_and_predicate(predicates)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestEqual < ActiveSupport::TestCase
+  fixtures :departments
+
+  include CompositePrimaryKeys::Predicates
+
+  def test_or
+    dep = Arel::Table.new(:departments)
+
+    predicates = Array.new
+
+    3.times do |i|
+      predicates << dep[:id].eq(i)
+    end
+
+    connection = ActiveRecord::Base.connection
+    quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
+    expected = "(#{quoted} = 0 OR #{quoted} = 1 OR #{quoted} = 2)"
+
+    pred = cpk_or_predicate(predicates)
+    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
+  end
+
+  # def test_and
+  #   dep = Arel::Table.new(:departments)
+  #
+  #   predicates = Array.new
+  #
+  #   3.times do |i|
+  #     predicates << dep[:id].eq(i)
+  #   end
+  #
+  #   connection = ActiveRecord::Base.connection
+  #   quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
+  #   expected = "#{quoted} = 0 AND #{quoted} = 1 AND #{quoted} = 2"
+  #
+  #   pred = cpk_and_predicate(predicates)
+  #   assert_equal(with_quoted_identifiers(expected), pred.to_sql)
+  # end
 end