aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile5
-rw-r--r--activerecord/examples/performance.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 124fbf5d24..4be3596932 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,10 @@ gem "mocha", ">= 0.9.8"
gem "rdoc", ">= 2.5.10"
gem "horo", ">= 1.0.2"
+# for perf tests
+gem "faker"
+gem "rbench"
+
# AS
gem "memcache-client", ">= 1.8.5"
@@ -22,6 +26,7 @@ gem "text-format", "~> 1.0.0"
platforms :mri_18 do
gem "system_timer"
gem "ruby-debug", ">= 0.10.3"
+ gem 'ruby-prof'
end
platforms :mri_19 do
diff --git a/activerecord/examples/performance.rb b/activerecord/examples/performance.rb
index a985cfcb66..5450209959 100644
--- a/activerecord/examples/performance.rb
+++ b/activerecord/examples/performance.rb
@@ -14,7 +14,7 @@ require 'rbench'
require File.expand_path("../../../load_paths", __FILE__)
require "active_record"
-conn = { :adapter => 'mysql',
+conn = { :adapter => 'mysql2',
:database => 'activerecord_unittest',
:username => 'rails', :password => '',
:encoding => 'utf8' }