composite_primary_keys 3.1.6 → 3.1.7

data/History.txt

@@ -1,3 +1,11 @@
+== 3.1.7 2011-05-19
+* Support regular AR models having one or many composite models (Jacques Fuentes)
+* Minor test cleanup
+* Make version requirements more explicit
+* Remove Arel extensions used for calculations
+* Fix test that included wrong error constant
+
+
 == 3.1.6 2011-04-03
 * Updated belongs_to association to be a bit more flexible with non-CPK
   base models (Jacques Fuentes)
@@ -5,12 +13,14 @@
 * Fix write issue when one of they keys in a composite key is
   called id (Tom Hughes)
 
+
 == 3.1.5 2011-03-24
 * Fix simple calculation methods
 * Fix instantiation of cpk records via associations.
 * Fix Relation#delete
 * Fix Relation#destroy
 
+
 == 3.1.4 2011-03-06
 * Support ActiveRecord 3.0.5 (interpolate_sql was removed and
   replaced by interpolate_and_sanitize_sql)

data/lib/composite_primary_keys.rb

@@ -25,12 +25,9 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 unless defined?(ActiveRecord)
-  begin
-    require 'active_record'  
-  rescue LoadError
-    require 'rubygems'
-    gem 'active_record'
-  end
+  gem 'arel', '~> 2.0.0'
+  gem 'activerecord', '>= 3.0.5', '~> 3.0.0'
+  require 'active_record'
 end
 
 require 'active_record/associations.rb'
@@ -49,7 +46,6 @@ require 'active_record/relation/query_methods'
 require 'active_record/attribute_methods/primary_key'
 require 'active_record/fixtures'
 
-require 'composite_primary_keys/arel_extensions'
 require 'composite_primary_keys/composite_arrays'
 require 'composite_primary_keys/associations'
 require 'composite_primary_keys/associations/association_proxy'

data/lib/composite_primary_keys/associations/association_proxy.rb

@@ -30,4 +30,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -22,6 +22,14 @@ module ActiveRecord
         construct_counter_sql
       end
 
+      def owner_quoted_id
+        if (keys = @reflection.options[:primary_key])
+          keys.is_a?(Array) ? keys.collect {|k| quote_value(@owner.send(k)) } : quote_value(@owner.send(keys))
+        else
+          @owner.quoted_id
+        end
+      end
+
       def delete_records(records)
         case @reflection.options[:dependent]
           when :destroy
@@ -70,4 +78,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/associations/has_one_association.rb

@@ -14,6 +14,14 @@ module ActiveRecord
         end
         @finder_sql << " AND (#{conditions})" if conditions
       end
+
+      def owner_quoted_id
+        if (keys = @reflection.options[:primary_key])
+          keys.is_a?(Array) ? keys.collect {|k| @owner.class.quote_value(@owner.send(k)) } : @owner.class.quote_value(@owner.send(keys))
+        else
+          @owner.quoted_id
+        end
+      end
     end
   end
-end
+end

data/lib/composite_primary_keys/calculations.rb

@@ -16,12 +16,16 @@ module ActiveRecord
         self.arel.visitor.accept(attribute)
       end.join(', ')
 
-      relation = self.clone
-      relation.select_values = ["DISTINCT #{projection}"]
+     # relation = self.clone
+     # relation.select_values = ["DISTINCT #{projection}"]
 
-      table = Arel::Table.new('dummy').project('count(*)')
-      relation = table.from(relation.arel, "foobar")
-      type_cast_calculated_value(@klass.connection.select_value(relation.to_sql), column_for(column_name), operation)
+      manager = Arel::SelectManager.new(arel_engine)
+      manager.project("DISTINCT #{projection}")
+      manager.from(arel_table)
+      
+      query = Arel::Table.new('dummy').project('count(*)')
+      query = query.from("(#{manager.to_sql}) AS subquery")
+      type_cast_calculated_value(@klass.connection.select_value(query.to_sql), column_for(column_name), operation)
     end
   end
 end

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -7,16 +7,15 @@ require 'pp'
 require 'test/unit'
 require 'hash_tricks'
 require 'rubygems'
-require 'active_record'
-require 'active_record/fixtures'
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-require File.join(PROJECT_ROOT, "test", "connections", "native_#{adapter}", "connection")
-
 
 # To make debugging easier, test within this source tree versus an installed gem
 #require 'composite_primary_keys'
 require File.join(PROJECT_ROOT, "lib", "composite_primary_keys")
 
+require 'active_record/fixtures'
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+require File.join(PROJECT_ROOT, "test", "connections", "native_#{adapter}", "connection")
+
 # Tell ActiveRecord where to find models
 ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
 

