add check before N+1 notification publish to prevent poly association…

… with nil type to be include
clio · Jun 7, 2024 · 091f920 · 091f920
1 parent 41abfe4
commit 091f920
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 296 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.1
       - name: Install dependencies
         run: bundle install
       - name: Run tests

diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Ruby 2.7
+    - name: Set up Ruby 3.1
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
 
     - name: Publish to RubyGems
       env:

diff --git a/Gemfile.5.2 b/Gemfile.5.2
diff --git a/Gemfile.5.2.lock b/Gemfile.5.2.lock
diff --git a/Gemfile.6.0 b/Gemfile.6.0
diff --git a/Gemfile.6.0.lock b/Gemfile.6.0.lock
diff --git a/lib/jit_preloader.rb b/lib/jit_preloader.rb
@@ -11,13 +11,8 @@
 if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("7.0.0")
   require 'jit_preloader/active_record/associations/preloader/ar7_association'
   require 'jit_preloader/active_record/associations/preloader/ar7_branch'
-elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.0.0")
+elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.1.0")
   require 'jit_preloader/active_record/associations/preloader/ar6_association'
-elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5.2.2")
-  require 'jit_preloader/active_record/associations/preloader/ar5_association'
-else
-  require 'jit_preloader/active_record/associations/preloader/collection_association'
-  require 'jit_preloader/active_record/associations/preloader/singular_association'
 end
 require 'jit_preloader/preloader'
 

diff --git a/lib/jit_preloader/active_record/associations/preloader/ar5_association.rb b/lib/jit_preloader/active_record/associations/preloader/ar5_association.rb
diff --git a/lib/jit_preloader/active_record/associations/preloader/collection_association.rb b/lib/jit_preloader/active_record/associations/preloader/collection_association.rb
diff --git a/lib/jit_preloader/active_record/associations/preloader/singular_association.rb b/lib/jit_preloader/active_record/associations/preloader/singular_association.rb
diff --git a/lib/jit_preloader/active_record/associations/singular_association.rb b/lib/jit_preloader/active_record/associations/singular_association.rb
@@ -25,7 +25,7 @@ def load_target
         end
       end
     end
-    
+
     private def not_a_polymorphic_association_with_missing_type
       !(self.is_a?(ActiveRecord::Associations::BelongsToPolymorphicAssociation) && self.klass.nil?)
     end

diff --git a/lib/jit_preloader/version.rb b/lib/jit_preloader/version.rb
@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end