aggregate_columns 0.9.6 → 0.9.7

data/lib/aggregate_columns.rb

@@ -72,20 +72,31 @@ module AggregateColumns
       # (and not that complicated) to make it work on ActiveRecord::Relation
       # instances
       assoc_reflection = reflect_on_association( association )
+      through_reflection = assoc_reflection.through_reflection
       foreign_key = assoc_reflection.foreign_key
       aggregate_table_name = assoc_reflection.table_name
       klass = assoc_reflection.klass
       join_type = options[:join_type] # TODO: check if within allowed values
 
       if join_type
-        aggregate_rel = klass.select( "#{foreign_key}, #{aggregate_expression} AS #{result_column}" ).from( aggregate_table_name ).group( foreign_key )
+        main_foreign_key = through_reflection ? through_reflection.foreign_key : foreign_key
+        aggregate_rel = klass.select( "#{main_foreign_key}, #{aggregate_expression} AS #{result_column}" ).from( aggregate_table_name ).group( main_foreign_key )
+        if through_reflection
+          aggregate_rel = aggregate_rel.joins( "INNER JOIN #{through_reflection.table_name} ON #{through_reflection.table_name}.id = #{aggregate_table_name}.#{assoc_reflection.foreign_key}" )
+        end
         aggregate_rel = yield( aggregate_rel ) if block_given?
         rel = rel.
-          joins( "#{join_type.to_s.upcase} JOIN (#{aggregate_rel.to_sql}) #{result_column}_join ON #{table_name}.id = #{result_column}_join.#{foreign_key}" ).
+          joins( "#{join_type.to_s.upcase} JOIN (#{aggregate_rel.to_sql}) #{result_column}_join ON #{table_name}.id = #{result_column}_join.#{main_foreign_key}" ).
           select( result_column.to_s ).
           order( "#{result_column} DESC" ) # You might reorder if you want to have it differently
       else
-        aggregate_rel = klass.select( "#{aggregate_expression} AS #{result_column}" ).from( aggregate_table_name ).where( "#{table_name}.id = #{foreign_key}" )
+        aggregate_rel = klass.select( "#{aggregate_expression} AS #{result_column}" ).from( aggregate_table_name )
+        if through_reflection
+          aggregate_rel = aggregate_rel.joins( "INNER JOIN #{through_reflection.table_name} ON #{through_reflection.table_name}.id = #{aggregate_table_name}.#{assoc_reflection.foreign_key}" ).where( "#{table_name}.id = #{through_reflection.foreign_key}" )
+        else
+          aggregate_rel = aggregate_rel.where( "#{table_name}.id = #{aggregate_table_name}.#{foreign_key}" )
+        end
+        
         aggregate_rel = yield( aggregate_rel ) if block_given?
         rel = rel.
           select( "(#{aggregate_rel.to_sql}) AS #{result_column}" ).

data/lib/aggregate_columns/version.rb

@@ -1,3 +1,3 @@
 module AggregateColumns
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/test/rails_3_test.rb

@@ -16,16 +16,22 @@ if Rails::VERSION::MAJOR == 3
 
     class Post < ActiveRecord::Base
       has_many :comments
+      has_many :notes, :through => :comments
     end
 
     class Comment < ActiveRecord::Base
       belongs_to :post
+      has_many :notes
+    end
+
+    class Note < ActiveRecord::Base
+      belongs_to :comment
     end
 
     def test_only_association
       relation = Post.aggregate_columns( :association => :comments )
       assert_equal 2, relation.select_values.count
-      assert relation.select_values.include?( "(SELECT count(*) AS comment_count FROM comments  WHERE (posts.id = post_id)) AS comment_count" )
+      assert relation.select_values.include?( "(SELECT count(*) AS comment_count FROM comments  WHERE (posts.id = comments.post_id)) AS comment_count" )
       assert_equal relation.order_values, ["comment_count DESC"]
       assert_empty relation.where_values
       assert_empty relation.joins_values
@@ -39,7 +45,7 @@ if Rails::VERSION::MAJOR == 3
     def test_function_and_column
       relation = Post.aggregate_columns( :association => :comments, :function => :max, :column => :created_at )
       assert_equal 2, relation.select_values.count
-      assert relation.select_values.include?( "(SELECT max(created_at) AS comments_created_at_max FROM comments  WHERE (posts.id = post_id)) AS comments_created_at_max" )
+      assert relation.select_values.include?( "(SELECT max(created_at) AS comments_created_at_max FROM comments  WHERE (posts.id = comments.post_id)) AS comments_created_at_max" )
       assert_equal relation.order_values, ["comments_created_at_max DESC"]
       assert_empty relation.where_values
       assert_empty relation.joins_values