data/test/connections/native_mysql/connection.rb

@@ -7,7 +7,7 @@ def connection_string
   options['u'] = SPEC['username']  if SPEC['username']
   options['p'] = SPEC['password']  if SPEC['password']
   options['S'] = SPEC['sock']      if SPEC['sock']
-  options.map { |key, value| "-#{key} #{value}" }.join(" ")
+  options.map { |key, value| "-#{key}#{value}" }.join(" ")
 end
 
   # Adapter config setup in locals/database_connections.rb

data/test/fixtures/department.rb

@@ -1,5 +1,4 @@
 class Department < ActiveRecord::Base
-  # set_primary_keys *keys - turns on composite key functionality
   set_primary_keys :department_id, :location_id
   has_many :employees, :foreign_key => [:department_id, :location_id]
 end

data/test/fixtures/dorm.rb

@@ -1,3 +1,3 @@
 class Dorm < ActiveRecord::Base
-  has_many :rooms, :include => :room_attributes
+  has_many :rooms, :include => :room_attributes,  :primary_key => [:id]
 end

data/test/fixtures/dorms.yml

@@ -1,2 +1,2 @@
-jacksons_dorm:
+branner:
     id: 1

data/test/fixtures/product.rb

@@ -1,7 +1,7 @@
 class Product < ActiveRecord::Base
 	set_primary_keys :id  # redundant
 	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
-	has_one :product_tariff, :foreign_key => :product_id
-
+	# Yeah, this is fake, it uses for testing
+  has_one :product_tariff, :foreign_key => :product_id
 	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
 end

data/test/fixtures/product_tariffs.yml

@@ -2,10 +2,12 @@ first_flat:
   product_id: 1
   tariff_id: 1
   tariff_start_date: <%= Date.today.to_s(:db) %>
+
 first_free:  
   product_id: 1
   tariff_id: 2
   tariff_start_date: <%= Date.today.to_s(:db) %>
+  
 second_free:
   product_id: 2
   tariff_id: 2

data/test/fixtures/products.yml

@@ -1,6 +1,7 @@
 first_product:
   id: 1
   name: Product One
+  
 second_product:
   id: 2
   name: Product Two

data/test/fixtures/room.rb

@@ -1,6 +1,7 @@
 class Room < ActiveRecord::Base
   set_primary_keys :dorm_id, :room_id
   belongs_to :dorm
+  has_many :room_assignments, :foreign_key =>  [:dorm_id, :room_id]
   has_many :room_attribute_assignments, :foreign_key =>  [:dorm_id, :room_id]
   has_many :room_attributes, :through => :room_attribute_assignments
   

data/test/fixtures/room_assignment.rb

@@ -1,6 +1,7 @@
 class RoomAssignment < ActiveRecord::Base
+  set_primary_keys :student_id, :dorm_id, :room_id
   belongs_to :student
-  belongs_to :room, :foreign_key => [:dorm_id, :room_id]
+  belongs_to :room, :foreign_key => [:dorm_id, :room_id], :primary_key => [:dorm_id, :room_id]
 
   before_destroy do |record|
     puts record

data/test/fixtures/room_assignments.yml

@@ -1,4 +1,9 @@
 jacksons_room:
     student_id: 1
     dorm_id: 1
+    room_id: 1
+
+bobs_room:
+    student_id: 2
+    dorm_id: 1
     room_id: 1

data/test/fixtures/rooms.yml

@@ -1,3 +1,7 @@
-jacksons_room:
-    dorm_id: 1
-    room_id: 1
+branner_room_1:
+  dorm_id: 1
+  room_id: 1
+
+branner_room_2:
+  dorm_id: 1
+  room_id: 2

data/test/fixtures/students.yml

@@ -1,2 +1,5 @@
 jackson:
-    id: 1
+  id: 1
+
+bob:
+  id: 2

data/test/test_associations.rb

@@ -5,26 +5,6 @@ class TestAssociations < ActiveSupport::TestCase
            :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
            :memberships
   
-  def test_has_many_through_with_conditions_when_through_association_is_not_composite
-    user = User.find(:first)
-    assert_equal 1, user.articles.find(:all, :conditions => ["articles.name = ?", "Article One"]).size
-  end
-
-  def test_has_many_through_with_conditions_when_through_association_is_composite
-    room = Room.find(:first)
-    assert_equal 0, room.room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "keg"]).size
-  end
-
-  def test_has_many_through_on_custom_finder_when_through_association_is_composite_finder_when_through_association_is_not_composite
-    user = User.find(:first)
-    assert_equal 1, user.find_custom_articles.size
-  end
-
-  def test_has_many_through_on_custom_finder_when_through_association_is_composite
-    room = Room.find(:first)
-    assert_equal 0, room.find_custom_room_attributes.size
-  end
-
   def test_count
     assert_equal(2, Product.count(:include => :product_tariffs))
     assert_equal(3, Tariff.count(:include => :product_tariffs))
