Use Postgres FTS for search

electric-sql · Oct 16, 2024 · 8d1d1b6 · 8d1d1b6
1 parent 08b6650
commit 8d1d1b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/demos/linearlite/db/migrations-client/01-create_tables.sql b/demos/linearlite/db/migrations-client/01-create_tables.sql
@@ -15,6 +15,10 @@ CREATE TABLE IF NOT EXISTS "issue" (
     "sent_to_server" BOOLEAN NOT NULL DEFAULT FALSE, -- Flag to track if the row has been sent to the server
     "synced" BOOLEAN GENERATED ALWAYS AS (ARRAY_LENGTH(modified_columns, 1) IS NULL AND NOT deleted AND NOT new) STORED,
     "backup" JSONB, -- JSONB column to store the backup of the row data for modified columns
+    "search_vector" tsvector GENERATED ALWAYS AS (
+        setweight(to_tsvector('simple', coalesce(title, '')), 'A') ||
+        setweight(to_tsvector('simple', coalesce(description, '')), 'B')
+    ) STORED,
     CONSTRAINT "issue_pkey" PRIMARY KEY ("id")
 );
 
@@ -42,6 +46,7 @@ CREATE INDEX IF NOT EXISTS "issue_created_idx" ON "issue" ("created");
 CREATE INDEX IF NOT EXISTS "issue_kanbanorder_idx" ON "issue" ("kanbanorder");
 CREATE INDEX IF NOT EXISTS "issue_deleted_idx" ON "issue" ("deleted");
 CREATE INDEX IF NOT EXISTS "issue_synced_idx" ON "issue" ("synced");
+CREATE INDEX IF NOT EXISTS "issue_search_idx" ON "issue" USING GIN ("search_vector");
 
 CREATE INDEX IF NOT EXISTS "comment_id_idx" ON "comment" ("id");
 CREATE INDEX IF NOT EXISTS "comment_issue_id_idx" ON "comment" ("issue_id");
@@ -291,4 +296,4 @@ $$ LANGUAGE plpgsql;
 
 -- Example usage:
 -- SELECT revert_local_changes('issue', '123e4567-e89b-12d3-a456-426614174000');
--- SELECT revert_local_changes('comment', '123e4567-e89b-12d3-a456-426614174001');
+-- SELECT revert_local_changes('comment', '123e4567-e89b-12d3-a456-426614174001');
diff --git a/demos/linearlite/src/pglite-worker.ts b/demos/linearlite/src/pglite-worker.ts
@@ -29,14 +29,14 @@ worker({
       primaryKey: ['id'],
       shapeKey: 'issues',
     })
-    // await pg.sync.syncShapeToTable({
-    //   shape: {
-    //     url: `${ELECTRIC_URL}/v1/shape/comment`,
-    //   },
-    //   table: 'comment',
-    //   primaryKey: ['id'],
-    //   shapeKey: 'comments',
-    // })
+    await pg.sync.syncShapeToTable({
+      shape: {
+        url: `${ELECTRIC_URL}/v1/shape/comment`,
+      },
+      table: 'comment',
+      primaryKey: ['id'],
+      shapeKey: 'comments',
+    })
     startWritePath(pg)
     return pg
   },

diff --git a/demos/linearlite/src/utils/filterState.ts b/demos/linearlite/src/utils/filterState.ts
@@ -94,8 +94,8 @@ export function filterStateToSql(filterState: FilterState) {
     sqlParams.push(...filterState.priority)
   }
   if (filterState.query) {
-    sqlWhere.push(`title ILIKE $${i++}`)
-    sqlParams.push(`%${filterState.query}%`)
+    sqlWhere.push(`search_vector @@ plainto_tsquery('simple', $${i++})`)
+    sqlParams.push(filterState.query)
   }
   const sql = `
     SELECT id, title, priority, status, modified, created, kanbanorder, username, synced