Correct name of ActiveRecord

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 9042823c28ccd22995be969739a7d9cd93f19ad1..d96742ee50e9494e5e2759b145e46c6340ff5ad6 100644 (file)
--- 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
   module ActiveRecord
     module ConnectionAdapters
       class AbstractAdapter

diff --git a/config/initializers/postgresql_adapter.rb b/config/initializers/postgresql_adapter.rb
index b9adf38bbe60b2abca258702d63d3b7b1f12885c..d8f84959cd83f18efc7d256e78fa04f1f91f31f2 100644 (file)
--- 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
   module ActiveRecord
     module ConnectionAdapters
       class PostgreSQLAdapter

diff --git a/config/initializers/query_cache.rb b/config/initializers/query_cache.rb
index 92372faf3c18762125f9dd8abf2e3e760a566477..61a618bca7d7b6656533b7a60700c3f4e9e1cec6 100644 (file)
--- 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
   module ActiveRecord
     module ConnectionAdapters
       module QueryCache

diff --git a/vendor/plugins/deadlock_retry/init.rb b/vendor/plugins/deadlock_retry/init.rb
index 9c00ea234cec8d77dc331e1d0c39beb5980a947f..2d7c5f36e0246244b40a16b37a9fe179415dd5f9 100644 (file)
--- a/vendor/plugins/deadlock_retry/init.rb
+++ b/vendor/plugins/deadlock_retry/init.rb
@@ -1,5 +1,5 @@
 require 'deadlock_retry'
 
 require 'deadlock_retry'
 

-if defined?(ActionRecord::Base)
+if defined?(ActiveRecord::Base)

   ActiveRecord::Base.send :include, DeadlockRetry
 end
   ActiveRecord::Base.send :include, DeadlockRetry
 end

diff --git a/vendor/plugins/file_column/init.rb b/vendor/plugins/file_column/init.rb
index 6ecbba5f6726c0c13873a057f08c762aa6e7c10f..0610d486c80968ff115d298d5c74c13978bfef02 100644 (file)
--- 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'
 
 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
   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 bf4d5e80a53993a081a917ac71c40dbd0992594a..bf0e943700f35fabe542152db0d37f969269b539 100644 (file)
--- 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
   require 'validates_email_format_of'
 end