Changing the models.

Author: wangjohn

activerecord/test/models/admin/account.rb

@@ -1,3 +1,3 @@
-class Admin::Account < ActiveRecord::Base
+class Admin::Account < ApplicationModel
   has_many :users
 end

activerecord/test/models/admin/randomly_named_c1.rb

@@ -1,3 +1,3 @@
-class Admin::ClassNameThatDoesNotFollowCONVENTIONS < ActiveRecord::Base
+class Admin::ClassNameThatDoesNotFollowCONVENTIONS < ApplicationModel
   self.table_name = :randomly_named_table
 end

activerecord/test/models/admin/user.rb

@@ -1,4 +1,4 @@
-class Admin::User < ActiveRecord::Base
+class Admin::User < ApplicationModel
   class Coder
     def initialize(default = {})
       @default = default

activerecord/test/models/aircraft.rb

@@ -1,4 +1,4 @@
-class Aircraft < ActiveRecord::Base
+class Aircraft < ApplicationModel
   self.pluralize_table_names = false
   has_many :engines, :foreign_key => "car_id"
 end

activerecord/test/models/arunit2_model.rb

@@ -1,3 +1,3 @@
-class ARUnit2Model < ActiveRecord::Base
+class ARUnit2Model < ApplicationModel
   self.abstract_class = true
 end

activerecord/test/models/author.rb

@@ -1,4 +1,4 @@
-class Author < ActiveRecord::Base
+class Author < ApplicationModel
   has_many :posts
   has_one :post
   has_many :very_special_comments, :through => :posts
@@ -175,7 +175,7 @@ def raise_exception(object)
     end
 end
 
-class AuthorAddress < ActiveRecord::Base
+class AuthorAddress < ApplicationModel
   has_one :author
 
   def self.destroyed_author_address_ids
@@ -187,7 +187,7 @@ def self.destroyed_author_address_ids
   end
 end
 
-class AuthorFavorite < ActiveRecord::Base
+class AuthorFavorite < ApplicationModel
   belongs_to :author
   belongs_to :favorite_author, :class_name => "Author"
 end

activerecord/test/models/auto_id.rb

@@ -1,4 +1,4 @@
-class AutoId < ActiveRecord::Base
+class AutoId < ApplicationModel
   self.table_name = "auto_id_tests"
   self.primary_key = "auto_id"
 end

activerecord/test/models/binary.rb

@@ -1,2 +1,2 @@
-class Binary < ActiveRecord::Base
+class Binary < ApplicationModel
 end

activerecord/test/models/bird.rb

@@ -1,4 +1,4 @@
-class Bird < ActiveRecord::Base
+class Bird < ApplicationModel
   belongs_to :pirate
   validates_presence_of :name
 

activerecord/test/models/book.rb

@@ -1,4 +1,4 @@
-class Book < ActiveRecord::Base
+class Book < ApplicationModel
   has_many :authors
 
   has_many :citations, :foreign_key => 'book1_id'

activerecord/test/models/boolean.rb

@@ -1,2 +1,2 @@
-class Boolean < ActiveRecord::Base
+class Boolean < ApplicationModel
 end

activerecord/test/models/bulb.rb

@@ -1,4 +1,4 @@
-class Bulb < ActiveRecord::Base
+class Bulb < ApplicationModel
   default_scope { where(:name => 'defaulty') }
   belongs_to :car, :touch => true
 

activerecord/test/models/car.rb

@@ -1,4 +1,4 @@
-class Car < ActiveRecord::Base
+class Car < ApplicationModel
   has_many :bulbs
   has_many :funky_bulbs, class_name: 'FunkyBulb', dependent: :destroy
   has_many :foo_bulbs, -> { where(:name => 'foo') }, :class_name => "Bulb"

activerecord/test/models/categorization.rb

@@ -1,4 +1,4 @@
-class Categorization < ActiveRecord::Base
+class Categorization < ApplicationModel
   belongs_to :post
   belongs_to :category
   belongs_to :named_category, :class_name => 'Category', :foreign_key => :named_category_name, :primary_key => :name
@@ -10,7 +10,7 @@ class Categorization < ActiveRecord::Base
   has_many   :authors_using_custom_pk, :class_name => 'Author', :foreign_key => :id,        :primary_key => :category_id
 end
 
-class SpecialCategorization < ActiveRecord::Base
+class SpecialCategorization < ApplicationModel
   self.table_name = 'categorizations'
   default_scope { where(:special => true) }
 

activerecord/test/models/category.rb

@@ -1,4 +1,4 @@
-class Category < ActiveRecord::Base
+class Category < ApplicationModel
   has_and_belongs_to_many :posts
   has_and_belongs_to_many :special_posts, :class_name => "Post"
   has_and_belongs_to_many :other_posts, :class_name => "Post"

activerecord/test/models/citation.rb

@@ -1,3 +1,3 @@
-class Citation < ActiveRecord::Base
+class Citation < ApplicationModel
   belongs_to :reference_of, :class_name => "Book", :foreign_key => :book2_id
 end

