composite_primary_keys 3.1.4 → 3.1.5

data/History.txt

@@ -1,7 +1,14 @@
-== 3.1.3 2011-03-05
+== 3.1.5 2011-03-24
+* Fix simple calculation methods
+* Fix instantiation of cpk records via associations.
+* Fix Relation#delete_all
+* 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)
 * Fix persistence methods to support destroy callbacks
+* Support rake 0.9.0 beta
 
 
 == 3.1.2 2011-02-26

data/lib/composite_primary_keys.rb

@@ -49,6 +49,7 @@ 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/arel_extensions.rb

@@ -0,0 +1,47 @@
+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/lib/composite_primary_keys/associations.rb

@@ -3,6 +3,23 @@ module ActiveRecord
     module ClassMethods
       class JoinDependency
         class JoinBase
+          def aliased_primary_key
+            # CPK
+            # "#{aliased_prefix}_r0"
+
+            active_record.composite? ?
+              primary_key.inject([]) {|aliased_keys, key| aliased_keys << "#{ aliased_prefix }_r#{aliased_keys.length}"} :
+              "#{ aliased_prefix }_r0"
+          end
+
+          def record_id(row)
+            # CPK
+            # row[aliased_primary_key]
+            active_record.composite? ?
+              aliased_primary_key.map {|key| row[key]}.to_composite_keys :
+              row[aliased_primary_key]
+          end
+
           def column_names_with_alias
             unless defined?(@column_names_with_alias)
               @column_names_with_alias = []

data/lib/composite_primary_keys/calculations.rb

@@ -1,42 +1,27 @@
-#module ActiveRecord
-#  module Calculations
-#    alias :execute_simple_calculation_original :execute_simple_calculation
-#
-#    def execute_simple_calculation(operation, column_name, distinct)
-#      if column_name.kind_of?(Array)
-#        execute_simple_calculation_cpk(operation, column_name, distinct)
-#      else
-#        execute_simple_calculation_original(operation, column_name, distinct)
-#      end
-#    end
-#
-#    def execute_simple_calculation_cpk(operation, column_name, distinct)
-#      # SELECT COUNT(field1, field2) doens't work so make a subquery
-#      # like SELECT COUNT(*) FROM (SELECT DISTINCT field1, field2)
-#
-#      columns = column_name.map do |primary_key_column|
-#        table[primary_key_column]
-#      end
-#
-#      subquery = clone.project(columns)
-#      subquery = "(#{subquery.to_sql}) AS calculation_subquery"
-#      relation = Arel::Table.new(Arel::SqlLiteral.new(subquery))#.project(Arel::SqlLiteral.new('*').count)
-#      puts relation.to_sql
-#
-#      #projection = "DISTINCT #{columns.join(',')}"
-#      #subquery = "(#{table.project(projection).to_sql}) AS subquery"
-#
-#      #select_value = ::Arel::Nodes::Count.new(columns, distinct)
-#  #    relation.select_values = columns
-# #     puts @klass.connection.select_value(relation.to_sql)
-##
-#      #type_cast_calculated_value(@klass.connection.select_value(relation.to_sql), column_for(column_name), operation)
-#      #relation.select_values = [count_node]
-#      #projection = "DISTINCT #{columns.join(',')}"
-#      #subquery = "(#{table.project(projection).to_sql}) AS subquery"
-#      #relation = Arel::Table.new(subquery).project(Arel::SqlLiteral.new('*').count)
-#      type_cast_calculated_value(@klass.connection.select_value(relation.to_sql),
-#                                 column_for(column_name.first), operation)
-#    end
-#  end
-#end
+module ActiveRecord
+  module Calculations
+    alias :execute_simple_calculation_ar :execute_simple_calculation
+    def execute_simple_calculation(operation, column_name, distinct)
+      # CPK
+      if column_name.kind_of?(Array)
+        execute_simple_calculation_cpk(operation, column_name, distinct)
+      else
+        execute_simple_calculation_ar(operation, column_name, distinct)
+      end
+    end
+
+    def execute_simple_calculation_cpk(operation, column_name, distinct)
+      projection = self.primary_keys.map do |key|
+        attribute = arel_table[key]
+        self.arel.visitor.accept(attribute)
+      end.join(', ')
+
+      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)
+    end
+  end
+end