@@ -48,7 +54,7 @@ if Rails::VERSION::MAJOR == 3
     def test_expression
       relation = Post.aggregate_columns( :association => :comments, :expression => "(created_at + updated_at)", :result_column => :ultimate_at )
       assert_equal 2, relation.select_values.count
-      assert relation.select_values.include?( "(SELECT (created_at + updated_at) AS ultimate_at FROM comments  WHERE (posts.id = post_id)) AS ultimate_at" )
+      assert relation.select_values.include?( "(SELECT (created_at + updated_at) AS ultimate_at FROM comments  WHERE (posts.id = comments.post_id)) AS ultimate_at" )
       assert_equal relation.order_values, ["ultimate_at DESC"]
       assert_empty relation.where_values
       assert_empty relation.joins_values
@@ -57,7 +63,7 @@ if Rails::VERSION::MAJOR == 3
     def test_result_column
       relation = Post.aggregate_columns( :association => :comments, :function => :max, :column => :created_at, :result_column => :max_created_at )
       assert_equal 2, relation.select_values.count
-      assert relation.select_values.include?( "(SELECT max(created_at) AS max_created_at FROM comments  WHERE (posts.id = post_id)) AS max_created_at" )
+      assert relation.select_values.include?( "(SELECT max(created_at) AS max_created_at FROM comments  WHERE (posts.id = comments.post_id)) AS max_created_at" )
       assert_equal relation.order_values, ["max_created_at DESC"]
       assert_empty relation.where_values
       assert_empty relation.joins_values
@@ -75,7 +81,7 @@ if Rails::VERSION::MAJOR == 3
     def test_where_clauses
       relation = Post.where( :id => 2 ).aggregate_columns( :association => :comments ) { |rel| rel.where( :id => 1 ) }
       assert_equal "posts.id = 2", relation.where_values.first.to_sql # Additional "where" means where_values must be processed with to_sql instead of querying directly
-      assert relation.select_values.include?( "(SELECT count(*) AS comment_count FROM comments  WHERE comments.id = 1 AND (posts.id = post_id)) AS comment_count" )
+      assert relation.select_values.include?( "(SELECT count(*) AS comment_count FROM comments  WHERE comments.id = 1 AND (posts.id = comments.post_id)) AS comment_count" )
     end
 
     def test_multiple_aggregates
@@ -85,5 +91,11 @@ if Rails::VERSION::MAJOR == 3
       assert relation.joins_values.include?( "RIGHT JOIN (SELECT post_id, count(*) AS comment_count FROM comments  GROUP BY post_id) comment_count_join ON posts.id = comment_count_join.post_id" )
     end
 
+    def test_through_association
+      relation = Post.aggregate_columns( :association => :notes )
+      assert relation.select_values.include?( "(SELECT count(*) AS note_count FROM notes INNER JOIN comments ON comments.id = notes.comment_id WHERE (posts.id = post_id)) AS note_count" )
+      relation = Post.aggregate_columns( :association => :notes, :join_type => :right )
+      assert_equal relation.joins_values, ["RIGHT JOIN (SELECT post_id, count(*) AS note_count FROM notes INNER JOIN comments ON comments.id = notes.comment_id GROUP BY post_id) note_count_join ON posts.id = note_count_join.post_id"]
+    end
   end
 end

metadata

@@ -1,78 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: aggregate_columns
-version: !ruby/object:Gem::Version
-  version: 0.9.6
+version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 7
+  version: 0.9.7
 platform: ruby
-authors:
+authors: 
 - Marek Janukowicz/Starware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-02 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &7063280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :runtime
-  prerelease: false
-  version_requirements: *7063280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &7061440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *7061440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &7055400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :development
-  prerelease: false
-  version_requirements: *7055400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &7052700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :development
-  prerelease: false
-  version_requirements: *7052700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: activerecord-nulldb-adapter
-  requirement: &7051800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
   type: :development
-  prerelease: false
-  version_requirements: *7051800
-description: ''
-email:
+  version_requirements: *id005
+description: ""
+email: 
 - marek@janukowicz.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .hgignore
 - Gemfile
 - README
@@ -83,31 +110,41 @@ files:
 - test/rails_2_test.rb
 - test/rails_3_test.rb
 - test/test_helper.rb
-homepage: ''
+has_rdoc: true
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Create and use aggregate columns in Rails applications
-test_files:
+test_files: 
 - test/rails_2_test.rb
 - test/rails_3_test.rb
 - test/test_helper.rb