Merge pull request #15 from tyok/fix-and-ignore-cached-queries

Ignore cached queries

Author: nepalez

lib/rspec/sqlimit/counter.rb

@@ -31,6 +31,7 @@ def count
     def callback
       @callback ||= lambda do |_name, start, finish, _message_id, values|
         return if %w(CACHE SCHEMA).include? values[:name]
+        return if cached_query?(values)
         queries << {
           sql: values[:sql],
           duration: (finish - start) * 1_000,
@@ -42,5 +43,9 @@ def callback
     def type_cast(binds)
       binds.map { |column, value| ActiveRecord::Base.connection.type_cast(value, column) }
     end
+
+    def cached_query?(values)
+      values[:type_casted_binds].respond_to?(:call)
+    end
   end
 end

spec/rspec/sqlimit/reporter_spec.rb

@@ -42,4 +42,21 @@
       end
     end
   end
+
+  context 'activerecord query caching was enabled' do
+    let(:counter) { RSpec::SQLimit::Counter[nil, Proc.new{ queries }] }
+
+    let(:queries) do
+      User.cache do
+        User.where(id: 1).to_a
+        User.where(id: 1).to_a
+        User.where(id: [2, 3]).to_a
+        User.where(id: [2, 3]).to_a
+      end
+    end
+
+    it 'ignores cached queries' do
+      expect(subject.call).to include("2 queries were invoked")
+    end
+  end
 end