data/lib/composite_primary_keys/finder_methods.rb

@@ -51,7 +51,7 @@ module CompositePrimaryKeys
           # CPK
           when CompositePrimaryKeys::CompositeKeys
             relation = select(primary_keys).limit(1)
-            relation = relation.where(ids_predicate(id)) if id
+            relation = relation.where_cpk_id(id) if id
             relation.first ? true : false
           when Array
             # CPK
@@ -63,12 +63,11 @@ module CompositePrimaryKeys
           when Hash
             where(id).exists?
           else
-             # CPK
-             #relation = select(primary_key).limit(1)
-             #relation = relation.where(primary_key.eq(id)) if id
-             relation = select(primary_keys).limit(1)
-             relation = relation.where(ids_predicate(id)) if id
-
+            # CPK
+            #relation = select(primary_key).limit(1)
+            #relation = relation.where(primary_key.eq(id)) if id
+            relation = select(primary_keys).limit(1)
+            relation = relation.where_cpk_id(id) if id
             relation.first ? true : false
           end
         end

data/lib/composite_primary_keys/reflection.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module Reflection
     class AssociationReflection
       def derive_primary_key
-        result = if options[:foreign_key]
+        if options[:foreign_key]
           options[:foreign_key]
         elsif belongs_to?
           #CPK

data/lib/composite_primary_keys/relation.rb

@@ -2,35 +2,49 @@ module CompositePrimaryKeys
   module ActiveRecord
     module Relation
       module InstanceMethods
-        def ids_predicate(id)
-          predicate = nil
+        def where_cpk_id(id)
+          relation = clone
 
-          if id.kind_of?(CompositePrimaryKeys::CompositeKeys)
-            id = [id]
+          predicates = self.primary_keys.zip(Array(id)).map do |key, value|
+            table[key].eq(value)
           end
-
-          id.each do |composite_id|
-            self.primary_keys.zip(composite_id).each do |key, value|
-              eq = table[key].eq(value)
-              predicate = predicate ? predicate.and(eq) : eq
-            end
-          end
-          predicate
+          relation.where_values += predicates
+          relation
         end
 
         def delete(id_or_array)
           # CPK
           # where(@klass.primary_key => id_or_array).delete_all
-          where(ids_predicate(id_or_array)).delete_all
+
+          id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
+            [id_or_array]
+          else
+            Array(id_or_array)
+          end
+
+          id_or_array.each do |id|
+            where_cpk_id(id).delete_all
+          end
         end
 
-        def destroy(id)
+        def destroy(id_or_array)
           # CPK
           #if id.is_a?(Array)
           #  id.map { |one_id| destroy(one_id) }
           #else
-            find(id).destroy
+          #  find(id).destroy
           #end
+          id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
+            [id_or_array]
+          else
+            Array(id_or_array)
+          end
+
+          id_or_array.each do |id|
+            where_cpk_id(id).each do |record|
+              record.destroy
+            end
+          end
         end
       end
     end

data/lib/composite_primary_keys/version.rb

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

data/test/test_arel.rb

@@ -0,0 +1,79 @@
+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

data/test/test_associations.rb

@@ -28,7 +28,11 @@ class TestAssociations < ActiveSupport::TestCase
   def test_count
     assert_equal(2, Product.count(:include => :product_tariffs))
     assert_equal(3, Tariff.count(:include => :product_tariffs))
-    assert_equal(2, Tariff.count(:group => :start_date))
+
+    expected = {Date.today => 2,
+                Date.today.next => 1}
+       
+    assert_equal(expected, Tariff.count(:group => :start_date))
   end
 
   def test_products

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  version: 3.1.5
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -07:00
+date: 2011-03-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,7 @@ 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
@@ -183,6 +184,7 @@ 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
@@ -234,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord
@@ -245,6 +247,7 @@ 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