@@ -141,9 +121,9 @@ class TestAssociations < ActiveSupport::TestCase
 
   def test_has_many_through_when_through_association_is_composite
     dorm = Dorm.find(:first)
-    assert_equal 1, dorm.rooms.length
-    assert_equal 1, dorm.rooms.first.room_attributes.length
-    assert_equal 'keg', dorm.rooms.first.room_attributes.first.name
+    assert_equal(2, dorm.rooms.length)
+    assert_equal(1, dorm.rooms.first.room_attributes.length)
+    assert_equal('keg', dorm.rooms.first.room_attributes.first.name)
   end
 
   def test_associations_with_conditions
@@ -160,6 +140,18 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal 1, @suburb.first_streets.size
   end
 
+  def test_composite_has_many_composites
+    room = rooms(:branner_room_1)
+    assert_equal(2, room.room_assignments.length)
+    assert_equal(room_assignments(:jacksons_room), room.room_assignments[0])
+    assert_equal(room_assignments(:bobs_room), room.room_assignments[1])
+  end
+
+  def test_composite_belongs_to_composite
+    room_assignment = room_assignments(:jacksons_room)
+    assert_equal(rooms(:branner_room_1), room_assignment.room)
+  end
+
   def test_has_and_belongs_to_many
     @restaurant = Restaurant.find([1,1])
     assert_equal 2, @restaurant.suburbs.size
@@ -168,16 +160,29 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal 2, @restaurant.suburbs.size
   end
 
-  def test_has_many_with_primary_key
+  def test_has_one_with_primary_key
     @membership = Membership.find([1, 1])
+    assert_equal 2, @membership.reading.id
+  end
 
-    assert_equal 2, @membership.readings.size
+  def test_has_one_with_composite
+    # In this case a regular model has_one composite model
+    product = products(:first_product)
+    assert_not_nil(product.product_tariff)
   end
 
-  def test_has_one_with_primary_key
+  def test_has_many_with_primary_key
     @membership = Membership.find([1, 1])
 
-    assert_equal 2, @membership.reading.id
+    assert_equal 2, @membership.readings.size
+  end
+
+  def test_has_many_with_composite_key
+    # In this case a regular model has_many composite models
+    dorm = dorms(:branner)
+    assert_equal(2, dorm.rooms.length)
+    assert_equal(1, dorm.rooms[0].room_id)
+    assert_equal(2, dorm.rooms[1].room_id)
   end
 
   def test_joins_has_many_with_primary_key
@@ -192,6 +197,26 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal [1, 1], @membership.id
   end
 
