Merge branch 'fix-pg-trgm-operator' into 'main'

Fix search, use word_similarity operator

Closes #213

See merge request soapbox-pub/ditto!498
This commit is contained in:
Alex Gleason 2024-09-19 13:58:45 +00:00
commit d1f452d87b
2 changed files with 2 additions and 2 deletions

View file

@ -13,7 +13,7 @@ Deno.test('fuzzy search works', async () => {
assertEquals(await getPubkeysBySearch(db.kysely, { q: 'pat rick', limit: 1, followedPubkeys: new Set() }), new Set()); assertEquals(await getPubkeysBySearch(db.kysely, { q: 'pat rick', limit: 1, followedPubkeys: new Set() }), new Set());
assertEquals( assertEquals(
await getPubkeysBySearch(db.kysely, { q: 'patrick dos reis', limit: 1, followedPubkeys: new Set() }), await getPubkeysBySearch(db.kysely, { q: 'patrick dosreis', limit: 1, followedPubkeys: new Set() }),
new Set([ new Set([
'47259076c85f9240e852420d7213c95e95102f1de929fb60f33a2c32570c98c4', '47259076c85f9240e852420d7213c95e95102f1de929fb60f33a2c32570c98c4',
]), ]),

View file

@ -16,7 +16,7 @@ export async function getPubkeysBySearch(
'search', 'search',
eb.fn('word_similarity', [sql`${q}`, 'search']).as('sml'), eb.fn('word_similarity', [sql`${q}`, 'search']).as('sml'),
]) ])
.where(() => sql`${q} % search`) .where(() => sql`${q} <% search`)
.orderBy(['sml desc', 'search']) .orderBy(['sml desc', 'search'])
.limit(limit); .limit(limit);