kotovalexarian-likes-github
/
activerecord-hackery--ransack
mirror of https://github.com/activerecord-hackery/ransack.git
1
0
Fork 0
Code Releases Activity

Merge pull request #1188 from yahonda/remove_rails610alpha 

Replace constant `RAILS_6_1_ALPHA` with `RAILS_6_1`
This commit is contained in:
David Rodríguez 2020-12-27 11:01:34 +01:00 committed by GitHub
parent bdaac5c97a ecbaa921fd
commit 57df81335e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ransack/adapters/active_record/context.rb
View File

@ -106,7 +106,7 @@ module Ransack
def join_sources
base, joins = begin
alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, @object.table.name, [])
constraints = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1_ALPHA)
constraints = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1)
@join_dependency.join_constraints(@object.joins_values, alias_tracker, @object.references_values)
elsif ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_0)
@join_dependency.join_constraints(@object.joins_values, alias_tracker)
@ -334,7 +334,7 @@ module Ransack
@join_dependency.instance_variable_get(:@join_root).children.push found_association
# Builds the arel nodes properly for this association
if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1_ALPHA)
if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1)
@tables_pot[found_association] = @join_dependency.construct_tables_for_association!(jd.instance_variable_get(:@join_root), found_association)
else
@join_dependency.send(:construct_tables!, jd.instance_variable_get(:@join_root))
@ -348,7 +348,7 @@ module Ransack
def extract_joins(association)
parent = @join_dependency.instance_variable_get(:@join_root)
reflection = association.reflection
join_constraints = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1_ALPHA)
join_constraints = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1)
association.join_constraints_with_tables(
parent.table,
parent.base_klass,

2
lib/ransack/constants.rb
View File

@ -46,7 +46,7 @@ module Ransack
CONT = 'cont'.freeze
RAILS_6_0 = '6.0.0'.freeze
RAILS_6_1_ALPHA = '6.1.0.alpha'.freeze
RAILS_6_1 = '6.1.0'.freeze
RANSACK_SLASH_SEARCHES = 'ransack/searches'.freeze
RANSACK_SLASH_SEARCHES_SLASH_SEARCH = 'ransack/searches/search'.freeze