Skip to content

Commit 1424740

Browse files
authored
Merge pull request #12 from ruby/fix-pg
Fix "ORDER BY"
2 parents 78f6d8d + f302e9c commit 1424740

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ Metrics/BlockLength:
99

1010
Metrics/MethodLength:
1111
Max: 40
12+
13+
Metrics/AbcSize:
14+
Max: 50

app/controllers/messages_controller.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ def index
1515
# %> and <-> are defined by pg_trgm.
1616
# https://www.postgresql.org/docs/17/pgtrgm.html
1717
message_where = if Rails.env.production?
18-
Message.where('body %> ? AND list_id IN (?) ORDER BY body <-> ?', query, list_ids, query)
18+
Message.where('body %> ? AND list_id IN (?)', query, list_ids)
19+
.order(Arel.sql('body <-> ?', query))
1920
else
2021
Message.where('body LIKE ? AND list_id IN (?)', "%#{query}%", list_ids)
2122
end
@@ -36,7 +37,7 @@ def show
3637
def get_list_ids(params)
3738
list_ids = []
3839
['ruby-talk', 'ruby-core', 'ruby-list', 'ruby-dev'].each do |name|
39-
if params[name.tr('-', '_').to_sym] == '1'
40+
if params[name.tr('-', '_').to_sym] != '0'
4041
list_ids << List.find_by_name(name).id
4142
end
4243
end

0 commit comments

Comments
 (0)