aggregate_columns 0.9.7 → 0.9.8

data/lib/aggregate_columns/version.rb

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

data/lib/aggregate_columns.rb

@@ -72,31 +72,43 @@ module AggregateColumns
       # (and not that complicated) to make it work on ActiveRecord::Relation
       # instances
       assoc_reflection = reflect_on_association( association )
+      # TODO: this only handles single :through 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
-        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}" )
+      # This is the reflection to use to "join" with main table
+      join_reflection = through_reflection || assoc_reflection
+      join_foreign_key = join_reflection.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}" )
+      end
+
+      # TODO: this only handles :conditions and in a specific way - it should
+      # really handle other options as well
+      assoc_conditions = assoc_reflection.conditions.first.first
+      if assoc_conditions
+        aggregate_rel = aggregate_rel.where( klass.send( :sanitize_sql, assoc_conditions ))
+      end
+      if through_reflection
+        through_conditions = through_reflection.conditions.first.first
+        if through_conditions
+          aggregate_rel = aggregate_rel.where( through_reflection.klass.send( :sanitize_sql, through_conditions ))
         end
+      end
+
+      if join_type
+        aggregate_rel = aggregate_rel.select( join_foreign_key ).group( join_foreign_key )
         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.#{main_foreign_key}" ).
+          joins( "#{join_type.to_s.upcase} JOIN (#{aggregate_rel.to_sql}) #{result_column}_join ON #{table_name}.id = #{result_column}_join.#{join_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 )
-        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 = aggregate_rel.where( "#{table_name}.id = #{join_reflection.quoted_table_name}.#{join_reflection.foreign_key}" )
         aggregate_rel = yield( aggregate_rel ) if block_given?
         rel = rel.
           select( "(#{aggregate_rel.to_sql}) AS #{result_column}" ).

data/test/rails_3_test.rb

@@ -17,6 +17,7 @@ if Rails::VERSION::MAJOR == 3
     class Post < ActiveRecord::Base
       has_many :comments
       has_many :notes, :through => :comments
+      has_many :accepted_comments, :class_name => "Comment", :conditions => { :accepted => true }
     end
 
     class Comment < ActiveRecord::Base
@@ -73,7 +74,7 @@ if Rails::VERSION::MAJOR == 3
       relation = Post.aggregate_columns( :association => :comments, :join_type => :right )
       assert_equal 2, relation.select_values.count
       assert relation.select_values.include?( "comment_count" )
-      assert_equal relation.joins_values, ["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"]
+      assert_equal relation.joins_values, ["RIGHT JOIN (SELECT count(*) AS comment_count, post_id FROM comments  GROUP BY post_id) comment_count_join ON posts.id = comment_count_join.post_id"]
       assert_equal ["comment_count DESC"], relation.order_values
       assert_empty relation.where_values
     end
@@ -88,14 +89,19 @@ if Rails::VERSION::MAJOR == 3
       relation = Post.aggregate_columns( :association => :comments, :join_type => :right ).aggregate_columns( :association => :comments ).aggregate_columns( :association => :comments, :function => :sum, :column => :vote, :result_column => :number_of_votes )
       assert_empty relation.where_values
       assert relation.select_values.include?( "comment_count" )
-      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" )
+      assert relation.joins_values.include?( "RIGHT JOIN (SELECT count(*) AS comment_count, post_id 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 ) 
+      assert relation.select_values.include?( "(SELECT count(*) AS note_count FROM notes INNER JOIN comments ON comments.id = notes.comment_id WHERE (posts.id = comments.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"]
+      assert_equal relation.joins_values, ["RIGHT JOIN (SELECT count(*) AS note_count, post_id 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
+
+    def test_conditions
+      relation = Post.aggregate_columns( :association => :accepted_comments ) 
+      assert relation.select_values.include?( "(SELECT count(*) AS accepted_comment_count FROM comments  WHERE (comments.accepted = 't') AND (posts.id = comments.post_id)) AS accepted_comment_count" )
     end
   end
 end

metadata

@@ -1,105 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aggregate_columns
-version: !ruby/object:Gem::Version 
-  hash: 53
+version: !ruby/object:Gem::Version
+  version: 0.9.8
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 7
-  version: 0.9.7
 platform: ruby
-authors: 
+authors:
 - Marek Janukowicz/Starware
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-02 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &7078140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *7078140
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &7077260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *7077260
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &7075460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *7075460
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &7073600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activerecord-nulldb-adapter
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *7073600
+- !ruby/object:Gem::Dependency
+  name: activerecord-nulldb-adapter
+  requirement: &7072440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
-  version_requirements: *id005
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *7072440
+description: ''
+email:
 - marek@janukowicz.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .hgignore
 - Gemfile
 - README
@@ -110,41 +83,31 @@ files:
 - test/rails_2_test.rb
 - test/rails_3_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: ""
+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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 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