From 9a23a0350502c7b3c94cb9ee761dea3bc08c6271 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 12 Jun 2010 11:54:52 +0530
Subject: Remove an unused method

---
 activerecord/lib/active_record/base.rb | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 7cff6d9f1a..63ab6efae2 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1068,19 +1068,6 @@ module ActiveRecord #:nodoc:
           attribute_names.all? { |name| column_methods_hash.include?(name.to_sym) }
         end
 
-        def attribute_condition(quoted_column_name, argument)
-          case argument
-            when nil   then "#{quoted_column_name} IS ?"
-            when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope then "#{quoted_column_name} IN (?)"
-            when Range then if argument.exclude_end?
-                              "#{quoted_column_name} >= ? AND #{quoted_column_name} < ?"
-                            else
-                              "#{quoted_column_name} BETWEEN ? AND ?"
-                            end
-            else            "#{quoted_column_name} = ?"
-          end
-        end
-
       protected
         # Scope parameters to method calls within the block.  Takes a hash of method_name => parameters hash.
         # method_name may be <tt>:find</tt> or <tt>:create</tt>. <tt>:find</tt> parameter is <tt>Relation</tt> while
-- 
cgit v1.2.3


From b308a6030efdffabc5ca3f0b6b148c972d33fe30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 12 Jun 2010 10:07:35 +0200
Subject: Use load_paths on AR benchmarks so it uses the bundler setup instead
 of system gems.

---
 activerecord/examples/performance.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/examples/performance.rb b/activerecord/examples/performance.rb
index 53acd62f47..f69576b240 100755
--- a/activerecord/examples/performance.rb
+++ b/activerecord/examples/performance.rb
@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby -KU
 
 TIMES = (ENV['N'] || 10000).to_i
-
 require 'rubygems'
+
 gem 'addressable',  '~>2.0'
 gem 'faker',        '~>0.3.1'
 gem 'rbench',       '~>0.2.3'
+
 require 'addressable/uri'
 require 'faker'
 require 'rbench'
 
-__DIR__ = File.dirname(__FILE__)
-$:.unshift "#{__DIR__}/../lib"
-require 'active_record'
+require File.expand_path("../../../load_paths", __FILE__)
+require "active_record"
 
 conn = { :adapter => 'mysql',
   :database => 'activerecord_unittest',
@@ -55,7 +55,7 @@ class Exhibit < ActiveRecord::Base
   def self.feel(exhibits) exhibits.each { |e| e.feel } end
 end
 
-sqlfile = "#{__DIR__}/performance.sql"
+sqlfile = File.expand_path("../performance.sql", __FILE__)
 
 if File.exists?(sqlfile)
   mysql_bin = %w[mysql mysql5].select { |bin| `which #{bin}`.length > 0 }
-- 
cgit v1.2.3


From d67549306567b219089f2355fe432d31d0ebf8a1 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Thu, 10 Jun 2010 12:19:17 -0400
Subject: Revert "Validators should at model level and not at AR:Base level
 [Closes #4804]"

This reverts commit e11bb95d56ed77b10d54d9dfe5a3cc4aa48b3a61.
---
 activerecord/test/cases/validations_test.rb | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 3f1b0e333f..9527404f03 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -9,8 +9,6 @@ require 'models/guid'
 require 'models/owner'
 require 'models/pet'
 require 'models/event'
-require 'models/parrot'
-require 'models/company'
 
 class ProtectedPerson < ActiveRecord::Base
   set_table_name 'people'
@@ -191,12 +189,4 @@ class ValidationsTest < ActiveRecord::TestCase
     end
     assert_equal ["always invalid", "invalid on update"], p.errors[:name]
   end
-
-  def test_validators
-    assert_equal 1, Parrot.validators.size
-    assert_equal 1, Company.validators.size
-    assert_equal 1, Parrot.validators_on(:name).size
-    assert_equal 1, Company.validators_on(:name).size
-  end
-
 end
-- 
cgit v1.2.3


From a087bc85fd24e7261ce6a6f63ffa2dbd49db567d Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sat, 12 Jun 2010 18:48:27 -0700
Subject: Revert "Revert "Validators should at model level and not at AR:Base
 level [Closes #4804]""

This reverts commit d67549306567b219089f2355fe432d31d0ebf8a1.
---
 activerecord/test/cases/validations_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 9527404f03..3f1b0e333f 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -9,6 +9,8 @@ require 'models/guid'
 require 'models/owner'
 require 'models/pet'
 require 'models/event'
+require 'models/parrot'
+require 'models/company'
 
 class ProtectedPerson < ActiveRecord::Base
   set_table_name 'people'
@@ -189,4 +191,12 @@ class ValidationsTest < ActiveRecord::TestCase
     end
     assert_equal ["always invalid", "invalid on update"], p.errors[:name]
   end
+
+  def test_validators
+    assert_equal 1, Parrot.validators.size
+    assert_equal 1, Company.validators.size
+    assert_equal 1, Parrot.validators_on(:name).size
+    assert_equal 1, Company.validators_on(:name).size
+  end
+
 end
-- 
cgit v1.2.3