From c38de8027ff70a650a2b01d12bd5eaf0e5307851 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Jun 2010 17:12:55 +0100
Subject: [PATCH] Correct name of ActiveRecord

---
 config/initializers/abstract_adapter.rb                | 2 +-
 config/initializers/postgresql_adapter.rb              | 2 +-
 config/initializers/query_cache.rb                     | 2 +-
 vendor/plugins/deadlock_retry/init.rb                  | 2 +-
 vendor/plugins/file_column/init.rb                     | 2 +-
 vendor/plugins/validates_email_format_of/rails/init.rb | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 9042823c2..d96742ee5 100644
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,4 +1,4 @@
-if defined?(ActionRecord::ConnectionAdaptors::AbstractAdaptor)
+if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdaptor)
   module ActiveRecord
     module ConnectionAdapters
       class AbstractAdapter
diff --git a/config/initializers/postgresql_adapter.rb b/config/initializers/postgresql_adapter.rb
index b9adf38bb..d8f84959c 100644
--- a/config/initializers/postgresql_adapter.rb
+++ b/config/initializers/postgresql_adapter.rb
@@ -1,4 +1,4 @@
-if defined?(ActionRecord::ConnectionAdaptors::PostgreSQLAdaptor)
+if defined?(ActiveRecord::ConnectionAdaptors::PostgreSQLAdaptor)
   module ActiveRecord
     module ConnectionAdapters
       class PostgreSQLAdapter
diff --git a/config/initializers/query_cache.rb b/config/initializers/query_cache.rb
index 92372faf3..61a618bca 100644
--- a/config/initializers/query_cache.rb
+++ b/config/initializers/query_cache.rb
@@ -1,4 +1,4 @@
-if defined?(ActionRecord::ConnectionAdaptors::QueryCache)
+if defined?(ActiveRecord::ConnectionAdaptors::QueryCache)
   module ActiveRecord
     module ConnectionAdapters
       module QueryCache
diff --git a/vendor/plugins/deadlock_retry/init.rb b/vendor/plugins/deadlock_retry/init.rb
index 9c00ea234..2d7c5f36e 100644
--- a/vendor/plugins/deadlock_retry/init.rb
+++ b/vendor/plugins/deadlock_retry/init.rb
@@ -1,5 +1,5 @@
 require 'deadlock_retry'
 
-if defined?(ActionRecord::Base)
+if defined?(ActiveRecord::Base)
   ActiveRecord::Base.send :include, DeadlockRetry
 end
diff --git a/vendor/plugins/file_column/init.rb b/vendor/plugins/file_column/init.rb
index 6ecbba5f6..0610d486c 100644
--- a/vendor/plugins/file_column/init.rb
+++ b/vendor/plugins/file_column/init.rb
@@ -8,7 +8,7 @@ require 'file_column_helper'
 require 'validations'
 require 'test_case'
 
-if defined?(ActionRecord::Base)
+if defined?(ActiveRecord::Base)
   ActiveRecord::Base.send(:include, FileColumn)
   ActiveRecord::Base.send(:include, FileColumn::Validations)
 end
diff --git a/vendor/plugins/validates_email_format_of/rails/init.rb b/vendor/plugins/validates_email_format_of/rails/init.rb
index bf4d5e80a..bf0e94370 100644
--- a/vendor/plugins/validates_email_format_of/rails/init.rb
+++ b/vendor/plugins/validates_email_format_of/rails/init.rb
@@ -1,3 +1,3 @@
-if defined?(ActionRecord::Base)
+if defined?(ActiveRecord::Base)
   require 'validates_email_format_of'
 end
-- 
2.39.5