postgres_ext 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e108225b5ff194b97925399e805c0ab81ee95db6
-  data.tar.gz: cad4d50e3d7b19566eabdf8841d1e206a13cbadf
+  metadata.gz: f41de74b7eea3b27f6770cb352ba70497d94513d
+  data.tar.gz: 3e9cf324c7a635ac338fd5af691909ed13f1f02e
 SHA512:
-  metadata.gz: ede479c5b324e86d4c11a7427275a98871742052ebf55a30ebe67f1e332781db30b62ba791a59b271f0d72890c0ba8d9b281ca7c699654ef62f29271b060f160
-  data.tar.gz: 5e7c698daacf2ecc3c5752d963add7ae9e596aff4602d92b4a1c2919d35f0660fe55a6a4e3f4d2f2ce731b72c2b153edfcdddd864e129d59c8081623bb198046
+  metadata.gz: 5843378f753e2755c7c8459d89b580d10089d564b18ee390e349a3590efb0260bb12f6e9ef784bb02ef2514389351b303d867dbe7de4de859ac16ffdd88925ab
+  data.tar.gz: cf54fb746947851736f94fbf0e543eae772dfa7e85094c343853f12086c0c3c2c906ae2f15b4412de00fed0f1c749279a51a15a004fe8c5f07de9bdbadc05092

data/lib/postgres_ext/active_record/relation/query_methods.rb

@@ -130,25 +130,27 @@ module ActiveRecord
     end
 
     def build_rank(arel, ranks)
-      rank_orders = ranks.uniq.reject(&:blank?).flat_map do |value|
-        case value
-        when :order
-          arel.orders
-        when Symbol
-          table[value].asc
-        when Hash
-          value.map { |field, dir| table[field].send(dir) }
-        else
-          Arel::Nodes::SqlLiteral.new value
+      unless arel.projections.count == 1 && Arel::Nodes::Count === arel.projections.first
+        rank_orders = ranks.uniq.reject(&:blank?).flat_map do |value|
+          case value
+          when :order
+            arel.orders
+          when Symbol
+            table[value].asc
+          when Hash
+            value.map { |field, dir| table[field].send(dir) }
+          else
+            Arel::Nodes::SqlLiteral.new value
+          end
         end
-      end
 
-      unless rank_orders.blank?
-        rank_node = Arel::Nodes::SqlLiteral.new 'rank()'
-        window = Arel::Nodes::Window.new.order(rank_orders)
-        over_node = Arel::Nodes::Over.new rank_node, window
+        unless rank_orders.blank?
+          rank_node = Arel::Nodes::SqlLiteral.new 'rank()'
+          window = Arel::Nodes::Window.new.order(rank_orders)
+          over_node = Arel::Nodes::Over.new rank_node, window
 
-        arel.project(over_node)
+          arel.project(over_node)
+        end
       end
     end
 

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spec/queries/window_functions_spec.rb

@@ -40,5 +40,10 @@ describe 'Window functions' do
       ranked_people[0].rank.should eq 1
       ranked_people[1].rank.should eq 2
     end
+
+    it 'does not apply the rank when performing a count' do
+      query = Person.ranked(lucky_number: :desc).count
+      query.should eq 0
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord