lib/octopus.rb in ar-octopus-0.9.2 vs lib/octopus.rb in ar-octopus-0.10.0

@@ -92,38 +92,38 @@
 
   def self.rails4?
     ActiveRecord::VERSION::MAJOR == 4
   end
 
-  def self.rails40?
-    rails4? && ActiveRecord::VERSION::MINOR == 0
-  end
-
-  def self.rails41_only?
-    rails4? && ActiveRecord::VERSION::MINOR == 1
-  end
-
-  def self.rails41?
-    rails4? && ActiveRecord::VERSION::MINOR >= 1
-  end
-
   def self.rails42?
     rails4? && ActiveRecord::VERSION::MINOR == 2
   end
 
   def self.rails50?
     ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 0
   end
+  
+  def self.atleast_rails50?
+    ActiveRecord::VERSION::MAJOR >= 5
+  end
 
   def self.rails51?
     ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 1
   end
 
+  def self.rails52?
+    ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 2
+  end
+
   def self.atleast_rails51?
     ActiveRecord::VERSION::MAJOR > 5 || (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1)
   end
 
+  def self.atleast_rails52?
+    ActiveRecord::VERSION::MAJOR > 5 || (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 1)
+  end
+
   attr_writer :logger
 
   def self.logger
     if defined?(Rails.logger)
       @logger ||= Rails.logger
@@ -185,16 +185,16 @@
 require 'octopus/model'
 require 'octopus/result_patch'
 require 'octopus/migration'
 require 'octopus/association'
 require 'octopus/collection_association'
-require 'octopus/has_and_belongs_to_many_association' unless Octopus.rails41? || Octopus.rails50? || Octopus.rails51?
 require 'octopus/association_shard_tracking'
 require 'octopus/persistence'
 require 'octopus/log_subscriber'
 require 'octopus/abstract_adapter'
 require 'octopus/singular_association'
 require 'octopus/finder_methods'
+require 'octopus/query_cache_for_shards' unless Octopus.rails4?
 
 require 'octopus/railtie' if defined?(::Rails::Railtie)
 
 require 'octopus/proxy_config'
 require 'octopus/proxy'