activerecord/test/models/club.rb

@@ -1,4 +1,4 @@
-class Club < ActiveRecord::Base
+class Club < ApplicationModel
   has_one :membership
   has_many :memberships, :inverse_of => false
   has_many :members, :through => :memberships

activerecord/test/models/column_name.rb

@@ -1,3 +1,3 @@
-class ColumnName < ActiveRecord::Base
+class ColumnName < ApplicationModel
   self.table_name = "colnametests"
 end

activerecord/test/models/comment.rb

@@ -1,4 +1,4 @@
-class Comment < ActiveRecord::Base
+class Comment < ApplicationModel
   scope :limit_by, lambda {|l| limit(l) }
   scope :containing_the_letter_e, -> { where("comments.body LIKE '%e%'") }
   scope :not_again, -> { where("comments.body NOT LIKE '%again%'") }

activerecord/test/models/company.rb

@@ -1,4 +1,4 @@
-class AbstractCompany < ActiveRecord::Base
+class AbstractCompany < ApplicationModel
   self.abstract_class = true
 end
 
@@ -174,7 +174,7 @@ class SpecialClient < Client
 class VerySpecialClient < SpecialClient
 end
 
-class Account < ActiveRecord::Base
+class Account < ApplicationModel
   belongs_to :firm, :class_name => 'Company'
   belongs_to :unautosaved_firm, :foreign_key => "firm_id", :class_name => "Firm", :autosave => false
 

activerecord/test/models/company_in_module.rb

@@ -2,7 +2,7 @@
 
 module MyApplication
   module Business
-    class Company < ActiveRecord::Base
+    class Company < ApplicationModel
     end
 
     class Firm < Company
@@ -17,15 +17,15 @@ class Client < Company
       belongs_to :firm, :foreign_key => "client_of"
       belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of"
 
-      class Contact < ActiveRecord::Base; end
+      class Contact < ApplicationModel; end
     end
 
-    class Developer < ActiveRecord::Base
+    class Developer < ApplicationModel
       has_and_belongs_to_many :projects
       validates_length_of :name, :within => (3..20)
     end
 
-    class Project < ActiveRecord::Base
+    class Project < ApplicationModel
       has_and_belongs_to_many :developers
     end
 
@@ -34,32 +34,32 @@ def self.table_name_prefix
         'prefixed_'
       end
 
-      class Company < ActiveRecord::Base
+      class Company < ApplicationModel
       end
 
       class Firm < Company
         self.table_name = 'companies'
       end
 
       module Nested
-        class Company < ActiveRecord::Base
+        class Company < ApplicationModel
         end
       end
     end
   end
 
   module Billing
-    class Firm < ActiveRecord::Base
+    class Firm < ApplicationModel
       self.table_name = 'companies'
     end
 
     module Nested
-      class Firm < ActiveRecord::Base
+      class Firm < ApplicationModel
         self.table_name = 'companies'
       end
     end
 
-    class Account < ActiveRecord::Base
+    class Account < ApplicationModel
       with_options(:foreign_key => :firm_id) do |i|
         i.belongs_to :firm, :class_name => 'MyApplication::Business::Firm'
         i.belongs_to :qualified_billing_firm, :class_name => 'MyApplication::Billing::Firm'

activerecord/test/models/computer.rb

@@ -1,3 +1,3 @@
-class Computer < ActiveRecord::Base
+class Computer < ApplicationModel
   belongs_to :developer, :foreign_key=>'developer'
 end

activerecord/test/models/contact.rb

@@ -28,11 +28,11 @@ def column(name, sql_type = nil, options = {})
   end
 end
 
-class Contact < ActiveRecord::Base
+class Contact < ApplicationModel
   extend ContactFakeColumns
 end
 
-class ContactSti < ActiveRecord::Base
+class ContactSti < ApplicationModel
   extend ContactFakeColumns
   column :type, :string
 

activerecord/test/models/contract.rb

@@ -1,4 +1,4 @@
-class Contract < ActiveRecord::Base
+class Contract < ApplicationModel
   belongs_to :company
   belongs_to :developer
 

activerecord/test/models/country.rb

@@ -1,4 +1,4 @@
-class Country < ActiveRecord::Base
+class Country < ApplicationModel
 
   self.primary_key = :country_id
 

activerecord/test/models/customer.rb

@@ -1,4 +1,4 @@
-class Customer < ActiveRecord::Base
+class Customer < ApplicationModel
   cattr_accessor :gps_conversion_was_run
 
   composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true

activerecord/test/models/dashboard.rb

@@ -1,3 +1,3 @@
-class Dashboard < ActiveRecord::Base
+class Dashboard < ApplicationModel
   self.primary_key = :dashboard_id
 end

activerecord/test/models/default.rb

@@ -1,2 +1,2 @@
-class Default < ActiveRecord::Base
+class Default < ApplicationModel
 end