From 9465b84b543ae1ada29c0e39e34f919c724eab6d Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Tue, 19 Jan 2010 22:15:35 +0530
Subject: Rename CalculationMethods to Calculations and get rid of the old
 Calculations module

---
 activerecord/lib/active_record.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record.rb')

diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index d5b6d40514..58673ab7bd 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -53,14 +53,13 @@ module ActiveRecord
     autoload_under 'relation' do
       autoload :QueryMethods
       autoload :FinderMethods
-      autoload :CalculationMethods
+      autoload :Calculations
       autoload :PredicateBuilder
       autoload :SpawnMethods
     end
 
     autoload :Base
     autoload :Batches
-    autoload :Calculations
     autoload :Callbacks
     autoload :DynamicFinderMatch
     autoload :DynamicScopeMatch
-- 
cgit v1.2.3


From 6d30002a52133bd105adb29084f4cc72b1ee847f Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Fri, 22 Jan 2010 00:51:45 +0530
Subject: Revert "Refactoring attributes/types" [#3348 state:open]

This reverts commit f936a1f100e75082081e782e5cceb272885c2df7.

Conflicts:

	activerecord/lib/active_record.rb
	activerecord/lib/active_record/base.rb

Revert "Fixed: #without_typecast should only disable typecasting on the duplicated attributes" [#3387 state:open]

This reverts commit 2831996483c6a045f1f38d8030256eb58d9771c3.

Reason :

  It's not generating attribute methods properly, making object.column 5x slower.
---
 activerecord/lib/active_record.rb | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'activerecord/lib/active_record.rb')

diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 58673ab7bd..cc0accf90e 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -45,7 +45,6 @@ module ActiveRecord
     autoload :AssociationPreload
     autoload :Associations
     autoload :AttributeMethods
-    autoload :Attributes
     autoload :AutosaveAssociation
 
     autoload :Relation
@@ -77,7 +76,6 @@ module ActiveRecord
     autoload :StateMachine
     autoload :Timestamp
     autoload :Transactions
-    autoload :Types
     autoload :Validations
   end
 
@@ -95,28 +93,6 @@ module ActiveRecord
     end
   end
 
-  module Attributes
-    extend ActiveSupport::Autoload
-
-    eager_autoload do
-      autoload :Aliasing
-      autoload :Store
-      autoload :Typecasting
-    end
-  end
-
-  module Type
-    extend ActiveSupport::Autoload
-
-    eager_autoload do
-      autoload :Number, 'active_record/types/number'
-      autoload :Object, 'active_record/types/object'
-      autoload :Serialize, 'active_record/types/serialize'
-      autoload :TimeWithZone, 'active_record/types/time_with_zone'
-      autoload :Unknown, 'active_record/types/unknown'
-    end
-  end
-
   module Locking
     extend ActiveSupport::Autoload
 
-- 
cgit v1.2.3