Simplify active record extension loading (#1445)

activerecord-hackery · Oct 24, 2023 · fb6027d · fb6027d
1 parent 0f02ee6
commit fb6027d
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 10 deletions.
diff --git a/...tiverecord_6.1_ruby_2/join_association.rb → ...yamorous/activerecord/join_association.rb b/...tiverecord_6.1_ruby_2/join_association.rb → ...yamorous/activerecord/join_association.rb
diff --git a/...ctiverecord_6.1_ruby_2/join_dependency.rb → ...lyamorous/activerecord/join_dependency.rb b/...ctiverecord_6.1_ruby_2/join_dependency.rb → ...lyamorous/activerecord/join_dependency.rb
diff --git a/...ous/activerecord_6.1_ruby_2/reflection.rb → lib/polyamorous/activerecord/reflection.rb b/...ous/activerecord_6.1_ruby_2/reflection.rb → lib/polyamorous/activerecord/reflection.rb
diff --git a/lib/polyamorous/activerecord_7.0_ruby_2/join_association.rb b/lib/polyamorous/activerecord_7.0_ruby_2/join_association.rb
diff --git a/lib/polyamorous/activerecord_7.0_ruby_2/join_dependency.rb b/lib/polyamorous/activerecord_7.0_ruby_2/join_dependency.rb
diff --git a/lib/polyamorous/activerecord_7.0_ruby_2/reflection.rb b/lib/polyamorous/activerecord_7.0_ruby_2/reflection.rb
diff --git a/lib/polyamorous/activerecord_7.1_ruby_2/join_association.rb b/lib/polyamorous/activerecord_7.1_ruby_2/join_association.rb
diff --git a/lib/polyamorous/activerecord_7.1_ruby_2/join_dependency.rb b/lib/polyamorous/activerecord_7.1_ruby_2/join_dependency.rb
diff --git a/lib/polyamorous/activerecord_7.1_ruby_2/reflection.rb b/lib/polyamorous/activerecord_7.1_ruby_2/reflection.rb
diff --git a/lib/polyamorous/polyamorous.rb b/lib/polyamorous/polyamorous.rb
@@ -11,10 +11,9 @@ module Polyamorous
   require 'polyamorous/join'
   require 'polyamorous/swapping_reflection_class'
 
-  ar_version = ::ActiveRecord::VERSION::STRING[0, 3]
-  %w(join_association join_dependency reflection).each do |file|
-    require "polyamorous/activerecord_#{ar_version}_ruby_2/#{file}"
-  end
+  require 'polyamorous/activerecord/join_association'
+  require 'polyamorous/activerecord/join_dependency'
+  require 'polyamorous/activerecord/reflection'
 
   ActiveRecord::Reflection::AbstractReflection.send(:prepend, Polyamorous::ReflectionExtensions)