Merge remote-tracking branch 'upstream/pull/5622'

This commit is contained in:
Tom Hughes 2025-02-12 17:59:25 +00:00
commit 22f590c9ef
4 changed files with 22 additions and 4 deletions

View file

@ -266,7 +266,9 @@ module Api
end end
# Add any text filter # Add any text filter
@notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q]) if params[:q] if params[:q]
@notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?) OR to_tsvector('english', notes.description) @@ plainto_tsquery('english', ?)", params[:q], params[:q])
end
# Add any date filter # Add any date filter
if params[:from] if params[:from]

View file

@ -16,9 +16,10 @@
# #
# Indexes # Indexes
# #
# notes_created_at_idx (created_at) # index_notes_on_description (to_tsvector('english'::regconfig, description)) USING gin
# notes_tile_status_idx (tile,status) # notes_created_at_idx (created_at)
# notes_updated_at_idx (updated_at) # notes_tile_status_idx (tile,status)
# notes_updated_at_idx (updated_at)
# #
# Foreign Keys # Foreign Keys
# #

View file

@ -0,0 +1,7 @@
class AddTextIndexToNotes < ActiveRecord::Migration[7.2]
disable_ddl_transaction!
def change
add_index :notes, "to_tsvector('english', description)", :using => "GIN", :name => "index_notes_on_description", :algorithm => :concurrently
end
end

View file

@ -2540,6 +2540,13 @@ CREATE INDEX index_note_comments_on_created_at ON public.note_comments USING btr
CREATE INDEX index_note_subscriptions_on_note_id ON public.note_subscriptions USING btree (note_id); CREATE INDEX index_note_subscriptions_on_note_id ON public.note_subscriptions USING btree (note_id);
--
-- Name: index_notes_on_description; Type: INDEX; Schema: public; Owner: -
--
CREATE INDEX index_notes_on_description ON public.notes USING gin (to_tsvector('english'::regconfig, description));
-- --
-- Name: index_oauth_access_grants_on_application_id; Type: INDEX; Schema: public; Owner: - -- Name: index_oauth_access_grants_on_application_id; Type: INDEX; Schema: public; Owner: -
-- --
@ -3422,6 +3429,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('23'), ('23'),
('22'), ('22'),
('21'), ('21'),
('20250206202905'),
('20250121191749'), ('20250121191749'),
('20250105154621'), ('20250105154621'),
('20250104140952'), ('20250104140952'),