+  def test_has_many_through_with_conditions_when_through_association_is_not_composite
+    user = User.find(:first)
+    assert_equal 1, user.articles.find(:all, :conditions => ["articles.name = ?", "Article One"]).size
+  end
+
+  def test_has_many_through_with_conditions_when_through_association_is_composite
+    room = Room.find(:first)
+    assert_equal 0, room.room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "keg"]).size
+  end
+
+  def test_has_many_through_on_custom_finder_when_through_association_is_composite_finder_when_through_association_is_not_composite
+    user = User.find(:first)
+    assert_equal 1, user.find_custom_articles.size
+  end
+
+  def test_has_many_through_on_custom_finder_when_through_association_is_composite
+    room = Room.find(:first)
+    assert_equal 0, room.find_custom_room_attributes.size
+  end
+
   def test_has_many_with_primary_key_with_associations
     # Trigger Active Records find_with_associations method
     memberships = Membership.find(:all, :include => :statuses,

data/test/test_create.rb

@@ -38,7 +38,7 @@ class TestCreate < ActiveSupport::TestCase
       begin
         @obj = @klass.create(@klass_info[:create].block(@klass.primary_key))
         @successful = !composite?
-      rescue CompositePrimaryKeys::ActiveRecord::CompositeKeyError
+      rescue ActiveRecord::CompositeKeyError
         @successful = false
       rescue
         flunk "Incorrect exception raised: #{$!}, #{$!.class}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 1
-  - 6
-  version: 3.1.6
+  - 7
+  version: 3.1.7
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,13 +16,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 -06:00
-default_executable: 
+date: 2011-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: arel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +48,20 @@ dependencies:
         - 0
         - 5
         version: 3.0.5
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,7 +71,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: Composite key support for ActiveRecord 3
 email: 
 - drnicwilliams@gmail.com
@@ -66,7 +89,6 @@ files:
 - init.rb
 - install.rb
 - loader.rb
-- lib/composite_primary_keys/arel_extensions.rb
 - lib/composite_primary_keys/associations/association_proxy.rb
 - lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb
 - lib/composite_primary_keys/associations/has_many_association.rb
@@ -186,7 +208,6 @@ files:
 - test/plugins/pagination_helper.rb
 - test/README_tests.txt
 - test/setup.rb
-- test/test_arel.rb
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
@@ -206,7 +227,6 @@ files:
 - test/test_tutorial_example.rb
 - test/test_update.rb
 - test/test_validations.rb
-has_rdoc: true
 homepage: http://github.com/cfis/composite_primary_keys
 licenses: []
 
@@ -238,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord
@@ -249,7 +269,6 @@ test_files:
 - test/hash_tricks.rb
 - test/README_tests.txt
 - test/setup.rb
-- test/test_arel.rb
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb

data/lib/composite_primary_keys/arel_extensions.rb

@@ -1,47 +0,0 @@
-module Arel
-  module Nodes
-    class SubSelect < Node
-      attr_accessor :select, :as
-
-      def initialize(select, as = 'subquery')
-        @select = select
-        @as = as
-      end
-    end
-  end
-
-  module Visitors
-    class ToSql
-      def visit_Arel_Nodes_SubSelect o
-        "(#{visit(o.select)}) AS #{o.as}"
-      end
-    end
-  end
-
-  class SelectManager
-    def from table, as = nil
-      table = case table
-        when Arel::SelectManager
-          Nodes::SubSelect.new(table.ast, as)
-        when String
-          Nodes::SqlLiteral.new(table)
-        else
-          table
-        end
-
-      # FIXME: this is a hack to support
-      # test_with_two_tables_in_from_without_getting_double_quoted
-      # from the AR tests.
-      if @ctx.froms
-        source = @ctx.froms
-
-        if Nodes::SqlLiteral === table && Nodes::Join === source
-          source.left = table
-          table = source
-        end
-      end
-      @ctx.froms = table
-      self
-    end
-  end
-end

data/test/test_arel.rb

@@ -1,79 +0,0 @@
-require 'abstract_unit'
-
-
-module Arel
-  module Nodes
-    class SubSelect < Node
-       attr_accessor :select, :as
-
-      def initialize(select, as = 'subquery')
-        @select = select
-        @as = as
-      end
-    end
-  end
-
-  module Visitors
-    class ToSql
-      def visit_Arel_Nodes_SubSelect o
-        "(#{visit(o.select)}) AS #{o.as}"
-      end
-    end
-  end
-
-  class SelectManager
-    def from table, as = nil
-      table = case table
-        when Arel::SelectManager
-          Nodes::SubSelect.new(table.ast, as)
-        when String
-          Nodes::SqlLiteral.new(table)
-        else
-          table
-        end
-
-      # FIXME: this is a hack to support
-      # test_with_two_tables_in_from_without_getting_double_quoted
-      # from the AR tests.
-      if @ctx.froms
-        source = @ctx.froms
-
-        if Nodes::SqlLiteral === table && Nodes::Join === source
-          source.left = table
-          table = source
-        end
-      end
-      @ctx.froms = table
-      self
-    end
-  end
-end
-
-
-
-#class TestArel < Test::Unit::TestCase
-#  def test_engine
-#    assert_not_nil(Arel::Table)
-#    assert_not_nil(Arel::Table.engine)
-#  end
-#end
-
-visitor = Arel::Visitors::ToSql.new(Arel::Table.engine)
-
-tariffs = Arel::Table.new(:tariffs)
-product_tariffs = Arel::Table.new(:product_tariffs)
-subquery = tariffs.join(product_tariffs).on(tariffs[:tariff_id].eq(product_tariffs[:tariff_id]).and(tariffs[:start_date].eq(product_tariffs[:tariff_start_date])))
-
-projection = ['tariff_id', 'start_date'].map do |key|
-  visitor.accept(tariffs[key])
-end.join(', ')
-
-subquery.project("DISTINCT #{projection}")
-
-table = Arel::Table.new('test').project('count(*)')
-query = table.from(subquery, "foobar")
-
-puts "***********"
-puts query.to_sql
-a = query.to_a
-puts a