1 files changed, 59 insertions, 6 deletions

diff --git a/qlite/src/table.vala b/qlite/src/table.vala
index 7fa2fc62..6c6ef9de 100644
--- a/qlite/src/table.vala
+++ b/qlite/src/table.vala
@@ -8,6 +8,8 @@ public class Table {
     protected Column[]? columns;
     private string constraints = "";
     private string[] post_statements = {};
+    private string[] create_statements = {};
+    internal Column[]? fts_columns;
 
     public Table(Database db, string name) {
         this.db = db;
@@ -17,6 +19,37 @@ public class Table {
     public void init(Column[] columns, string constraints = "") {
         this.columns = columns;
         this.constraints = constraints;
+
+        foreach(Column c in columns) {
+            c.table = this;
+        }
+    }
+
+    public void fts(Column[] columns) {
+        if (fts_columns != null) error("Only one FTS index may be used per table.");
+        fts_columns = columns;
+        string cs = "";
+        string cnames = "";
+        string cnews = "";
+        foreach (Column c in columns) {
+            cs += @", $(c.to_column_definition())";
+            cnames += @", $(c.name)";
+            cnews += @", new.$(c.name)";
+        }
+        add_create_statement(@"CREATE VIRTUAL TABLE IF NOT EXISTS _fts_$name USING fts4(tokenize=unicode61, content=\"$name\"$cs)");
+        add_post_statement(@"CREATE TRIGGER IF NOT EXISTS _fts_bu_$(name) BEFORE UPDATE ON $name BEGIN DELETE FROM _fts_$name WHERE docid=old.rowid; END");
+        add_post_statement(@"CREATE TRIGGER IF NOT EXISTS _fts_bd_$(name) BEFORE DELETE ON $name BEGIN DELETE FROM _fts_$name WHERE docid=old.rowid; END");
+        add_post_statement(@"CREATE TRIGGER IF NOT EXISTS _fts_au_$(name) AFTER UPDATE ON $name BEGIN INSERT INTO _fts_$name(docid$cnames) VALUES(new.rowid$cnews); END");
+        add_post_statement(@"CREATE TRIGGER IF NOT EXISTS _fts_ai_$(name) AFTER INSERT ON $name BEGIN INSERT INTO _fts_$name(docid$cnames) VALUES(new.rowid$cnews); END");
+    }
+
+    public void fts_rebuild() {
+        if (fts_columns == null) error("FTS not available on this table.");
+        try {
+            db.exec(@"INSERT INTO _fts_$name(_fts_$name) VALUES('rebuild');");
+        } catch (Error e) {
+            error(@"Qlite Error: Rebuilding FTS index: $(e.message)");
+        }
     }
 
     public void unique(Column[] columns, string? on_conflict = null) {
@@ -37,6 +70,10 @@ public class Table {
         post_statements += stmt;
     }
 
+    public void add_create_statement(string stmt) {
+        create_statements += stmt;
+    }
+
     public void index(string index_name, Column[] columns, bool unique = false) {
         string stmt = @"CREATE $(unique ? "UNIQUE" : "") INDEX IF NOT EXISTS $index_name ON $name (";
         bool first = true;
@@ -58,6 +95,15 @@ public class Table {
         return db.select(columns).from(this);
     }
 
+    private MatchQueryBuilder match_query() {
+        ensure_init();
+        return db.match_query(this);
+    }
+
+    public MatchQueryBuilder match(Column<string> column, string query) {
+        return match_query().match(column, query);
+    }
+
     public InsertBuilder insert() {
         ensure_init();
         return db.insert().into(this);
@@ -99,7 +145,7 @@ public class Table {
         for (int i = 0; i < columns.length; i++) {
             Column c = columns[i];
             if (c.min_version <= version && c.max_version >= version) {
-                sql += @"$(!first ? "," : "") $c";
+                sql += @"$(!first ? "," : "") $(c.to_column_definition())";
                 first = false;
             }
         }
@@ -107,7 +153,14 @@ public class Table {
         try {
             db.exec(sql);
         } catch (Error e) {
-            error("Qlite Error: Create table at version");
+            error(@"Qlite Error: Create table at version: $(e.message)");
+        }
+        foreach (string stmt in create_statements) {
+            try {
+                db.exec(stmt);
+            } catch (Error e) {
+                error(@"Qlite Error: Create table at version: $(e.message)");
+            }
         }
     }
 
@@ -116,9 +169,9 @@ public class Table {
         foreach (Column c in columns) {
             if (c.min_version <= new_version && c.max_version >= new_version && c.min_version > old_version) {
                 try {
-                    db.exec(@"ALTER TABLE $name ADD COLUMN $c");
+                    db.exec(@"ALTER TABLE $name ADD COLUMN $(c.to_column_definition())");
                 } catch (Error e) {
-                    error("Qlite Error: Add columns for version");
+                    error(@"Qlite Error: Add columns for version: $(e.message)");
                 }
             }
         }
@@ -146,7 +199,7 @@ public class Table {
                 db.exec(@"INSERT INTO $name ($column_list) SELECT $column_list FROM _$(name)_$old_version");
                 db.exec(@"DROP TABLE _$(name)_$old_version");
             } catch (Error e) {
-                error("Qlite Error: Delete volumns for version change");
+                error(@"Qlite Error: Delete columns for version change: $(e.message)");
             }
         }
     }
@@ -156,7 +209,7 @@ public class Table {
             try {
                 db.exec(stmt);
             } catch (Error e) {
-                error("Qlite Error: Post");
+                error(@"Qlite Error: Post: $(e.message)");
             }
         }
     }