composite_primary_keys 8.1.1 → 8.1.2

data/test/test_santiago.rb

@@ -1,23 +1,23 @@
-# Test cases devised by Santiago that broke the Composite Primary Keys
-# code at one point in time. But no more!!!
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestSantiago < ActiveSupport::TestCase
-  fixtures :suburbs, :streets, :users, :articles, :readings
-  
-  def test_normal_and_composite_associations
-    assert_not_nil @suburb = Suburb.find([1, 1])
-    assert_equal 1, @suburb.streets.length
-    
-    assert_not_nil @street = Street.find(1)
-    assert_not_nil @street.suburb
-  end
-  
-  def test_single_keys
-    @santiago = User.find(1)
-    assert_not_nil @santiago.articles
-    assert_equal 2, @santiago.articles.length
-    assert_not_nil @santiago.readings
-    assert_equal 2, @santiago.readings.length
-  end
-end
+# Test cases devised by Santiago that broke the Composite Primary Keys
+# code at one point in time. But no more!!!
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestSantiago < ActiveSupport::TestCase
+  fixtures :suburbs, :streets, :users, :articles, :readings
+  
+  def test_normal_and_composite_associations
+    assert_not_nil @suburb = Suburb.find([1, 1])
+    assert_equal 1, @suburb.streets.length
+    
+    assert_not_nil @street = Street.find(1)
+    assert_not_nil @street.suburb
+  end
+  
+  def test_single_keys
+    @santiago = User.find(1)
+    assert_not_nil @santiago.articles
+    assert_equal 2, @santiago.articles.length
+    assert_not_nil @santiago.readings
+    assert_equal 2, @santiago.readings.length
+  end
+end

data/test/test_suite.rb

@@ -1,34 +1,34 @@
-%w(
-  test_aliases
-  test_associations
-  test_attribute_methods
-  test_attributes
-  test_calculations
-  test_callbacks
-  test_composite_arrays
-  test_create
-  test_delete
-  test_delete_all
-  test_dumpable
-  test_dup
-  test_enum
-  test_equal
-  test_exists
-  test_find
-  test_habtm
-  test_ids
-  test_miscellaneous
-  test_nested_attributes
-  test_optimistic
-  test_pagination
-  test_polymorphic
-  test_predicates
-  test_santiago
-  test_serialize
-  test_touch
-  test_tutorial_example
-  test_update
-  test_validations
-).each do |test|
-  require File.expand_path("../#{test}", __FILE__)
-end
+%w(
+  test_aliases
+  test_associations
+  test_attribute_methods
+  test_attributes
+  test_calculations
+  test_callbacks
+  test_composite_arrays
+  test_create
+  test_delete
+  test_delete_all
+  test_dumpable
+  test_dup
+  test_enum
+  test_equal
+  test_exists
+  test_find
+  test_habtm
+  test_ids
+  test_miscellaneous
+  test_nested_attributes
+  test_optimistic
+  test_pagination
+  test_polymorphic
+  test_predicates
+  test_santiago
+  test_serialize
+  test_touch
+  test_tutorial_example
+  test_update
+  test_validations
+).each do |test|
+  require File.expand_path("../#{test}", __FILE__)
+end

data/test/test_touch.rb

@@ -1,23 +1,23 @@
-# Test cases devised by Santiago that broke the Composite Primary Keys
-# code at one point in time. But no more!!!
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestTouch < ActiveSupport::TestCase
-  fixtures :products, :tariffs
-
-  def test_touching_a_record_updates_its_timestamp
-    tariff                = tariffs(:flat)
-    previous_amount       = tariff.amount
-    previously_updated_at = tariff.updated_at
-
-    tariff.amount         = previous_amount + 1
-    sleep 1.0 # we need to sleep for 1 second because the times updated (on mysql, at least) are only precise to 1 second.
-    tariff.touch
-    assert_not_equal previously_updated_at, tariff.updated_at
-    assert_equal previous_amount + 1, tariff.amount
-    assert tariff.amount_changed?, 'tarif amount should have changed'
-    assert tariff.changed?, 'tarif should be marked as changed'
-    tariff.reload
-    assert_not_equal previously_updated_at, tariff.updated_at
-  end
-end
+# Test cases devised by Santiago that broke the Composite Primary Keys
+# code at one point in time. But no more!!!
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestTouch < ActiveSupport::TestCase
+  fixtures :products, :tariffs
+
+  def test_touching_a_record_updates_its_timestamp
+    tariff                = tariffs(:flat)
+    previous_amount       = tariff.amount
+    previously_updated_at = tariff.updated_at
+
+    tariff.amount         = previous_amount + 1
+    sleep 1.0 # we need to sleep for 1 second because the times updated (on mysql, at least) are only precise to 1 second.
+    tariff.touch
+    assert_not_equal previously_updated_at, tariff.updated_at
+    assert_equal previous_amount + 1, tariff.amount
+    assert tariff.amount_changed?, 'tarif amount should have changed'
+    assert tariff.changed?, 'tarif should be marked as changed'
+    tariff.reload
+    assert_not_equal previously_updated_at, tariff.updated_at
+  end
+end

