Merge pull request #125 from owst/support_rails_71

Add support for Rails 7.1
rzane · Nov 21, 2023 · a91bf4e · a91bf4e
2 parents c5ec16c + c47fe53
commit a91bf4e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/baby_squeel.gemspec b/baby_squeel.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '>= 6.1', '< 7.1'
+  spec.add_dependency 'activerecord', '>= 6.1.5', '< 7.2'
   spec.add_dependency 'ransack', '~> 4.1'
 
   spec.add_development_dependency 'bundler', '~> 2'

diff --git a/lib/baby_squeel/nodes/attribute.rb b/lib/baby_squeel/nodes/attribute.rb
@@ -41,7 +41,7 @@ def _arel
       # Conveniently, this approach automatically adds a 1=0.
       # I have literally no idea why, but I'll take it.
       def sanitize_relation(rel)
-        if rel.kind_of? ::ActiveRecord::NullRelation
+        if ::ActiveRecord::VERSION::MAJOR < 7 && rel.kind_of?(::ActiveRecord::NullRelation)
           other = rel.spawn
           other.extending_values -= [::ActiveRecord::NullRelation]
           sanitize_relation rel.unscoped.merge(other)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -12,7 +12,12 @@
 require 'support/factories'
 require 'support/query_tracker'
 
-ActiveSupport::Deprecation.behavior = :raise
+if ActiveSupport.respond_to?(:deprecator)
+  ActiveSupport.deprecator.behavior = :raise
+  ActiveRecord.deprecator.behavior = :raise
+else
+  ActiveSupport::Deprecation.behavior = :raise
+end
 
 RSpec.configure do |config|
   config.include Factories