aub-record_filter 0.9.8 → 0.9.9

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 0.9.9
+
+* Fixed a bug where distinct wasn't being applied when chaining with has_many
+:through associations.
+
 = 0.9.8
 
 * BREAKING CHANGE: changed the 'limit' method so that the limit is always the

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 9
-:patch: 8
+:patch: 9

data/lib/record_filter/filter.rb

@@ -70,7 +70,16 @@ module RecordFilter
     end
 
     def do_with_scope(count_query=false, &block) # :nodoc:
-      @clazz.send(:with_scope, { :find => proxy_options(count_query), :create => proxy_options(count_query) }, :reverse_merge) do
+      options = proxy_options(count_query)
+      @clazz.send(:with_scope, { :find => options, :create => options }, :reverse_merge) do
+        scoped_methods = @current_scoped_methods
+        # This is annoying, but we want the select statement from the proxy options to win if
+        # it is more specific than one in the current options from DISTINCT.
+        if scoped_methods && scoped_methods[:find] && scoped_methods[:find][:select] && options[:select] && 
+            options[:select] == "DISTINCT #{scoped_methods[:find][:select]}"
+          scoped_methods[:find] = scoped_methods[:find].dup
+          scoped_methods[:find].delete(:select)
+        end
         if @current_scoped_methods
           @clazz.send(:with_scope, @current_scoped_methods) do
             block.call

data/record_filter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{record_filter}
-  s.version = "0.9.8"
+  s.version = "0.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aubrey Holland", "Mat Brown"]
-  s.date = %q{2009-06-04}
+  s.date = %q{2009-06-22}
   s.description = %q{RecordFilter is a Pure-ruby criteria API for building complex queries in ActiveRecord. It supports queries that are built on the fly as well as named filters that can be added to objects and chained to create complex queries. It also gets rid of the nasty hard-coded SQL that shows up in most ActiveRecord code with a clean API that makes queries simple and intuitive to build.}
   s.email = %q{aubreyholland@gmail.com}
   s.extra_rdoc_files = [

data/spec/select_spec.rb

@@ -64,4 +64,15 @@ describe 'with custom selects for cases where DISTINCT is required' do
       Blog.last_find[:select].should == %q(DISTINCT "blogs".*)
     end
   end
+
+  describe 'using the distinct method when chaining named scopes with joins that do not need it' do
+    it 'should add distinct' do
+      Comment.named_filter(:dirty) do
+        with(:offensive, true)
+        distinct
+      end
+      Blog.first.comments.dirty.inspect
+      Comment.last_find[:select].should == %q(DISTINCT "comments".*)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aub-record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: []