predictive_load 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9765b8681e6f08d2913adc2e00dd8543221e4104
-  data.tar.gz: 7c9efbb5370c71cf3209a534e8694ac698f6e282
+  metadata.gz: eb9fa507002032502359805bb5a3e97730abba37
+  data.tar.gz: 40ad5bd0b8d8aa0b65bdd4d81bd20617a901744f
 SHA512:
-  metadata.gz: 36c715e1fc8d8e241e766fdf1fb2df3ca78505b10ca717cdb87f6164020a2527e40ba422657fc53b4dd3322f870b8ffe45879d099c13a7cb6aa9aab36240e034
-  data.tar.gz: c48502690d43a1a2b93d555fbbbb95bceac4e54d4c2048a570faf98c7bead3b5fb62995fedf624e02af1f9e00c7b566b3e95277a2828ef63cf45753b80461103
+  metadata.gz: 785eaf1a3a9a1ad2f7c79ad0603ae92e0366cde058ffe8941ab5e81093df731562f6c90b8724aa5f0613949058c7aa0bbf414992ea8b4d597524fee79b024d70
+  data.tar.gz: 3ac672859b89465d53fe8086dad7d82fe3519869452537ac7ab551b7c7216111a1b336c4f746aebb2c9af6e720d01b3e40a680e3b1a575406cf313ca38412d44

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/eac/resque-durable.png)](https://travis-ci.org/eac/predictive_load)
+[![Build Status](https://travis-ci.org/eac/predictive_load.png)](https://travis-ci.org/eac/predictive_load)
 
 predictive_load
 ===============
@@ -7,12 +7,16 @@ Observes Active Record collections and notifies when a member loads an associati
 * automatically preloading the association in a single query for all members of that collection.
 * N+1 detection logging 
 
-
-
 ### Automatic preloading
 
 
 ```ruby
+require 'predictive_load'
+require 'predictive_load/active_record_collection_observation'
+ActiveRecord::Base.send(:include, PredictiveLoad::ActiveRecordCollectionObservation)
+
+require 'predictive_load/loader'
+
 ActiveRecord::Relation.collection_observer = PredictiveLoad::Loader
 
 Ticket.all.each do |ticket| 
@@ -28,10 +32,24 @@ Produces:
   SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` IN (1, 2, 3)
 ```
 
+### Disabling preload
+
+Some things cannot be preloaded, use `no_preload`
+
+```
+has_many :foos, no_preload: true
+```
+
 ### N+1 detection logging
 
 There is also a log-only version:
 ```ruby
+require 'predictive_load'
+require 'predictive_load/active_record_collection_observation'
+ActiveRecord::Base.send(:include, PredictiveLoad::ActiveRecordCollectionObservation)
+
+require 'predictive_load/watcher'
+
 ActiveRecord::Relation.collection_observer = PredictiveLoad::Watcher
 
 Comment.all.each do |comment|

data/lib/predictive_load.rb

@@ -1,2 +1,4 @@
 module PredictiveLoad
 end
+
+ActiveRecord::Associations::Builder::Association.valid_options << :no_preload

data/lib/predictive_load/loader.rb

@@ -5,7 +5,6 @@ module PredictiveLoad
   # ActiveRecord::Relation.collection_observer = LazyLoader
   #
   class Loader
-
     def self.observe(records)
       new(records).observe
     end
@@ -28,6 +27,10 @@ module PredictiveLoad
       end
     end
 
+    protected
+
+    attr_reader :records
+
     def all_records_will_likely_load_association?(association_name)
       if defined?(Mocha) && association_name.to_s.index('_stub_')
         false
@@ -37,16 +40,20 @@ module PredictiveLoad
     end
 
     def supports_preload?(association)
-      return false if association.reflection.options[:conditions].respond_to?(:to_proc)
+      return false if association.reflection.options[:no_preload]
+      return false if association.reflection.options[:conditions].respond_to?(:to_proc) # rails 3 conditions proc (we do not know if it uses instance methods)
+      if ActiveRecord::VERSION::MAJOR > 3
+        return false if association.reflection.scope.try(:arity).to_i > 0 # rails 4+ conditions block, if it uses a passed in object, we assume it is not preloadable
+      end
       true
     end
 
-    protected
-
-    attr_reader :records
-
     def preload(association_name)
-      ActiveRecord::Associations::Preloader.new(records_with_association(association_name), [ association_name ]).run
+      if ActiveRecord::VERSION::STRING <= "4.1.0"
+        ActiveRecord::Associations::Preloader.new(records_with_association(association_name), [ association_name ]).run
+      else
+        ActiveRecord::Associations::Preloader.new.preload(records_with_association(association_name), [ association_name ])
+      end
     end
 
     def records_with_association(association_name)
@@ -59,10 +66,9 @@ module PredictiveLoad
 
     def mixed_collection?
       @mixed_collection ||= begin
-                              klass = records.first.class
-                              records.any? { |record| record.class != klass }
-                            end
+        klass = records.first.class
+        records.any? { |record| record.class != klass }
+      end
     end
-
   end
 end

data/lib/predictive_load/preload_log.rb

@@ -8,14 +8,16 @@ module PredictiveLoad
     def preload(association)
       grouped_records(association).each do |reflection, klasses|
         klasses.each do |klass, records|
-          preloader   = preloader_for(reflection).new(klass, records, reflection, options)
+          preload_scope = (ActiveRecord::VERSION::MAJOR == 3 ? options : self.preload_scope)
+          preloader   = preloader_for(reflection).new(klass, records, reflection, preload_scope)
 
           if preloader.respond_to?(:through_reflection)
             log("encountered :through association for #{association}. Requires loading records to generate query, so skipping for now.")
             next
           end
 
-          preload_sql = preloader.scoped.where(collection_arel(preloader)).to_sql
+          scope = (ActiveRecord::VERSION::MAJOR == 3 ? preloader.scoped : preloader.scope)
+          preload_sql = scope.where(collection_arel(preloader)).to_sql
 
           log("would preload with: #{preload_sql.to_s}")
           klass.connection.explain(preload_sql).each_line do |line|

data/lib/predictive_load/watcher.rb

@@ -1,3 +1,5 @@
+raise "Not supported on rails 4.1+" if ActiveRecord::VERSION::STRING >= "4.1.0"
+
 require 'predictive_load/loader'
 require 'predictive_load/preload_log'
 

metadata

@@ -1,15 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: predictive_load
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Chapweske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
-dependencies: []
+date: 2015-09-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.3.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-rg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: query_diet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Predictive loader
 email:
 - eac@zendesk.com
@@ -17,25 +135,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/predictive_load.rb
 - lib/predictive_load/active_record_collection_observation.rb
 - lib/predictive_load/loader.rb
 - lib/predictive_load/preload_log.rb
 - lib/predictive_load/watcher.rb
-- predictive_load.gemspec
-- test/active_record_collection_observation_test.rb
-- test/database.yml
-- test/helper.rb
-- test/loader_test.rb
-- test/models.rb
-- test/schema.rb
-- test/watcher_test.rb
 homepage: ''
 licenses:
 - Apache License Version 2.0
@@ -46,25 +152,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ''
-test_files:
-- test/active_record_collection_observation_test.rb
-- test/database.yml
-- test/helper.rb
-- test/loader_test.rb
-- test/models.rb
-- test/schema.rb
-- test/watcher_test.rb
+test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-test/db
-Gemfile.lock

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0

data/Gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-gem "activerecord", "3.2"
-gem "minitest"
-gem 'sqlite3'
-gem 'rake'

data/Rakefile

@@ -1,11 +0,0 @@
-require './test/helper'
-require 'rake'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
-  test.pattern = 'test/*_test.rb'
-  test.verbose = true
-end
-
-task :default => :test

data/predictive_load.gemspec

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Eric Chapweske"]
-  gem.email         = ["eac@zendesk.com"]
-  gem.description   = "Predictive loader"
-  gem.summary       = %q{}
-  gem.homepage      = ""
-  gem.license       = "Apache License Version 2.0"
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "predictive_load"
-  gem.version       = '0.1.2'
-end

data/test/active_record_collection_observation_test.rb

@@ -1,44 +0,0 @@
-require_relative 'helper'
-require 'predictive_load/watcher'
-
-describe PredictiveLoad::ActiveRecordCollectionObservation do
-
-  describe "Relation#to_a" do
-    before do
-      user1 = User.create!(:name => "Rudolph")
-      user2 = User.create!(:name => "Santa")
-    end
-
-    after do
-      User.delete_all
-    end
-
-    describe "when a collection observer is specified" do
-      before do
-        ActiveRecord::Relation.collection_observer = PredictiveLoad::Watcher
-      end
-
-      it "observes the members of that collection" do
-        users = User.all
-        assert_equal 2, users.size
-        assert users.all? { |user| user.collection_observer }
-      end
-
-    end
-
-    describe "when a collection observer is not specified" do
-      before do
-        ActiveRecord::Relation.collection_observer = nil
-      end
-
-      it "does not observe the members of that collection" do
-        users = User.all
-        assert_equal 2, users.size, users.inspect
-        assert users.none? { |user| user.collection_observer }
-      end
-
-    end
-
-  end
-
-end

data/test/database.yml

@@ -1,3 +0,0 @@
-test:
-  adapter: sqlite3
-  database: test/db

data/test/helper.rb

@@ -1,57 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'minitest'
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'active_record'
-require 'predictive_load'
-require 'predictive_load/active_record_collection_observation'
-
-ActiveRecord::Base.class_eval do
-  include PredictiveLoad::ActiveRecordCollectionObservation
-end
-
-database_config = YAML.load_file(File.join(File.dirname(__FILE__), 'database.yml'))
-ActiveRecord::Base.establish_connection(database_config['test'])
-ActiveRecord::Base.default_timezone = :utc
-require_relative 'schema'
-require_relative 'models'
-
-def assert_queries(num = 1)
-  ActiveRecord::SQLCounter.log = []
-  yield
-ensure
-  assert_equal num, ActiveRecord::SQLCounter.log.size, "#{ActiveRecord::SQLCounter.log.size} instead of #{num} queries were executed.#{ActiveRecord::SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{ActiveRecord::SQLCounter.log.join("\n")}"}"
-end
-
-# Yanked from ActiveRecord tests
-module ActiveRecord
-  class SQLCounter
-    cattr_accessor :ignored_sql
-    self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
-
-    # FIXME: this needs to be refactored so specific database can add their own
-    # ignored SQL.  This ignored SQL is for Oracle.
-    ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
-
-    cattr_accessor :log
-    self.log = []
-
-    attr_reader :ignore
-
-    def initialize(ignore = self.class.ignored_sql)
-      @ignore   = ignore
-    end
-
-    def call(name, start, finish, message_id, values)
-      sql = values[:sql]
-
-      # FIXME: this seems bad. we should probably have a better way to indicate
-      # the query was cached
-      return if 'CACHE' == values[:name] || ignore.any? { |x| x =~ sql }
-      self.class.log << sql
-    end
-  end
-
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
-end

data/test/loader_test.rb

@@ -1,155 +0,0 @@
-require_relative 'helper'
-require 'predictive_load/loader'
-
-describe PredictiveLoad::Loader do
-
-  describe "A collection of records" do
-    before do
-      ActiveRecord::Relation.collection_observer = PredictiveLoad::Loader
-      # trigger schema lookup to avoid messing with query count assertions
-      Photo.columns
-
-      topic = Topic.create!(:title => "Sleigh repairs")
-      user1 = User.create!(:name => "Rudolph")
-      user2 = User.create!(:name => "Santa")
-      user1.emails.create!
-      comment1 = topic.comments.create!(:body => "meow",     :user => user1)
-      comment2 = topic.comments.create!(:body => "Ho Ho ho", :user => user2)
-    end
-
-    after do
-      User.delete_all
-      Comment.delete_all
-      Topic.delete_all
-      Photo.delete_all
-      Email.delete_all
-    end
-
-    it "supports nested loading" do
-      # 3: User, Comment, Topic
-      assert_queries(3) do
-        User.all.each do |user|
-          user.comments.each { |comment| assert comment.topic }
-        end
-      end
-    end
-
-    describe "belongs_to" do
-
-      it "automatically preloads" do
-        comments = Comment.all
-        assert_equal 2, comments.size
-        assert_queries(1) do
-          comments.each { |comment| assert comment.user.name }
-        end
-      end
-
-      it "does not attempt to preload associations with proc conditions" do
-        comments = Comment.all
-        assert_equal 2, comments.size
-        assert_queries(2) do
-          comments.each { |comment| assert comment.user_by_proc.full_name }
-        end
-      end
-
-    end
-
-    describe "has_one" do
-
-      it "automatically preloads" do
-        users = User.all
-        assert_equal 2, users.size
-
-        assert_queries(1) do
-          users.each { |user| user.photo }
-        end
-      end
-
-    end
-
-    describe "has_many :through" do
-
-      it "automatically preloads" do
-        users = User.all
-        assert_equal 2, users.size
-
-        assert_queries(3) do
-          users.each do |user|
-            user.topics.each do |topic|
-              topic.comments.to_a
-            end
-          end
-        end
-
-      end
-    end
-
-    describe "has_and_belongs_to_many" do
-
-      it "automatically preloads" do
-        users = User.all
-        assert_equal 2, users.size
-
-        assert_queries(1) do
-          users.each { |user| user.emails.to_a }
-        end
-
-      end
-    end
-
-    describe "has_many" do
-
-      it "automatically prelaods" do
-        users = User.all
-        assert_equal 2, users.size
-        assert_queries(1) do
-          users.each { |user| user.comments.to_a }
-        end
-      end
-
-      it "preloads #length" do
-        users = User.all
-        assert_equal 2, users.size
-        assert_queries(1) do
-          users.each { |user| user.comments.length }
-        end
-      end
-
-      describe "unsupported behavior" do
-        it "does not preload when dynamically scoped" do
-          users = User.all
-          topic = Topic.first
-          assert_queries(2) do
-            users.each { |user| user.comments.by_topic(topic).to_a }
-          end
-        end
-
-        it "does not preload when staticly scoped" do
-          users = User.all
-          topic = Topic.first
-          assert_queries(2) do
-            users.each { |user| user.comments.recent.to_a }
-          end
-        end
-
-
-        it "does not preload #size" do
-          users = User.all
-          assert_queries(2) do
-            users.each { |user| user.comments.size }
-          end
-        end
-
-        it "does not preload first/last" do
-          users = User.all
-          assert_queries(2) do
-            users.each { |user| user.comments.first }
-          end
-        end
-      end
-
-    end
-
-  end
-
-end

data/test/models.rb

@@ -1,36 +0,0 @@
-class User < ActiveRecord::Base
-  has_many :comments,  :dependent => :destroy
-  has_many :topics,    :through => :comments
-  has_one  :photo
-  has_and_belongs_to_many :emails
-
-  def full_name
-    name
-  end
-
-end
-
-class Email < ActiveRecord::Base
-end
-
-class Topic < ActiveRecord::Base
-  has_many :comments, :dependent => :destroy
-end
-
-class Comment < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :user_by_proc, :class_name => "User", :foreign_key => :user_id,
-                            :conditions => proc { "1 = #{one}" }
-  belongs_to :topic
-
-  scope :by_topic, lambda { |topic| where(:topic_id => topic.id) }
-  scope :recent, order('updated_at desc')
-
-  def one
-    1
-  end
-end
-
-class Photo < ActiveRecord::Base
-  belongs_to :user
-end

data/test/schema.rb

@@ -1,37 +0,0 @@
-ActiveRecord::Schema.define(:version => 1) do
-
-  drop_table(:users)    rescue nil
-  drop_table(:emails)   rescue nil
-  drop_table(:photos)   rescue nil
-  drop_table(:topics)   rescue nil
-  drop_table(:comments) rescue nil
-  drop_table(:emails_users) rescue nil
-
-  create_table(:users) do |t|
-    t.string   :name,    :null => false
-  end
-
-  create_table(:photos) do |t|
-    t.integer  :user_id, :null => false
-  end
-
-  create_table(:emails_users) do |t|
-    t.integer :user_id
-    t.integer :email_id
-  end
-
-  create_table(:emails) do |t|
-  end
-
-  create_table(:topics) do |t|
-    t.string   :title,   :null => false
-  end
-
-  create_table(:comments) do |t|
-    t.string   :body,     :null => false
-    t.integer  :topic_id, :null => false
-    t.integer  :user_id,  :null => false
-    t.timestamps
-  end
-
-end

data/test/watcher_test.rb

@@ -1,96 +0,0 @@
-require_relative 'helper'
-require 'predictive_load/watcher'
-require 'logger'
-
-describe PredictiveLoad::Watcher do
-
-  describe "A collection of records" do
-    before do
-      ActiveRecord::Relation.collection_observer = PredictiveLoad::Watcher
-
-      topic = Topic.create!(:title => "Sleigh repairs")
-      user1 = User.create!(:name => "Rudolph")
-      user2 = User.create!(:name => "Santa")
-      comment1 = topic.comments.create!(:body => "meow",     :user => user1)
-      comment2 = topic.comments.create!(:body => "Ho Ho ho", :user => user2)
-    end
-
-    after do
-      User.delete_all
-      Comment.delete_all
-      Topic.delete_all
-    end
-
-    it "logs what the loader would have done" do
-      users = User.all
-      users[0].id = 1
-      users[1].id = 2
-      message = "predictive_load: detected n1 call on User#comments
-predictive_load: expect to prevent 1 queries
-predictive_load: would preload with: SELECT \"comments\".* FROM \"comments\"  WHERE \"comments\".\"user_id\" IN (1, 2)
-predictive_load: 0|0|0|SCAN TABLE comments (~100000 rows)
-
-predictive_load: 0|0|0|EXECUTE LIST SUBQUERY 1
-
-predictive_load: would have prevented all 1 queries
-"
-      timing_pattern = /\d+\.\d+ms/
-      message.gsub!(timing_pattern, '')
-      assert_log(message, timing_pattern) do
-        users.each { |user| user.comments.to_a }
-      end
-    end
-
-    it "does not log :through association queries" do
-      users = User.all
-      message = "predictive_load: detected n1 call on User#topics
-predictive_load: expect to prevent 1 queries
-predictive_load: encountered :through association for topics. Requires loading records to generate query, so skipping for now.
-predictive_load: would have prevented all 1 queries
-"
-
-      timing_pattern = /\d+\.\d+ms/
-      message.gsub!(timing_pattern, '')
-      assert_log(message, timing_pattern) do
-        users.each { |user| user.topics.to_a }
-      end
-
-    end
-
-    it "does not blow up when preloading associations with proc conditions" do
-      log    = StringIO.new
-      logger = build_logger(log)
-      ActiveRecord::Base.logger = logger
-
-      comments = Comment.all
-      assert_equal 2, comments.size
-      assert_queries(2) do
-        comments.each { |comment| assert comment.user_by_proc.full_name }
-      end
-    end
-
-  end
-
-  def assert_log(message, gsub_pattern)
-    original_logger = ActiveRecord::Base.logger
-    log    = StringIO.new
-    logger = build_logger(log)
-    ActiveSupport::LogSubscriber.colorize_logging = false
-    ActiveRecord::Base.logger = logger
-
-    yield
-    result = log.string
-    result.gsub!(gsub_pattern, '')
-    assert_equal message, result
-  ensure
-    ActiveRecord::Base.logger = original_logger
-  end
-
-  def build_logger(log)
-    Logger.new(log).tap do |logger|
-      logger.level     = Logger::Severity::INFO
-      logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
-    end
-  end
-
-end