lib/polyamorous.rb in polyamorous-0.5.0 vs lib/polyamorous.rb in polyamorous-0.6.0
- old
+ new
@@ -1,6 +1,7 @@
require "polyamorous/version"
+require 'active_record'
module Polyamorous
if defined?(::ActiveRecord::Associations::JoinDependency)
JoinDependency = ::ActiveRecord::Associations::JoinDependency
JoinAssociation = ::ActiveRecord::Associations::JoinDependency::JoinAssociation
@@ -8,12 +9,11 @@
JoinDependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency
JoinAssociation = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation
end
end
-require 'active_record'
require 'polyamorous/join'
require 'polyamorous/join_association'
require 'polyamorous/join_dependency'
Polyamorous::JoinDependency.send(:include, Polyamorous::JoinDependencyExtensions)
-Polyamorous::JoinAssociation.send(:include, Polyamorous::JoinAssociationExtensions)
\ No newline at end of file
+Polyamorous::JoinAssociation.send(:include, Polyamorous::JoinAssociationExtensions)