Skip to content

Fix Rails 6.1 incompatibility by joining with through_table only if it exists #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpjoe merged 1 commit into from
Apr 4, 2023
Merged

Fix Rails 6.1 incompatibility by joining with through_table only if it exists #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/activerecord-postgres-earthdistance/acts_as_geolocated.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module ActiveRecordPostgresEarthdistance
MILES_TO_METERS_FACTOR = 1609.344
module ActsAsGeolocated
extend ActiveSupport::Concern


module ClassMethods
def acts_as_geolocated(options = {})
Expand Down Expand Up @@ -95,7 +94,7 @@ def self.quote_value(value)
module QueryMethods
def selecting_distance_from(lat, lng, name = "distance", include_default_columns = true)
clone.tap do |relation|
relation.joins!(through_table)
relation.joins!(through_table) if through_table
values = []
if relation.select_values.empty? && include_default_columns
values << relation.arel_table[Arel.star]
Expand Down