From 894ea47462b65bbdff887bc17641dc8bcc71b455 Mon Sep 17 00:00:00 2001
From: Jason Ish <jason@codemonkey.net>
Date: Tue, 8 Aug 2023 16:11:16 -0600
Subject: [PATCH] Revert "server/sqlite: don't use content-less fts table"

This reverts commit 427bd50b8dd456fdcf07cd32a0dd2b3ca0009203.
---
 src/commands/sqlite/fts.rs |  5 +++--
 src/sqlite/connection.rs   | 10 ----------
 src/sqlite/importer.rs     |  8 ++++++--
 src/sqlite/util.rs         |  9 +++++++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/commands/sqlite/fts.rs b/src/commands/sqlite/fts.rs
index 749a4f2c..6e155832 100644
--- a/src/commands/sqlite/fts.rs
+++ b/src/commands/sqlite/fts.rs
@@ -89,6 +89,7 @@ fn reindex_fts(tx: &Transaction) -> Result<usize> {
     let mut count = 0;
     while let Some(row) = rows.next()? {
         let rowid: u64 = row.get(0)?;
+        let timestamp: u64 = row.get(1)?;
         let source: String = row.get(2)?;
         let source: Value = serde_json::from_str(&source)?;
         let flat = extract_values(&source);
@@ -98,8 +99,8 @@ fn reindex_fts(tx: &Transaction) -> Result<usize> {
             params![&flat, rowid],
         )?;
         tx.execute(
-            "insert into fts (rowid, source_values) values (?, ?)",
-            params![rowid, &flat],
+            "insert into fts (rowid, timestamp, source_values) values (?, ?, ?)",
+            params![rowid, timestamp, &flat],
         )?;
 
         count += 1;
diff --git a/src/sqlite/connection.rs b/src/sqlite/connection.rs
index 53f0b85d..a1f542f8 100644
--- a/src/sqlite/connection.rs
+++ b/src/sqlite/connection.rs
@@ -142,8 +142,6 @@ pub fn init_event_db(db: &mut Connection) -> Result<(), rusqlite::Error> {
         tx.commit()?;
     } else if !db.has_table("fts")? {
         info!("FTS not enabled, consider enabling for query performance improvements");
-    } else {
-        check_0_17_broken_fts(db);
     }
 
     Ok(())
@@ -176,14 +174,6 @@ pub(crate) fn get_pragma<T: FromSql>(db: &Connection, name: &str) -> Result<T, r
     db.query_row_and_then(&sql, [], |row| row.get(0))
 }
 
-fn check_0_17_broken_fts(db: &Connection) {
-    if let Ok(mut s) = db.prepare("SELECT timestamp FROM fts LIMIT 1") {
-        if s.query([]).is_ok() {
-            warn!("Using pre-0.18.0 broken FTS, please disable and re-enable FTS: See https://github.com/jasonish/evebox/issues/279");
-        }
-    }
-}
-
 mod embedded {
     use refinery::embed_migrations;
     embed_migrations!("./resources/sqlite/migrations");
diff --git a/src/sqlite/importer.rs b/src/sqlite/importer.rs
index ea6fa32c..aea96312 100644
--- a/src/sqlite/importer.rs
+++ b/src/sqlite/importer.rs
@@ -84,8 +84,12 @@ pub(crate) fn prepare_sql(
     });
 
     if fts {
-        let statement = "INSERT INTO fts (rowid, source_values) VALUES (last_insert_rowid(), ?)";
-        let params = vec![SqliteValue::String(source_values)];
+        let statement =
+            "INSERT INTO fts (rowid, timestamp, source_values) VALUES (last_insert_rowid(), ?, ?)";
+        let params = vec![
+            SqliteValue::I64(ts.unix_timestamp_nanos() as i64),
+            SqliteValue::String(source_values),
+        ];
         statements.push(QueuedStatement {
             statement: statement.to_string(),
             params,
diff --git a/src/sqlite/util.rs b/src/sqlite/util.rs
index 22cfeafe..8c08a0e8 100644
--- a/src/sqlite/util.rs
+++ b/src/sqlite/util.rs
@@ -5,11 +5,16 @@
 use rusqlite::Transaction;
 
 pub fn fts_create(tx: &Transaction) -> Result<(), rusqlite::Error> {
-    tx.execute("create virtual table fts using fts5(source_values)", [])?;
+    tx.execute(
+        "create virtual table fts
+            using fts5(timestamp unindexed, source_values, content=events, content_rowid=rowid)",
+        [],
+    )?;
     tx.execute(
         "
         create trigger events_ad_trigger after delete on events begin
-          delete from fts where rowid = old.rowid;
+          insert into fts(fts, rowid, timestamp, source_values)
+            values ('delete', old.rowid, old.timestamp, old.source_values);
         end",
         [],
     )?;