data/test/test_update.rb

@@ -1,71 +1,71 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestUpdate < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-      :update => { :description => 'RT Desc' },
-    },
-    :dual   => {
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-      :update => { :description => 'RT Desc' },
-    },
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_setup
-    testing_with do
-      assert_not_nil @klass_info[:update]
-    end
-  end
-
-  def test_update_attributes
-    testing_with do
-      assert(@first.update_attributes(@klass_info[:update]))
-      assert(@first.reload)
-      @klass_info[:update].each_pair do |attr_name, new_value|
-        assert_equal(new_value, @first[attr_name])
-      end
-    end
-  end
-
-  def test_update_primary_key
-    obj = ReferenceCode.find([1,1])
-    obj.reference_type_id = 2
-    obj.reference_code = 3
-    assert(obj.primary_key_changed?)
-    assert_equal({"reference_type_id" => 1, "reference_code" => 1}, obj.primary_key_was)
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal(2, obj.reference_type_id)
-    assert_equal(3, obj.reference_code)
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert_equal([2, 3], obj.id)
-  end
-
-  def test_update_attribute
-    obj = ReferenceType.find(1)
-    obj[:abbreviation] = 'a'
-    obj['abbreviation'] = 'b'
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal('b', obj.abbreviation)
-  end
-
-  def test_update_all
-    assert_nothing_raised do
-      reference_code = ReferenceCode.create
-      primary_key = reference_code.class.primary_key
-      ReferenceCode.where(primary_key => reference_code[primary_key]).
-        update_all(description: 'random value')
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestUpdate < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+      :update => { :description => 'RT Desc' },
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+      :update => { :description => 'RT Desc' },
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_setup
+    testing_with do
+      assert_not_nil @klass_info[:update]
+    end
+  end
+
+  def test_update_attributes
+    testing_with do
+      assert(@first.update_attributes(@klass_info[:update]))
+      assert(@first.reload)
+      @klass_info[:update].each_pair do |attr_name, new_value|
+        assert_equal(new_value, @first[attr_name])
+      end
+    end
+  end
+
+  def test_update_primary_key
+    obj = ReferenceCode.find([1,1])
+    obj.reference_type_id = 2
+    obj.reference_code = 3
+    assert(obj.primary_key_changed?)
+    assert_equal({"reference_type_id" => 1, "reference_code" => 1}, obj.primary_key_was)
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal(2, obj.reference_type_id)
+    assert_equal(3, obj.reference_code)
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert_equal([2, 3], obj.id)
+  end
+
+  def test_update_attribute
+    obj = ReferenceType.find(1)
+    obj[:abbreviation] = 'a'
+    obj['abbreviation'] = 'b'
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal('b', obj.abbreviation)
+  end
+
+  def test_update_all
+    assert_nothing_raised do
+      reference_code = ReferenceCode.create
+      primary_key = reference_code.class.primary_key
+      ReferenceCode.where(primary_key => reference_code[primary_key]).
+        update_all(description: 'random value')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.2
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -56,16 +56,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.20
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -77,6 +77,7 @@ files:
 - README_DB2.rdoc
 - Rakefile
 - lib/composite_primary_keys.rb
+- lib/composite_primary_keys/arel/visitors/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_scope.rb
 - lib/composite_primary_keys/associations/collection_association.rb
@@ -105,7 +106,6 @@ files:
 - lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/locking/optimistic.rb
-- lib/composite_primary_keys/model_schema.rb
 - lib/composite_primary_keys/nested_attributes.rb
 - lib/composite_primary_keys/persistence.rb
 - lib/composite_primary_keys/relation.rb
@@ -122,6 +122,7 @@ files:
 - scripts/txt2js
 - tasks/databases/mysql.rake
 - tasks/databases/oracle.rake
+- tasks/databases/oracle_enhanced.rake
 - tasks/databases/postgresql.rake
 - tasks/databases/sqlite3.rake
 - tasks/databases/sqlserver.rake
@@ -265,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord

data/lib/composite_primary_keys/model_schema.rb

@@ -1,15 +0,0 @@
-module ActiveRecord
-  module ModelSchema
-    module ClassMethods
-      def columns
-        @columns ||= connection.schema_cache.columns(table_name).map do |col|
-          col = col.dup
-          # CPK
-          #col.primary = (col.name == primary_key)
-          col.primary = Array(primary_key).include?(col.name)
-          col
-        end
-      end
-    end
-  end
-end