From 1389225b45d778640da914b15fc798da2df1f379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20=C3=85hall?= Date: Thu, 20 Jul 2023 07:27:29 +0200 Subject: [PATCH] Search on node name --- db.go | 3 ++- main.go | 2 +- node.go | 5 ++++- sql/0012.sql | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 sql/0012.sql diff --git a/db.go b/db.go index 4b6d9e8..f8df736 100644 --- a/db.go +++ b/db.go @@ -113,7 +113,7 @@ func dbUpdate() (err error) {// {{{ return err } for i := (schema+1); i <= DB_SCHEMA; i++ { - log.Printf("\x1b[32mNotes\x1b[0m Upgrading SQL schema to revision %d\n", i) + log.Printf("\x1b[32mNotes\x1b[0m Upgrading SQL schema to revision %d...", i) sql, _ := embedded.ReadFile( fmt.Sprintf("sql/%04d.sql", i), ) @@ -125,6 +125,7 @@ func dbUpdate() (err error) {// {{{ if err != nil { return } + log.Printf("\x1b[32mNotes\x1b[0m OK: %d", i) } return diff --git a/main.go b/main.go index 930d4d7..a0ed3b4 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,7 @@ import ( const VERSION = "v9"; const LISTEN_HOST = "0.0.0.0"; -const DB_SCHEMA = 11 +const DB_SCHEMA = 12 var ( flagPort int diff --git a/node.go b/node.go index 0881dda..0a688ba 100644 --- a/node.go +++ b/node.go @@ -386,7 +386,10 @@ func (session Session) SearchNodes(search string) (nodes []Node, err error) {// FROM node WHERE crypto_key_id IS NULL AND - content ~* $1 + ( + content ~* $1 OR + name ~* $1 + ) ORDER BY updated DESC `, search) diff --git a/sql/0012.sql b/sql/0012.sql new file mode 100644 index 0000000..80ed44f --- /dev/null +++ b/sql/0012.sql @@ -0,0 +1,2 @@ +DROP INDEX node_content_index; +CREATE INDEX node_search_index ON node USING gin (name gin_trgm_ops, content gin_trgm_ops);