activerecord 3.1.8 → 3.1.9

data/examples/performance.rb

@@ -1,7 +1,9 @@
-TIMES = (ENV['N'] || 10000).to_i
-
-require 'rubygems'
+require File.expand_path('../../../load_paths', __FILE__)
 require "active_record"
+require 'benchmark/ips'
+
+TIME    = (ENV['BENCHMARK_TIME'] || 20).to_i
+RECORDS = (ENV['BENCHMARK_RECORDS'] || TIME*1000).to_i
 
 conn = { :adapter => 'sqlite3', :database => ':memory:' }
 
@@ -57,8 +59,8 @@ end
 notes = ActiveRecord::Faker::LOREM.join ' '
 today = Date.today
 
-puts 'Inserting 10,000 users and exhibits...'
-10_000.times do
+puts "Inserting #{RECORDS} users and exhibits..."
+RECORDS.times do
   user = User.create(
     :created_at => today,
     :name       => ActiveRecord::Faker.name,
@@ -73,9 +75,7 @@ puts 'Inserting 10,000 users and exhibits...'
   )
 end
 
-require 'benchmark'
-
-Benchmark.bm(46) do |x|
+Benchmark.ips(TIME) do |x|
   ar_obj       = Exhibit.find(1)
   attrs        = { :name => 'sam' }
   attrs_first  = { :name => 'sam' }
@@ -86,73 +86,68 @@ Benchmark.bm(46) do |x|
     :created_at => Date.today
   }
 
-  x.report("Model#id (x#{(TIMES * 100).ceil})") do
-    (TIMES * 100).ceil.times { ar_obj.id }
+  x.report("Model#id") do
+    ar_obj.id
   end
 
   x.report 'Model.new (instantiation)' do
-    TIMES.times { Exhibit.new }
+    Exhibit.new
   end
 
   x.report 'Model.new (setting attributes)' do
-    TIMES.times { Exhibit.new(attrs) }
+    Exhibit.new(attrs)
   end
 
   x.report 'Model.first' do
-    TIMES.times { Exhibit.first.look }
+    Exhibit.first.look
   end
 
-  x.report("Model.all limit(100) (x#{(TIMES / 10).ceil})") do
-    (TIMES / 10).ceil.times { Exhibit.look Exhibit.limit(100) }
+  x.report("Model.all limit(100)") do
+    Exhibit.look Exhibit.limit(100)
   end
 
-  x.report "Model.all limit(100) with relationship (x#{(TIMES / 10).ceil})" do
-    (TIMES / 10).ceil.times { Exhibit.feel Exhibit.limit(100).includes(:user) }
+  x.report "Model.all limit(100) with relationship" do
+    Exhibit.feel Exhibit.limit(100).includes(:user)
   end
 
-  x.report "Model.all limit(10,000) x(#{(TIMES / 1000).ceil})" do
-    (TIMES / 1000).ceil.times { Exhibit.look Exhibit.limit(10000) }
+  x.report "Model.all limit(10,000)" do
+    Exhibit.look Exhibit.limit(10000)
   end
 
   x.report 'Model.create' do
-    TIMES.times { Exhibit.create(exhibit) }
+    Exhibit.create(exhibit)
   end
 
   x.report 'Resource#attributes=' do
-    TIMES.times {
-      exhibit = Exhibit.new(attrs_first)
-      exhibit.attributes = attrs_second
-    }
+    e = Exhibit.new(attrs_first)
+    e.attributes = attrs_second
   end
 
   x.report 'Resource#update' do
-    TIMES.times { Exhibit.first.update_attributes(:name => 'bob') }
+    Exhibit.first.update_attributes(:name => 'bob')
   end
 
   x.report 'Resource#destroy' do
-    TIMES.times { Exhibit.first.destroy }
+    Exhibit.first.destroy
   end
 
   x.report 'Model.transaction' do
-    TIMES.times { Exhibit.transaction { Exhibit.new } }
+    Exhibit.transaction { Exhibit.new }
   end
 
   x.report 'Model.find(id)' do
-    id = Exhibit.first.id
-    TIMES.times { Exhibit.find(id) }
+    User.find(1)
   end
 
   x.report 'Model.find_by_sql' do
-    TIMES.times {
-      Exhibit.find_by_sql("SELECT * FROM exhibits WHERE id = #{(rand * 1000 + 1).to_i}").first
-    }
+    Exhibit.find_by_sql("SELECT * FROM exhibits WHERE id = #{(rand * 1000 + 1).to_i}").first
   end
 
-  x.report "Model.log x(#{TIMES * 10})" do
-    (TIMES * 10).times { Exhibit.connection.send(:log, "hello", "world") {} }
+  x.report "Model.log" do
+    Exhibit.connection.send(:log, "hello", "world") {}
   end
 
-  x.report "AR.execute(query) (#{TIMES / 2})" do
-    (TIMES / 2).times { ActiveRecord::Base.connection.execute("Select * from exhibits where id = #{(rand * 1000 + 1).to_i}") }
+  x.report "AR.execute(query)" do
+    ActiveRecord::Base.connection.execute("Select * from exhibits where id = #{(rand * 1000 + 1).to_i}")
   end
 end

data/lib/active_record/associations/preloader/association.rb

@@ -117,9 +117,7 @@ module ActiveRecord
             conditions = klass.send(:instance_eval, &conditions)
           end
 
-          if conditions
-            klass.send(:sanitize_sql, conditions)
-          end
+          conditions
         end
       end
     end

data/lib/active_record/base.rb

@@ -1065,7 +1065,11 @@ Calling dynamic finder with less number of arguments than the number of attribut
                 eowarn
             end
             if match.finder?
-              options = arguments.extract_options!
+              options = if arguments.length > attribute_names.size
+                          arguments.extract_options!
+                        else
+                          {}
+                        end
               relation = options.any? ? scoped(options) : scoped
               relation.send :find_by_attributes, match, attribute_names, *arguments
             elsif match.instantiator?

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -5,7 +5,7 @@ require 'set'
 require 'active_record/connection_adapters/statement_pool'
 require 'arel/visitors/bind_visitor'
 
-gem 'mysql', '~> 2.8.1'
+gem 'mysql', '~> 2.8'
 require 'mysql'
 
 class Mysql

data/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 8
+    TINY  = 9
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 3.1.8
-  prerelease: 
+  version: 3.1.9
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.29
 description: Databases on Rails. Build a persistent domain model by mapping database
@@ -215,31 +206,27 @@ files:
 - lib/rails/generators/active_record.rb
 homepage: http://www.rubyonrails.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2577013611060670621
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0.preview2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []