app/models/impressionist/impressionable.rb in impressionist-1.4.5 vs app/models/impressionist/impressionable.rb in impressionist-1.4.6

- old
+ new

@@ -27,10 +27,14 @@ # ------------------------------------------ # TODO: CLEAN UP, make it HUMAN readable def impressionist_count(options={}) options.reverse_merge!(:filter=>:request_hash, :start_date=>nil, :end_date=>Time.now) imps = options[:start_date].blank? ? impressions : impressions.where("created_at>=? and created_at<=?",options[:start_date],options[:end_date]) - options[:filter] == :all ? imps.count : imps.count(options[:filter], :distinct => true) + if Rails::VERSION::MAJOR == 4 + options[:filter] == :all ? imps.count : imps.select(options[:filter]).distinct.count + else + options[:filter] == :all ? imps.count : imps.count(options[:filter], :distinct => true) + end end def update_impressionist_counter_cache slave = Impressionist::UpdateCounters.new(self) slave.update