fts5

Author: zenlor

flake.nix

@@ -30,6 +30,9 @@
           src = ./.;
           nativeBuildInputs = [ pkgs.go ];
           vendorHash = "sha256-tO2z+KZ6Yc/YmRt2UyW2kcwN7A83gYw2YDSTURfHm+E=";
+          tags= [
+            "fts5"
+          ];
           meta = { platforms = lib.platforms.all; };
         };
 

internal/core/handlers_test.go

@@ -171,6 +171,11 @@ func TestBotHandlers(t *testing.T) {
 	}
 }
 
+func TestMediaSearchHandler(t *testing.T) {
+	is := is.New(t)
+	is.NoErr(nil)
+}
+
 func TestMediaSearchKeyboard(t *testing.T) {
 	is := is.New(t)
 

internal/db/media.go

@@ -10,14 +10,20 @@ var (
 )
 
 type Media struct {
-	RowID       int64  // NOTE: needed only by callback queries
+	RowID       int64  // NOTE: needed by callback queries
 	GID         int64  `db:"gid"`
 	Data        string `db:"data"`
 	Kind        string `db:"kind"`
 	Description string `db:"description"`
 	Score       int    `db:"score"`
 }
 
+type MediaFts struct {
+	RowID       int64
+	Description string `db:"description"`
+	GID         int64  `db:"gid"`
+}
+
 func (m *Media) Clone() *Media {
 	return &Media{
 		GID:         m.GID,
@@ -175,19 +181,20 @@ func SearchMedia(ctx context.Context, gid int64, term string, offset int) ([]Med
 	results := []Media{}
 
 	q, err := prepareStmt(
-		`SELECT rowid,gid,kind,data,description,score FROM ` + mediaTable + `
-		 WHERE description LIKE ?
-		   AND gid=?
-		 ORDER BY score DESC
-		 LIMIT 6
-		 OFFSET ?`,
+		`SELECT media.rowid, media.gid, media.data, media.description, media.created_at
+		 FROM media_fts
+		 JOIN media ON posts.rowid = posts_fts.rowid
+		 WHERE media_fts.text MATCH ?
+		   AND media_fts.gid=?
+		ORDER BY media.score DESC
+		LIMIT 6
+		OFFSET ?`,
 	)
 	if err != nil {
 		return results, err
 	}
 
 	term = strings.TrimSpace(term)
-	term = `%` + term + `%`
 	return results, q.Select(&results, term, gid, offset)
 }
 

internal/db/migrations/11_fts_search.down.sql

@@ -0,0 +1,7 @@
+DROP TRIGGER media_ondelete;
+
+DROP TRIGGER media_onupdate;
+
+DROP TRIGGER media_oninsert;
+
+DROP TABLE media_fts;

internal/db/migrations/11_fts_search.up.sql

@@ -0,0 +1,21 @@
+CREATE VIRTUAL TABLE media_fts USING
+fts5(
+, description
+, gid UNINDEXED
+);
+
+
+CREATE TRIGGER media_oninsert AFTER INSERT ON media BEGIN
+    INSERT INTO media_fts(rowid, description, gid)
+    VALUES (new.rowid, new.description, new.gid);
+END;
+
+CREATE TRIGGER media_onupdate AFTER UPDATE ON media BEGIN
+    UPDATE media_fts
+    SET description = new.description
+    WHERE rowid = new.rowid;
+END;
+
+CREATE TRIGGER media_ondelete AFTER DELETE ON media BEGIN
+  DELETE FROM media_fts WHERE rowid = old.rowid;
+END;

internal/db/tables_test.go

@@ -4,55 +4,64 @@ import (
 	"context"
 	"testing"
 
-	"gotest.tools/assert"
+	"github.com/matryer/is"
 )
 
 func TestTables(t *testing.T) {
+	is := is.New(t)
 	var err error
 
 	err = Open(":memory:")
 	defer Close()
-	assert.NilError(t, err)
+	is.NoErr(err)
 
 	err = Migrate()
-	assert.NilError(t, err)
+	is.NoErr(err)
 
 	var gid int64 = -123456
 	text := "some text"
 	data := "123456"
 	kind := "photo"
 
 	err = InsertGroup(context.TODO(), gid, "group name")
-	assert.NilError(t, err)
+	is.NoErr(err)
 
 	err = InsertAbraxas(context.TODO(), &Abraxas{GID: gid, Abraxas: "something", Kind: "photo"})
-	assert.NilError(t, err)
+	is.NoErr(err)
 
 	err = InsertMedia(context.TODO(), &Media{GID: gid, Data: data, Kind: kind, Description: text, Score: 0})
-	assert.NilError(t, err)
+	is.NoErr(err)
 
 	var c int64
 	row := dbc.QueryRow(`SELECT COUNT(*) FROM media`)
 	err = row.Scan(&c)
-	assert.NilError(t, err)
-	assert.Equal(t, c, int64(1))
+	is.NoErr(err)
+	is.Equal(c, int64(1))
 
 	n := &Media{}
 	row = dbc.QueryRow(`SELECT kind,description,data,gid FROM media WHERE data=?`, data)
 	err = row.Scan(&n.Kind, &n.Description, &n.Data, &n.GID)
-	assert.NilError(t, err)
-	assert.Equal(t, n.GID, gid)
-	assert.Equal(t, n.Data, data)
+	is.NoErr(err)
+	is.Equal(n.GID, gid)
 
 	m := &Media{GID: gid, Kind: kind}
 	err = SelectRandomMedia(context.TODO(), m)
-	assert.NilError(t, err)
+	is.NoErr(err)
 
-	assert.Equal(t, m.GID, gid)
-	assert.Equal(t, m.Data, data)
-	assert.Equal(t, m.Kind, kind)
-	assert.Equal(t, m.Description, text)
+	is.Equal(m.GID, gid)
+	is.Equal(m.Data, data)
+	is.Equal(m.Kind, kind)
+	is.Equal(m.Description, text)
+
+	mf := &MediaFts{}
+	row = dbc.QueryRow(`SELECT rowid,description,gid FROM media_fts`)
+	err = row.Scan(&mf.RowID, &mf.Description, &mf.GID)
+	is.NoErr(err)
+
+	is.Equal(mf.RowID, int64(1))
+	is.Equal(mf.Description, m.Description)
+	is.Equal(mf.GID, m.GID)
 
 	err = MigrateDown()
-	assert.NilError(t, err)
+	is.NoErr(err)
 }