@nymphjs/driver-sqlite3 1.0.0-beta.10 → 1.0.0-beta.101

package/dist/SQLite3Driver.js

@@ -1,29 +1,36 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
-const nymph_1 = require("@nymphjs/nymph");
-const guid_1 = require("@nymphjs/guid");
-const conf_1 = require("./conf");
+import SQLite3 from 'better-sqlite3';
+import { NymphDriver, EntityUniqueConstraintError, InvalidParametersError, NotConfiguredError, QueryFailedError, UnableToConnectError, xor, } from '@nymphjs/nymph';
+import { makeTableSuffix } from '@nymphjs/guid';
+import { SQLite3DriverConfigDefaults as defaults, } from './conf/index.js';
 class InternalStore {
+    link;
+    linkWrite;
+    connected = false;
+    transactionsStarted = 0;
     constructor(link) {
-        this.connected = false;
-        this.transactionsStarted = 0;
         this.link = link;
     }
 }
-class SQLite3Driver extends nymph_1.NymphDriver {
+/**
+ * The SQLite3 Nymph database driver.
+ */
+export default class SQLite3Driver extends NymphDriver {
+    config;
+    prefix;
+    // @ts-ignore: this is assigned in connect(), which is called by the constructor.
+    store;
     static escape(input) {
         if (input.indexOf('\x00') !== -1) {
-            throw new nymph_1.InvalidParametersError('SQLite3 identifiers (like entity ETYPE) cannot contain null characters.');
+            throw new InvalidParametersError('SQLite3 identifiers (like entity ETYPE) cannot contain null characters.');
         }
         return '"' + input.replace(/"/g, () => '""') + '"';
     }
     constructor(config, store) {
         super();
-        this.config = { ...conf_1.SQLite3DriverConfigDefaults, ...config };
+        this.config = { ...defaults, ...config };
+        if (this.config.filename === ':memory:') {
+            this.config.explicitWrite = true;
+        }
         this.prefix = this.config.prefix;
         if (store) {
             this.store = store;
@@ -32,53 +39,126 @@ class SQLite3Driver extends nymph_1.NymphDriver {
             this.connect();
         }
     }
+    /**
+     * This is used internally by Nymph. Don't call it yourself.
+     *
+     * @returns A clone of this instance.
+     */
     clone() {
         return new SQLite3Driver(this.config, this.store);
     }
-    async connect() {
-        const { filename, fileMustExist, timeout, readonly, wal, verbose } = this.config;
+    /**
+     * Connect to the SQLite3 database.
+     *
+     * @returns Whether this instance is connected to a SQLite3 database.
+     */
+    connect() {
         if (this.store && this.store.connected) {
-            return true;
+            return Promise.resolve(true);
         }
+        // Connecting
+        this._connect(false);
+        return Promise.resolve(this.store.connected);
+    }
+    _connect(write) {
+        const { filename, fileMustExist, timeout, explicitWrite, wal, verbose } = this.config;
         try {
-            const link = new better_sqlite3_1.default(filename, {
-                readonly,
-                fileMustExist,
-                timeout,
-                verbose,
-            });
+            const setOptions = (link) => {
+                // Set database and connection options.
+                if (wal) {
+                    link.pragma('journal_mode = WAL;');
+                }
+                link.pragma('encoding = "UTF-8";');
+                link.pragma('foreign_keys = 1;');
+                link.pragma('case_sensitive_like = 1;');
+                for (let pragma of this.config.pragmas) {
+                    link.pragma(pragma);
+                }
+                // Create the preg_match and regexp functions.
+                link.function('regexp', { deterministic: true }, ((pattern, subject) => (this.posixRegexMatch(pattern, subject) ? 1 : 0)));
+            };
+            let link;
+            try {
+                link = new SQLite3(filename, {
+                    readonly: !explicitWrite && !write,
+                    fileMustExist,
+                    timeout,
+                    verbose,
+                });
+            }
+            catch (e) {
+                if (e.code === 'SQLITE_CANTOPEN' &&
+                    !explicitWrite &&
+                    !write &&
+                    !this.config.fileMustExist) {
+                    // This happens when the file doesn't exist and we attempt to open it
+                    // readonly.
+                    // First open it in write mode.
+                    const writeLink = new SQLite3(filename, {
+                        readonly: false,
+                        fileMustExist,
+                        timeout,
+                        verbose,
+                    });
+                    setOptions(writeLink);
+                    writeLink.close();
+                    // Now open in readonly.
+                    link = new SQLite3(filename, {
+                        readonly: true,
+                        fileMustExist,
+                        timeout,
+                        verbose,
+                    });
+                }
+                else {
+                    throw e;
+                }
+            }
             if (!this.store) {
+                if (write) {
+                    throw new Error('Tried to open in write without opening in read first.');
+                }
                 this.store = new InternalStore(link);
             }
+            else if (write) {
+                this.store.linkWrite = link;
+            }
             else {
                 this.store.link = link;
             }
             this.store.connected = true;
-            if (wal) {
-                this.store.link.pragma('journal_mode = WAL;');
-            }
-            this.store.link.pragma('encoding = "UTF-8";');
-            this.store.link.pragma('foreign_keys = 1;');
-            this.store.link.pragma('case_sensitive_like = 1;');
-            this.store.link.function('regexp', { deterministic: true }, (pattern, subject) => this.posixRegexMatch(pattern, subject) ? 1 : 0);
+            setOptions(link);
         }
         catch (e) {
             if (this.store) {
                 this.store.connected = false;
             }
             if (filename === ':memory:') {
-                throw new nymph_1.NotConfiguredError("It seems the config hasn't been set up correctly.");
+                throw new NotConfiguredError("It seems the config hasn't been set up correctly. Could not connect: " +
+                    e?.message);
             }
             else {
-                throw new nymph_1.UnableToConnectError('Could not connect: ' + e?.message);
+                throw new UnableToConnectError('Could not connect: ' + e?.message);
             }
         }
-        return this.store.connected;
     }
+    /**
+     * Disconnect from the SQLite3 database.
+     *
+     * @returns Whether this instance is connected to a SQLite3 database.
+     */
     async disconnect() {
         if (this.store.connected) {
-            this.store.link.exec('PRAGMA optimize;');
+            if (this.store.linkWrite && !this.config.explicitWrite) {
+                this.store.linkWrite.exec('PRAGMA optimize;');
+                this.store.linkWrite.close();
+                this.store.linkWrite = undefined;
+            }
+            if (this.config.explicitWrite) {
+                this.store.link.exec('PRAGMA optimize;');
+            }
             this.store.link.close();
+            this.store.transactionsStarted = 0;
             this.store.connected = false;
         }
         return this.store.connected;
@@ -86,51 +166,91 @@ class SQLite3Driver extends nymph_1.NymphDriver {
     async inTransaction() {
         return this.store.transactionsStarted > 0;
     }
+    /**
+     * Check connection status.
+     *
+     * @returns Whether this instance is connected to a SQLite3 database.
+     */
     isConnected() {
         return this.store.connected;
     }
-    checkReadOnlyMode() {
-        if (this.config.readonly) {
-            throw new nymph_1.InvalidParametersError('Attempt to write to SQLite3 DB in read only mode.');
-        }
+    createEntitiesTable(etype) {
+        // Create the entity table.
+        this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid" CHARACTER(24) PRIMARY KEY, "tags" TEXT, "cdate" REAL NOT NULL, "mdate" REAL NOT NULL);`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_cdate`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("cdate");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_mdate`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("mdate");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_tags`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("tags");`);
+    }
+    createDataTable(etype) {
+        // Create the data table.
+        this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid" CHARACTER(24) NOT NULL REFERENCES ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid") ON DELETE CASCADE, "name" TEXT NOT NULL, "value" CHARACTER(1) NOT NULL, "json" BLOB, "string" TEXT, "number" REAL, "truthy" INTEGER, PRIMARY KEY("guid", "name"));`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_guid`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_guid_name`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid", "name");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_name`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("name");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_name_string`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("name", "string");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_name_number`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("name", "number");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_guid_name_number`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "number");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_name_truthy`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("name", "truthy");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_guid_name_truthy`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "truthy");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_acuserread`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid") WHERE "name"=\'acUser\' AND "number" >= 1;`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_acgroupread`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid") WHERE "name"=\'acGroup\' AND "number" >= 1;`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_acotherread`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid") WHERE "name"=\'acOther\' AND "number" >= 1;`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_acuser`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid") WHERE "name"=\'user\';`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_acgroup`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid") WHERE "name"=\'group\';`);
+    }
+    createReferencesTable(etype) {
+        // Create the references table.
+        this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid" CHARACTER(24) NOT NULL REFERENCES ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid") ON DELETE CASCADE, "name" TEXT NOT NULL, "reference" CHARACTER(24) NOT NULL, PRIMARY KEY("guid", "name", "reference"));`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_guid`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_name`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("name");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_name_reference`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("name", "reference");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_reference`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("reference");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_guid_name`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid", "name");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_guid_name_reference`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid", "name", "reference");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_reference_name_guid`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("reference", "name", "guid");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_reference_guid_name`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("reference", "guid", "name");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_guid_reference_nameuser`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid", "reference") WHERE "name"=\'user\';`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_guid_reference_namegroup`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid", "reference") WHERE "name"=\'group\';`);
+    }
+    createTokensTable(etype) {
+        // Create the tokens table.
+        this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} ("guid" CHARACTER(24) NOT NULL REFERENCES ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid") ON DELETE CASCADE, "name" TEXT NOT NULL, "token" INTEGER NOT NULL, "position" INTEGER NOT NULL, "stem" INTEGER NOT NULL, PRIMARY KEY("guid", "name", "token", "position"));`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}_id_name_token`)} ON ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} ("name", "token");`);
     }
+    createUniquesTable(etype) {
+        // Create the unique strings table.
+        this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}uniques_${etype}`)} ("guid" CHARACTER(24) NOT NULL REFERENCES ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid") ON DELETE CASCADE, "unique" TEXT NOT NULL UNIQUE, PRIMARY KEY("guid", "unique"));`);
+    }
+    /**
+     * Create entity tables in the database.
+     *
+     * @param etype The entity type to create a table for. If this is blank, the default tables are created.
+     */
     createTables(etype = null) {
-        this.checkReadOnlyMode();
         this.startTransaction('nymph-tablecreation');
         try {
             if (etype != null) {
-                this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid" CHARACTER(24) PRIMARY KEY, "tags" TEXT, "cdate" REAL NOT NULL, "mdate" REAL NOT NULL);`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_cdate`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("cdate");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_mdate`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("mdate");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_tags`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("tags");`);
-                this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid" CHARACTER(24) NOT NULL REFERENCES ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid") ON DELETE CASCADE, "name" TEXT NOT NULL, "value" TEXT NOT NULL, PRIMARY KEY("guid", "name"));`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_guid`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_name`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("name");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_value`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("value");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_guid__name_user`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid") WHERE "name" = \'user\';`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}data_${etype}_id_guid__name_group`)} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid") WHERE "name" = \'group\';`);
-                this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} ("guid" CHARACTER(24) NOT NULL REFERENCES ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid") ON DELETE CASCADE, "name" TEXT NOT NULL, "truthy" INTEGER, "string" TEXT, "number" REAL, PRIMARY KEY("guid", "name"));`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}_id_guid`)} ON ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} ("guid");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}_id_name`)} ON ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} ("name");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}_id_name__truthy`)} ON ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} ("name") WHERE "truthy" = 1;`);
-                this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid" CHARACTER(24) NOT NULL REFERENCES ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid") ON DELETE CASCADE, "name" TEXT NOT NULL, "reference" CHARACTER(24) NOT NULL, PRIMARY KEY("guid", "name", "reference"));`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_guid`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("guid");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_name`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("name");`);
-                this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}references_${etype}_id_reference`)} ON ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} ("reference");`);
+                this.createEntitiesTable(etype);
+                this.createDataTable(etype);
+                this.createReferencesTable(etype);
+                this.createTokensTable(etype);
+                this.createUniquesTable(etype);
             }
             else {
+                // Create the UID table.
                 this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}uids`)} ("name" TEXT PRIMARY KEY NOT NULL, "cur_uid" INTEGER NOT NULL);`);
             }
-            this.commit('nymph-tablecreation');
-            return true;
         }
         catch (e) {
             this.rollback('nymph-tablecreation');
             throw e;
         }
+        this.commit('nymph-tablecreation');
+        return true;
     }
     query(runQuery, query, etypes = []) {
         try {
+            this.nymph.config.debugInfo('sqlite3:query', query);
             return runQuery();
         }
         catch (e) {
@@ -146,32 +266,45 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                     return runQuery();
                 }
                 catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.code + ' - ' + e2?.message, query);
+                    throw new QueryFailedError('Query failed: ' + e2?.code + ' - ' + e2?.message, query);
                 }
             }
+            else if (errorCode === 'SQLITE_CONSTRAINT_UNIQUE' &&
+                errorMsg.match(/^UNIQUE constraint failed: /)) {
+                throw new EntityUniqueConstraintError(`Unique constraint violation.`);
+            }
             else {
-                throw new nymph_1.QueryFailedError('Query failed: ' + e?.code + ' - ' + e?.message, query);
+                throw new QueryFailedError('Query failed: ' + e?.code + ' - ' + e?.message, query);
             }
         }
     }
-    queryIter(query, { etypes = [], params = {}, } = {}) {
-        return this.query(() => this.store.link.prepare(query).iterate(params), `${query} -- ${JSON.stringify(params)}`, etypes);
+    queryArray(query, { etypes = [], params = {}, } = {}) {
+        return this.query(() => (this.store.linkWrite || this.store.link)
+            .prepare(query)
+            .iterate(params), `${query} -- ${JSON.stringify(params)}`, etypes);
     }
     queryGet(query, { etypes = [], params = {}, } = {}) {
-        return this.query(() => this.store.link.prepare(query).get(params), `${query} -- ${JSON.stringify(params)}`, etypes);
+        return this.query(() => (this.store.linkWrite || this.store.link).prepare(query).get(params), `${query} -- ${JSON.stringify(params)}`, etypes);
     }
     queryRun(query, { etypes = [], params = {}, } = {}) {
-        return this.query(() => this.store.link.prepare(query).run(params), `${query} -- ${JSON.stringify(params)}`, etypes);
+        return this.query(() => (this.store.linkWrite || this.store.link).prepare(query).run(params), `${query} -- ${JSON.stringify(params)}`, etypes);
     }
     async commit(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
-            throw new nymph_1.InvalidParametersError('Transaction commit attempted without a name.');
+            throw new InvalidParametersError('Transaction commit attempted without a name.');
         }
         if (this.store.transactionsStarted === 0) {
             return true;
         }
         this.queryRun(`RELEASE SAVEPOINT ${SQLite3Driver.escape(name)};`);
         this.store.transactionsStarted--;
+        if (this.store.transactionsStarted === 0 &&
+            this.store.linkWrite &&
+            !this.config.explicitWrite) {
+            this.store.linkWrite.exec('PRAGMA optimize;');
+            this.store.linkWrite.close();
+            this.store.linkWrite = undefined;
+        }
         return true;
     }
     async deleteEntityByID(guid, className) {
@@ -184,7 +317,6 @@ class SQLite3Driver extends nymph_1.NymphDriver {
             EntityClass = className;
         }
         const etype = EntityClass.ETYPE;
-        this.checkReadOnlyMode();
         await this.startTransaction('nymph-delete');
         try {
             this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=@guid;`, {
@@ -199,108 +331,167 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                     guid,
                 },
             });
-            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} WHERE "guid"=@guid;`, {
+            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=@guid;`, {
                 etypes: [etype],
                 params: {
                     guid,
                 },
             });
-            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=@guid;`, {
+            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=@guid;`, {
+                etypes: [etype],
+                params: {
+                    guid,
+                },
+            });
+            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=@guid;`, {
                 etypes: [etype],
                 params: {
                     guid,
                 },
             });
-            await this.commit('nymph-delete');
-            if (this.nymph.config.cache) {
-                this.cleanCache(guid);
-            }
-            return true;
         }
         catch (e) {
+            this.nymph.config.debugError('sqlite3', `Delete entity error: "${e}"`);
             await this.rollback('nymph-delete');
             throw e;
         }
+        await this.commit('nymph-delete');
+        // Remove any cached versions of this entity.
+        if (this.nymph.config.cache) {
+            this.cleanCache(guid);
+        }
+        return true;
     }
     async deleteUID(name) {
         if (!name) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID');
+            throw new InvalidParametersError('Name not given for UID');
         }
-        this.checkReadOnlyMode();
+        await this.startTransaction('nymph-delete-uid');
         this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
             params: {
                 name,
             },
         });
+        await this.commit('nymph-delete-uid');
         return true;
     }
-    async exportEntities(writeLine) {
-        writeLine('#nex2');
-        writeLine('# Nymph Entity Exchange v2');
-        writeLine('# http://nymph.io');
-        writeLine('#');
-        writeLine('# Generation Time: ' + new Date().toLocaleString());
-        writeLine('');
-        writeLine('#');
-        writeLine('# UIDs');
-        writeLine('#');
-        writeLine('');
-        let uids = this.queryIter(`SELECT * FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} ORDER BY "name";`);
-        for (const uid of uids) {
-            writeLine(`<${uid.name}>[${uid.cur_uid}]`);
-        }
-        writeLine('');
-        writeLine('#');
-        writeLine('# Entities');
-        writeLine('#');
-        writeLine('');
-        const tables = this.queryIter("SELECT name FROM sqlite_master WHERE type = 'table' ORDER BY name;");
+    async getEtypes() {
+        const tables = this.queryArray("SELECT `name` FROM `sqlite_master` WHERE `type`='table' AND `name` LIKE @prefix;", {
+            params: {
+                prefix: this.prefix + 'entities_' + '%',
+            },
+        });
         const etypes = [];
         for (const table of tables) {
-            if (table.name.startsWith(this.prefix + 'entities_')) {
-                etypes.push(table.name.substr((this.prefix + 'entities_').length));
+            etypes.push(table.name.substr((this.prefix + 'entities_').length));
+        }
+        return etypes;
+    }
+    async *exportDataIterator() {
+        if (yield {
+            type: 'comment',
+            content: `#nex2
+# Nymph Entity Exchange v2
+# http://nymph.io
+#
+# Generation Time: ${new Date().toLocaleString()}
+`,
+        }) {
+            return;
+        }
+        if (yield {
+            type: 'comment',
+            content: `
+
+#
+# UIDs
+#
+
+`,
+        }) {
+            return;
+        }
+        // Export UIDs.
+        let uids = this.queryArray(`SELECT * FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} ORDER BY "name";`);
+        for (const uid of uids) {
+            if (yield { type: 'uid', content: `<${uid.name}>[${uid.cur_uid}]\n` }) {
+                return;
             }
         }
+        if (yield {
+            type: 'comment',
+            content: `
+
+#
+# Entities
+#
+
+`,
+        }) {
+            return;
+        }
+        // Get the etypes.
+        const etypes = await this.getEtypes();
         for (const etype of etypes) {
-            const dataIterator = this.queryIter(`SELECT e.*, d."name" AS "dname", d."value" AS "dvalue", c."string", c."number" FROM ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} e LEFT JOIN ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} d USING ("guid") INNER JOIN ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} c USING ("guid", "name") ORDER BY e."guid";`)[Symbol.iterator]();
+            // Export entities.
+            const dataIterator = this.queryArray(`SELECT e.*, d."name", d."value", json(d."json") as "json", d."string", d."number" FROM ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} e LEFT JOIN ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} d USING ("guid") ORDER BY e."guid";`)[Symbol.iterator]();
             let datum = dataIterator.next();
             while (!datum.done) {
                 const guid = datum.value.guid;
                 const tags = datum.value.tags.slice(1, -1);
                 const cdate = datum.value.cdate;
                 const mdate = datum.value.mdate;
-                writeLine(`{${guid}}<${etype}>[${tags}]`);
-                writeLine(`\tcdate=${JSON.stringify(cdate)}`);
-                writeLine(`\tmdate=${JSON.stringify(mdate)}`);
-                if (datum.value.dname != null) {
+                let currentEntityExport = [];
+                currentEntityExport.push(`{${guid}}<${etype}>[${tags}]`);
+                currentEntityExport.push(`\tcdate=${JSON.stringify(cdate)}`);
+                currentEntityExport.push(`\tmdate=${JSON.stringify(mdate)}`);
+                if (datum.value.name != null) {
+                    // This do will keep going and adding the data until the
+                    // next entity is reached. datum will end on the next entity.
                     do {
-                        const value = datum.value.dvalue === 'N'
+                        const value = datum.value.value === 'N'
                             ? JSON.stringify(datum.value.number)
-                            : datum.value.dvalue === 'S'
+                            : datum.value.value === 'S'
                                 ? JSON.stringify(datum.value.string)
-                                : datum.value.dvalue;
-                        writeLine(`\t${datum.value.dname}=${value}`);
+                                : datum.value.value === 'J'
+                                    ? datum.value.json
+                                    : datum.value.value;
+                        currentEntityExport.push(`\t${datum.value.name}=${value}`);
                         datum = dataIterator.next();
                     } while (!datum.done && datum.value.guid === guid);
                 }
                 else {
+                    // Make sure that datum is incremented :)
                     datum = dataIterator.next();
                 }
+                currentEntityExport.push('');
+                if (yield { type: 'entity', content: currentEntityExport.join('\n') }) {
+                    return;
+                }
             }
         }
-        return;
     }
-    makeEntityQuery(options, formattedSelectors, etype, count = { i: 0 }, params = {}, subquery = false, tableSuffix = '', etypes = []) {
+    /**
+     * Generate the SQLite3 query.
+     * @param options The options array.
+     * @param formattedSelectors The formatted selector array.
+     * @param etype
+     * @param count Used to track internal params.
+     * @param params Used to store internal params.
+     * @param subquery Whether only a subquery should be returned.
+     * @returns The SQL query.
+     */
+    makeEntityQuery(options, formattedSelectors, etype, count = { i: 0 }, params = {}, subquery = false, tableSuffix = '', etypes = [], guidSelector = undefined) {
         if (typeof options.class?.alterOptions === 'function') {
             options = options.class.alterOptions(options);
         }
         const eTable = `e${tableSuffix}`;
         const dTable = `d${tableSuffix}`;
-        const cTable = `c${tableSuffix}`;
         const fTable = `f${tableSuffix}`;
         const ieTable = `ie${tableSuffix}`;
+        const sTable = `s${tableSuffix}`;
         const sort = options.sort ?? 'cdate';
-        const queryParts = this.iterateSelectorsForQuery(formattedSelectors, (key, value, typeIsOr, typeIsNot) => {
+        const queryParts = this.iterateSelectorsForQuery(formattedSelectors, ({ key, value, typeIsOr, typeIsNot }) => {
             const clauseNot = key.startsWith('!');
             let curQuery = '';
             for (const curValue of value) {
@@ -313,7 +504,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const guid = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."guid"=@' +
                                     guid;
@@ -328,7 +519,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const tag = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."tags" LIKE @' +
                                     tag +
@@ -352,7 +543,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             curQuery +=
                                 ieTable +
                                     '."guid" ' +
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     'IN (SELECT "guid" FROM ' +
                                     SQLite3Driver.escape(this.prefix + 'data_' + etype) +
                                     ' WHERE "name"=@' +
@@ -369,7 +560,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             if (curVar === 'cdate') {
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                         '(' +
                                         ieTable +
                                         '."cdate" NOT NULL)';
@@ -377,7 +568,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             else if (curVar === 'mdate') {
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                         '(' +
                                         ieTable +
                                         '."mdate" NOT NULL)';
@@ -386,11 +577,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             else {
                                 const name = `param${++count.i}`;
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        'EXISTS (SELECT "guid" FROM ' +
+                                        SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                        ' WHERE "guid"=' +
                                         ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                        ' WHERE "name"=@' +
+                                        '."guid" AND "name"=@' +
                                         name +
                                         ' AND "truthy"=1)';
                                 params[name] = curVar;
@@ -405,7 +597,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate"=@' +
                                     cdate;
@@ -418,7 +610,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate"=@' +
                                     mdate;
@@ -432,11 +624,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number"=@' +
                                     value +
@@ -451,11 +644,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "string"=@' +
                                     value +
@@ -478,15 +672,16 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
                                     SQLite3Driver.escape(this.prefix + 'data_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    ' WHERE "guid"=' +
+                                    ieTable +
+                                    '."guid" AND "name"=@' +
                                     name +
-                                    ' AND "value"=@' +
+                                    ' AND "json"=jsonb(@' +
                                     value +
-                                    ')';
+                                    '))';
                             params[name] = curValue[0];
                             params[value] = svalue;
                         }
@@ -499,9 +694,9 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '."cdate"=' +
+                                    '."cdate"=@' +
                                     cdate;
                             params[cdate] = Number(curValue[1]);
                             break;
@@ -512,67 +707,163 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '."mdate"=' +
+                                    '."mdate"=@' +
                                     mdate;
                             params[mdate] = Number(curValue[1]);
                             break;
                         }
                         else {
+                            const containTableSuffix = makeTableSuffix();
                             if (curQuery) {
                                 curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
                             let svalue;
-                            let stringValue;
                             if (curValue[1] instanceof Object &&
                                 typeof curValue[1].toReference === 'function') {
                                 svalue = JSON.stringify(curValue[1].toReference());
-                                stringValue = `${curValue[1].toReference()}`;
                             }
                             else {
                                 svalue = JSON.stringify(curValue[1]);
-                                stringValue = `${curValue[1]}`;
                             }
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
-                            if (typeof curValue[1] === 'string') {
-                                const stringParam = `param${++count.i}`;
-                                curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                        '(' +
-                                        ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        SQLite3Driver.escape(this.prefix + 'data_' + etype) +
-                                        ' WHERE "name"=@' +
-                                        name +
-                                        ' AND instr("value", @' +
-                                        value +
-                                        ')) OR ' +
-                                        ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                        ' WHERE "name"=@' +
-                                        name +
-                                        ' AND "string"=@' +
-                                        stringParam +
-                                        '))';
-                                params[stringParam] = stringValue;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' d' +
+                                    containTableSuffix +
+                                    ' WHERE "guid"=' +
+                                    ieTable +
+                                    '."guid" AND "name"=@' +
+                                    name +
+                                    ' AND json(@' +
+                                    value +
+                                    ') IN (SELECT json_quote("value") FROM json_each(d' +
+                                    containTableSuffix +
+                                    '."json")))';
+                            params[name] = curValue[0];
+                            params[value] = svalue;
+                        }
+                        break;
+                    case 'search':
+                    case '!search':
+                        if (curValue[0] === 'cdate' || curValue[0] === 'mdate') {
+                            if (curQuery) {
+                                curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
-                            else {
-                                curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                        ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        SQLite3Driver.escape(this.prefix + 'data_' + etype) +
-                                        ' WHERE "name"=@' +
-                                        name +
-                                        ' AND instr("value", @' +
-                                        value +
-                                        '))';
+                            curQuery += (xor(typeIsNot, clauseNot) ? 'NOT ' : '') + '(0)';
+                            break;
+                        }
+                        else {
+                            if (curQuery) {
+                                curQuery += typeIsOr ? ' OR ' : ' AND ';
+                            }
+                            const name = `param${++count.i}`;
+                            const queryPartToken = (term) => {
+                                const value = `param${++count.i}`;
+                                params[value] = term.token;
+                                return ('EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'tokens_' + etype) +
+                                    ' WHERE "guid"=' +
+                                    ieTable +
+                                    '."guid" AND "name"=@' +
+                                    name +
+                                    ' AND "token"=@' +
+                                    value +
+                                    (term.nostemmed ? ' AND "stem"=0' : '') +
+                                    ')');
+                            };
+                            const queryPartSeries = (series) => {
+                                const tokenTableSuffix = makeTableSuffix();
+                                const tokenParts = series.tokens.map((token, i) => {
+                                    const value = `param${++count.i}`;
+                                    params[value] = token.token;
+                                    return {
+                                        fromClause: i === 0
+                                            ? 'FROM ' +
+                                                SQLite3Driver.escape(this.prefix + 'tokens_' + etype) +
+                                                ' t' +
+                                                tokenTableSuffix +
+                                                '0'
+                                            : 'JOIN ' +
+                                                SQLite3Driver.escape(this.prefix + 'tokens_' + etype) +
+                                                ' t' +
+                                                tokenTableSuffix +
+                                                i +
+                                                ' ON t' +
+                                                tokenTableSuffix +
+                                                i +
+                                                '."guid" = t' +
+                                                tokenTableSuffix +
+                                                '0."guid" AND t' +
+                                                tokenTableSuffix +
+                                                i +
+                                                '."name" = t' +
+                                                tokenTableSuffix +
+                                                '0."name" AND t' +
+                                                tokenTableSuffix +
+                                                i +
+                                                '."position" = t' +
+                                                tokenTableSuffix +
+                                                '0."position" + ' +
+                                                i,
+                                        whereClause: 't' +
+                                            tokenTableSuffix +
+                                            i +
+                                            '."token"=@' +
+                                            value +
+                                            (token.nostemmed
+                                                ? ' AND t' + tokenTableSuffix + i + '."stem"=0'
+                                                : ''),
+                                    };
+                                });
+                                return ('EXISTS (SELECT t' +
+                                    tokenTableSuffix +
+                                    '0."guid" ' +
+                                    tokenParts.map((part) => part.fromClause).join(' ') +
+                                    ' WHERE t' +
+                                    tokenTableSuffix +
+                                    '0."guid"=' +
+                                    ieTable +
+                                    '."guid" AND t' +
+                                    tokenTableSuffix +
+                                    '0."name"=@' +
+                                    name +
+                                    ' AND ' +
+                                    tokenParts.map((part) => part.whereClause).join(' AND ') +
+                                    ')');
+                            };
+                            const queryPartTerm = (term) => {
+                                if (term.type === 'series') {
+                                    return queryPartSeries(term);
+                                }
+                                else if (term.type === 'not') {
+                                    return 'NOT ' + queryPartTerm(term.operand);
+                                }
+                                else if (term.type === 'or') {
+                                    let queryParts = [];
+                                    for (let operand of term.operands) {
+                                        queryParts.push(queryPartTerm(operand));
+                                    }
+                                    return '(' + queryParts.join(' OR ') + ')';
+                                }
+                                return queryPartToken(term);
+                            };
+                            const parsedFTSQuery = this.tokenizer.parseSearchQuery(curValue[1]);
+                            // Run through the query and add terms.
+                            let termStrings = [];
+                            for (let term of parsedFTSQuery) {
+                                termStrings.push(queryPartTerm(term));
                             }
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    '(' +
+                                    termStrings.join(' AND ') +
+                                    ')';
                             params[name] = curValue[0];
-                            params[value] = svalue;
                         }
                         break;
                     case 'match':
@@ -583,7 +874,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" REGEXP @' +
@@ -598,7 +889,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" REGEXP @' +
@@ -614,11 +905,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "string" REGEXP @' +
                                     value +
@@ -635,7 +927,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" REGEXP @' +
@@ -650,7 +942,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" REGEXP @' +
@@ -666,11 +958,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND lower("string") REGEXP lower(@' +
                                     value +
@@ -687,7 +980,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" LIKE @' +
@@ -702,7 +995,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" LIKE @' +
@@ -718,11 +1011,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "string" LIKE @' +
                                     value +
@@ -739,7 +1033,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" LIKE @' +
@@ -754,7 +1048,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" LIKE @' +
@@ -770,11 +1064,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND lower("string") LIKE lower(@' +
                                     value +
@@ -791,7 +1086,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate">@' +
                                     cdate;
@@ -804,7 +1099,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate">@' +
                                     mdate;
@@ -818,11 +1113,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number">@' +
                                     value +
@@ -839,7 +1135,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate">=@' +
                                     cdate;
@@ -852,7 +1148,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate">=@' +
                                     mdate;
@@ -866,11 +1162,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number">=@' +
                                     value +
@@ -887,7 +1184,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate"<@' +
                                     cdate;
@@ -900,7 +1197,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate"<@' +
                                     mdate;
@@ -914,11 +1211,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number"<@' +
                                     value +
@@ -935,7 +1233,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate"<=@' +
                                     cdate;
@@ -948,7 +1246,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate"<=@' +
                                     mdate;
@@ -962,11 +1260,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    SQLite3Driver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number"<=@' +
                                     value +
@@ -993,11 +1292,12 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                         const name = `param${++count.i}`;
                         const guid = `param${++count.i}`;
                         curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                ieTable +
-                                '."guid" IN (SELECT "guid" FROM ' +
+                            (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                'EXISTS (SELECT "guid" FROM ' +
                                 SQLite3Driver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE "name"=@' +
+                                ' WHERE "guid"=' +
+                                ieTable +
+                                '."guid" AND "name"=@' +
                                 name +
                                 ' AND "reference"=@' +
                                 guid +
@@ -1012,29 +1312,37 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
                         curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                            (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                 '(' +
                                 subquery.query +
                                 ')';
                         break;
                     case 'qref':
                     case '!qref':
+                        const referenceTableSuffix = makeTableSuffix();
                         const [qrefOptions, ...qrefSelectors] = curValue[1];
                         const QrefEntityClass = qrefOptions.class;
                         etypes.push(QrefEntityClass.ETYPE);
-                        const qrefQuery = this.makeEntityQuery({ ...qrefOptions, return: 'guid', class: QrefEntityClass }, qrefSelectors, QrefEntityClass.ETYPE, count, params, false, (0, guid_1.makeTableSuffix)(), etypes);
+                        const qrefQuery = this.makeEntityQuery({ ...qrefOptions, return: 'guid', class: QrefEntityClass }, qrefSelectors, QrefEntityClass.ETYPE, count, params, false, makeTableSuffix(), etypes, 'r' + referenceTableSuffix + '."reference"');
                         if (curQuery) {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
                         const qrefName = `param${++count.i}`;
                         curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                ieTable +
-                                '."guid" IN (SELECT "guid" FROM ' +
+                            (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                'EXISTS (SELECT "guid" FROM ' +
                                 SQLite3Driver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE "name"=@' +
+                                ' r' +
+                                referenceTableSuffix +
+                                ' WHERE r' +
+                                referenceTableSuffix +
+                                '."guid"=' +
+                                ieTable +
+                                '."guid" AND r' +
+                                referenceTableSuffix +
+                                '."name"=@' +
                                 qrefName +
-                                ' AND "reference" IN (' +
+                                ' AND EXISTS (' +
                                 qrefQuery.query +
                                 '))';
                         params[qrefName] = curValue[0];
@@ -1044,18 +1352,31 @@ class SQLite3Driver extends nymph_1.NymphDriver {
             return curQuery;
         });
         let sortBy;
+        let sortByInner;
+        let sortJoin = '';
+        const order = options.reverse ? ' DESC' : '';
         switch (sort) {
             case 'mdate':
-                sortBy = '"mdate"';
+                sortBy = `${eTable}."mdate"${order}`;
+                sortByInner = `${ieTable}."mdate"${order}`;
                 break;
             case 'cdate':
+                sortBy = `${eTable}."cdate"${order}`;
+                sortByInner = `${ieTable}."cdate"${order}`;
+                break;
             default:
-                sortBy = '"cdate"';
+                const name = `param${++count.i}`;
+                sortJoin = `LEFT JOIN (
+            SELECT "guid", "string", "number"
+            FROM ${SQLite3Driver.escape(this.prefix + 'data_' + etype)}
+            WHERE "name"=@${name}
+            ORDER BY "number"${order}, "string"${order}
+          ) ${sTable} USING ("guid")`;
+                sortBy = `${sTable}."number"${order}, ${sTable}."string"${order}`;
+                sortByInner = sortBy;
+                params[name] = sort;
                 break;
         }
-        if (options.reverse) {
-            sortBy += ' DESC';
-        }
         let query;
         if (queryParts.length) {
             if (subquery) {
@@ -1071,25 +1392,29 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                     offset = ` OFFSET ${Math.floor(Number(options.offset))}`;
                 }
                 const whereClause = queryParts.join(') AND (');
+                const guidClause = guidSelector
+                    ? `${ieTable}."guid"=${guidSelector} AND `
+                    : '';
                 if (options.return === 'count') {
                     if (limit || offset) {
                         query = `SELECT COUNT("guid") AS "count" FROM (
                 SELECT "guid"
                 FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-                WHERE (${whereClause})${limit}${offset}
+                WHERE ${guidClause}(${whereClause})${limit}${offset}
               )`;
                     }
                     else {
                         query = `SELECT COUNT("guid") AS "count"
               FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-              WHERE (${whereClause})`;
+              WHERE ${guidClause}(${whereClause})`;
                     }
                 }
                 else if (options.return === 'guid') {
                     query = `SELECT "guid"
             FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-            WHERE (${whereClause})
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoin}
+            WHERE ${guidClause}(${whereClause})
+            ORDER BY ${sortByInner}, "guid"${limit}${offset}`;
                 }
                 else {
                     query = `SELECT
@@ -1099,18 +1424,20 @@ class SQLite3Driver extends nymph_1.NymphDriver {
               ${eTable}."mdate",
               ${dTable}."name",
               ${dTable}."value",
-              ${cTable}."string",
-              ${cTable}."number"
+              json(${dTable}."json") as "json",
+              ${dTable}."string",
+              ${dTable}."number"
             FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${eTable}
             LEFT JOIN ${SQLite3Driver.escape(this.prefix + 'data_' + etype)} ${dTable} USING ("guid")
-            INNER JOIN ${SQLite3Driver.escape(this.prefix + 'comparisons_' + etype)} ${cTable} USING ("guid", "name")
+            ${sortJoin}
             INNER JOIN (
               SELECT "guid"
               FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-              WHERE (${whereClause})
-              ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+              ${sortJoin}
+              WHERE ${guidClause}(${whereClause})
+              ORDER BY ${sortByInner}${limit}${offset}
             ) ${fTable} USING ("guid")
-            ORDER BY ${eTable}.${sortBy}`;
+            ORDER BY ${sortBy}, ${eTable}."guid"`;
                 }
             }
         }
@@ -1127,22 +1454,27 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 if ('offset' in options) {
                     offset = ` OFFSET ${Math.floor(Number(options.offset))}`;
                 }
+                const guidClause = guidSelector
+                    ? ` WHERE ${ieTable}."guid"=${guidSelector}`
+                    : '';
                 if (options.return === 'count') {
                     if (limit || offset) {
                         query = `SELECT COUNT("guid") AS "count" FROM (
                 SELECT "guid"
-                FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}${limit}${offset}
+                FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}${guidClause}${limit}${offset}
               )`;
                     }
                     else {
                         query = `SELECT COUNT("guid") AS "count"
-              FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}`;
+              FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}${guidClause}`;
                     }
                 }
                 else if (options.return === 'guid') {
                     query = `SELECT "guid"
             FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoin}
+            ${guidClause}
+            ORDER BY ${sortByInner}, "guid"${limit}${offset}`;
                 }
                 else {
                     if (limit || offset) {
@@ -1153,17 +1485,20 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 ${eTable}."mdate",
                 ${dTable}."name",
                 ${dTable}."value",
-                ${cTable}."string",
-                ${cTable}."number"
+                json(${dTable}."json") as "json",
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${eTable}
               LEFT JOIN ${SQLite3Driver.escape(this.prefix + 'data_' + etype)} ${dTable} USING ("guid")
-              INNER JOIN ${SQLite3Driver.escape(this.prefix + 'comparisons_' + etype)} c USING ("guid", "name")
+              ${sortJoin}
               INNER JOIN (
                 SELECT "guid"
                 FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-                ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+                ${sortJoin}
+                ${guidClause}
+                ORDER BY ${sortByInner}${limit}${offset}
               ) ${fTable} USING ("guid")
-              ORDER BY ${eTable}.${sortBy}`;
+              ORDER BY ${sortBy}, ${eTable}."guid"`;
                     }
                     else {
                         query = `SELECT
@@ -1173,12 +1508,14 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 ${eTable}."mdate",
                 ${dTable}."name",
                 ${dTable}."value",
-                ${cTable}."string",
-                ${cTable}."number"
+                json(${dTable}."json") as "json",
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${eTable}
               LEFT JOIN ${SQLite3Driver.escape(this.prefix + 'data_' + etype)} ${dTable} USING ("guid")
-              INNER JOIN ${SQLite3Driver.escape(this.prefix + 'comparisons_' + etype)} ${cTable} USING ("guid", "name")
-              ORDER BY ${eTable}.${sortBy}`;
+              ${sortJoin}
+              ${guidSelector ? `WHERE ${eTable}."guid"=${guidSelector}` : ''}
+              ORDER BY ${sortBy}, ${eTable}."guid"`;
                     }
                 }
             }
@@ -1194,20 +1531,22 @@ class SQLite3Driver extends nymph_1.NymphDriver {
     }
     performQuery(options, formattedSelectors, etype) {
         const { query, params, etypes } = this.makeEntityQuery(options, formattedSelectors, etype);
-        const result = this.queryIter(query, { etypes, params })[Symbol.iterator]();
+        const result = this.queryArray(query, { etypes, params })[Symbol.iterator]();
         return {
             result,
         };
     }
     async getEntities(options = {}, ...selectors) {
-        return this.getEntitiesSync(options, ...selectors);
-    }
-    getEntitiesSync(options = {}, ...selectors) {
-        const { result, process } = this.getEntitesRowLike(options, selectors, (options, formattedSelectors, etype) => this.performQuery(options, formattedSelectors, etype), () => {
+        const { result, process } = this.getEntitiesRowLike(options, selectors, ({ options, selectors, etype }) => this.performQuery(options, selectors, etype), () => {
             const next = result.next();
             return next.done ? null : next.value;
         }, () => undefined, (row) => Number(row.count), (row) => row.guid, (row) => ({
-            tags: row.tags.length > 2 ? row.tags.slice(1, -1).split(',') : [],
+            tags: row.tags.length > 2
+                ? row.tags
+                    .slice(1, -1)
+                    .split(',')
+                    .filter((tag) => tag)
+                : [],
             cdate: Number(row.cdate),
             mdate: Number(row.mdate),
         }), (row) => ({
@@ -1216,7 +1555,9 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 ? JSON.stringify(row.number)
                 : row.value === 'S'
                     ? JSON.stringify(row.string)
-                    : row.value,
+                    : row.value === 'J'
+                        ? row.json
+                        : row.value,
         }));
         const value = process();
         if (value instanceof Error) {
@@ -1226,7 +1567,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
     }
     async getUID(name) {
         if (name == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
         const result = this.queryGet(`SELECT "cur_uid" FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
             params: {
@@ -1235,10 +1576,15 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         });
         return result?.cur_uid ?? null;
     }
-    async import(filename) {
-        this.checkReadOnlyMode();
+    async importEntity(entity) {
+        return await this.importEntityInternal(entity, false);
+    }
+    async importEntityTokens(entity) {
+        return await this.importEntityInternal(entity, true);
+    }
+    async importEntityInternal({ guid, cdate, mdate, tags, sdata, etype, }, onlyTokens) {
         try {
-            return this.importFromFile(filename, async (guid, tags, sdata, etype) => {
+            if (!onlyTokens) {
                 this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=@guid;`, {
                     etypes: [etype],
                     params: {
@@ -1251,29 +1597,37 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                         guid,
                     },
                 });
-                this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} WHERE "guid"=@guid;`, {
+                this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=@guid;`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 });
-                this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=@guid;`, {
+            }
+            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=@guid;`, {
+                etypes: [etype],
+                params: {
+                    guid,
+                },
+            });
+            if (!onlyTokens) {
+                this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=@guid;`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 });
+            }
+            if (!onlyTokens) {
                 this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (@guid, @tags, @cdate, @mdate);`, {
                     etypes: [etype],
                     params: {
                         guid,
                         tags: ',' + tags.join(',') + ',',
-                        cdate: Number(JSON.parse(sdata.cdate)),
-                        mdate: Number(JSON.parse(sdata.mdate)),
+                        cdate,
+                        mdate,
                     },
                 });
-                delete sdata.cdate;
-                delete sdata.mdate;
                 for (const name in sdata) {
                     const value = sdata[name];
                     const uvalue = JSON.parse(value);
@@ -1284,23 +1638,18 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                         ? 'N'
                         : typeof uvalue === 'string'
                             ? 'S'
-                            : value;
-                    this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value") VALUES (@guid, @name, @storageValue);`, {
+                            : 'J';
+                    const jsonValue = storageValue === 'J' ? value : null;
+                    this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value", "json", "string", "number", "truthy") VALUES (@guid, @name, @storageValue, jsonb(@jsonValue), @string, @number, @truthy);`, {
                         etypes: [etype],
                         params: {
                             guid,
                             name,
                             storageValue,
-                        },
-                    });
-                    this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} ("guid", "name", "truthy", "string", "number") VALUES (@guid, @name, @truthy, @string, @number);`, {
-                        etypes: [etype],
-                        params: {
-                            guid,
-                            name,
-                            truthy: uvalue ? 1 : 0,
-                            string: `${uvalue}`,
+                            jsonValue,
+                            string: storageValue === 'J' ? null : `${uvalue}`,
                             number: Number(uvalue),
+                            truthy: uvalue ? 1 : 0,
                         },
                     });
                     const references = this.findReferences(value);
@@ -1315,41 +1664,113 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                         });
                     }
                 }
-            }, async (name, curUid) => {
-                this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
-                    params: {
-                        name,
-                    },
-                });
-                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}uids`)} ("name", "cur_uid") VALUES (@name, @curUid);`, {
-                    params: {
-                        name,
-                        curUid,
-                    },
+            }
+            const EntityClass = this.nymph.getEntityClassByEtype(etype);
+            for (let name in sdata) {
+                let tokenString = null;
+                try {
+                    tokenString = EntityClass.getFTSText(name, JSON.parse(sdata[name]));
+                }
+                catch (e) {
+                    // Ignore error.
+                }
+                if (tokenString != null) {
+                    const tokens = this.tokenizer.tokenize(tokenString);
+                    while (tokens.length) {
+                        const currentTokens = tokens.splice(0, 100);
+                        const params = {
+                            guid,
+                            name,
+                        };
+                        const values = [];
+                        for (let i = 0; i < currentTokens.length; i++) {
+                            const token = currentTokens[i];
+                            params['token' + i] = token.token;
+                            params['position' + i] = token.position;
+                            params['stem' + i] = token.stem ? 1 : 0;
+                            values.push('(@guid, @name, @token' +
+                                i +
+                                ', @position' +
+                                i +
+                                ', @stem' +
+                                i +
+                                ')');
+                        }
+                        this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} ("guid", "name", "token", "position", "stem") VALUES ${values.join(', ')};`, {
+                            etypes: [etype],
+                            params,
+                        });
+                    }
+                }
+            }
+            if (!onlyTokens) {
+                const uniques = await EntityClass.getUniques({
+                    guid,
+                    cdate,
+                    mdate,
+                    tags,
+                    data: {},
+                    sdata,
                 });
-            }, async () => {
-                await this.startTransaction('nymph-import');
-            }, async () => {
-                await this.commit('nymph-import');
+                for (const unique of uniques) {
+                    try {
+                        this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}uniques_${etype}`)} ("guid", "unique") VALUES (@guid, @unique);`, {
+                            etypes: [etype],
+                            params: {
+                                guid,
+                                unique,
+                            },
+                        });
+                    }
+                    catch (e) {
+                        if (e instanceof EntityUniqueConstraintError) {
+                            this.nymph.config.debugError('sqlite3', `Import entity unique constraint violation for GUID "${guid}" on etype "${etype}": "${unique}"`);
+                        }
+                        throw e;
+                    }
+                }
+            }
+        }
+        catch (e) {
+            this.nymph.config.debugError('sqlite3', `Import entity error: "${e}"`);
+            throw e;
+        }
+    }
+    async importUID({ name, value }) {
+        try {
+            await this.startTransaction(`nymph-import-uid-${name}`);
+            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
+                params: {
+                    name,
+                },
+            });
+            this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}uids`)} ("name", "cur_uid") VALUES (@name, @value);`, {
+                params: {
+                    name,
+                    value,
+                },
             });
+            await this.commit(`nymph-import-uid-${name}`);
         }
         catch (e) {
-            await this.rollback('nymph-import');
+            this.nymph.config.debugError('sqlite3', `Import UID error: "${e}"`);
+            await this.rollback(`nymph-import-uid-${name}`);
             throw e;
         }
     }
     async newUID(name) {
         if (name == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
-        this.checkReadOnlyMode();
         await this.startTransaction('nymph-newuid');
+        let curUid = undefined;
         try {
-            let curUid = this.queryGet(`SELECT "cur_uid" FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
-                params: {
-                    name,
-                },
-            })?.cur_uid ?? null;
+            curUid =
+                this.queryGet(`SELECT "cur_uid" FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
+                    params: {
+                        name,
+                    },
+                })?.cur_uid ?? null;
             if (curUid == null) {
                 curUid = 1;
                 this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}uids`)} ("name", "cur_uid") VALUES (@name, @curUid);`, {
@@ -1368,41 +1789,50 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                     },
                 });
             }
-            await this.commit('nymph-newuid');
-            return curUid;
         }
         catch (e) {
+            this.nymph.config.debugError('sqlite3', `New UID error: "${e}"`);
             await this.rollback('nymph-newuid');
             throw e;
         }
+        await this.commit('nymph-newuid');
+        return curUid;
     }
     async renameUID(oldName, newName) {
         if (oldName == null || newName == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
-        this.checkReadOnlyMode();
+        await this.startTransaction('nymph-rename-uid');
         this.queryRun(`UPDATE ${SQLite3Driver.escape(`${this.prefix}uids`)} SET "name"=@newName WHERE "name"=@oldName;`, {
             params: {
                 newName,
                 oldName,
             },
         });
+        await this.commit('nymph-rename-uid');
         return true;
     }
     async rollback(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
-            throw new nymph_1.InvalidParametersError('Transaction rollback attempted without a name.');
+            throw new InvalidParametersError('Transaction rollback attempted without a name.');
         }
         if (this.store.transactionsStarted === 0) {
             return true;
         }
         this.queryRun(`ROLLBACK TO SAVEPOINT ${SQLite3Driver.escape(name)};`);
         this.store.transactionsStarted--;
+        if (this.store.transactionsStarted === 0 &&
+            this.store.linkWrite &&
+            !this.config.explicitWrite) {
+            this.store.linkWrite.exec('PRAGMA optimize;');
+            this.store.linkWrite.close();
+            this.store.linkWrite = undefined;
+        }
         return true;
     }
     async saveEntity(entity) {
-        this.checkReadOnlyMode();
-        const insertData = (guid, data, sdata, etype) => {
+        const insertData = (guid, data, sdata, uniques, etype) => {
+            const EntityClass = this.nymph.getEntityClassByEtype(etype);
             const runInsertQuery = (name, value, svalue) => {
                 if (value === undefined) {
                     return;
@@ -1411,23 +1841,18 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                     ? 'N'
                     : typeof value === 'string'
                         ? 'S'
-                        : svalue;
-                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value") VALUES (@guid, @name, @storageValue);`, {
+                        : 'J';
+                const jsonValue = storageValue === 'J' ? svalue : null;
+                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value", "json", "string", "number", "truthy") VALUES (@guid, @name, @storageValue, jsonb(@jsonValue), @string, @number, @truthy);`, {
                     etypes: [etype],
                     params: {
                         guid,
                         name,
                         storageValue,
-                    },
-                });
-                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} ("guid", "name", "truthy", "string", "number") VALUES (@guid, @name, @truthy, @string, @number);`, {
-                    etypes: [etype],
-                    params: {
-                        guid,
-                        name,
-                        truthy: value ? 1 : 0,
-                        string: `${value}`,
+                        jsonValue,
+                        string: storageValue === 'J' ? null : `${value}`,
                         number: Number(value),
+                        truthy: value ? 1 : 0,
                     },
                 });
                 const references = this.findReferences(svalue);
@@ -1441,7 +1866,59 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                         },
                     });
                 }
+                let tokenString = null;
+                try {
+                    tokenString = EntityClass.getFTSText(name, value);
+                }
+                catch (e) {
+                    // Ignore error.
+                }
+                if (tokenString != null) {
+                    const tokens = this.tokenizer.tokenize(tokenString);
+                    while (tokens.length) {
+                        const currentTokens = tokens.splice(0, 100);
+                        const params = {
+                            guid,
+                            name,
+                        };
+                        const values = [];
+                        for (let i = 0; i < currentTokens.length; i++) {
+                            const token = currentTokens[i];
+                            params['token' + i] = token.token;
+                            params['position' + i] = token.position;
+                            params['stem' + i] = token.stem ? 1 : 0;
+                            values.push('(@guid, @name, @token' +
+                                i +
+                                ', @position' +
+                                i +
+                                ', @stem' +
+                                i +
+                                ')');
+                        }
+                        this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} ("guid", "name", "token", "position", "stem") VALUES ${values.join(', ')};`, {
+                            etypes: [etype],
+                            params,
+                        });
+                    }
+                }
             };
+            for (const unique of uniques) {
+                try {
+                    this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}uniques_${etype}`)} ("guid", "unique") VALUES (@guid, @unique);`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                            unique,
+                        },
+                    });
+                }
+                catch (e) {
+                    if (e instanceof EntityUniqueConstraintError) {
+                        this.nymph.config.debugError('sqlite3', `Save entity unique constraint violation for GUID "${guid}" on etype "${etype}": "${unique}"`);
+                    }
+                    throw e;
+                }
+            }
             for (const name in data) {
                 runInsertQuery(name, data[name], JSON.stringify(data[name]));
             }
@@ -1449,8 +1926,13 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 runInsertQuery(name, JSON.parse(sdata[name]), sdata[name]);
             }
         };
+        let inTransaction = false;
         try {
-            return this.saveEntityRowLike(entity, async (_entity, guid, tags, data, sdata, cdate, etype) => {
+            return this.saveEntityRowLike(entity, async ({ guid, tags, data, sdata, uniques, cdate, etype }) => {
+                if (Object.keys(data).length === 0 &&
+                    Object.keys(sdata).length === 0) {
+                    return false;
+                }
                 this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (@guid, @tags, @cdate, @cdate);`, {
                     etypes: [etype],
                     params: {
@@ -1459,9 +1941,13 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                         cdate,
                     },
                 });
-                insertData(guid, data, sdata, etype);
+                insertData(guid, data, sdata, uniques, etype);
                 return true;
-            }, async (entity, guid, tags, data, sdata, mdate, etype) => {
+            }, async ({ entity, guid, tags, data, sdata, uniques, mdate, etype }) => {
+                if (Object.keys(data).length === 0 &&
+                    Object.keys(sdata).length === 0) {
+                    return false;
+                }
                 const info = this.queryRun(`UPDATE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate WHERE "guid"=@guid AND "mdate" <= @emdate;`, {
                     etypes: [etype],
                     params: {
@@ -1479,44 +1965,57 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                             guid,
                         },
                     });
-                    this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}comparisons_${etype}`)} WHERE "guid"=@guid;`, {
+                    this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=@guid;`, {
                         etypes: [etype],
                         params: {
                             guid,
                         },
                     });
-                    this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=@guid;`, {
+                    this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=@guid;`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                        },
+                    });
+                    this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=@guid;`, {
                         etypes: [etype],
                         params: {
                             guid,
                         },
                     });
-                    insertData(guid, data, sdata, etype);
+                    insertData(guid, data, sdata, uniques, etype);
                     success = true;
                 }
                 return success;
             }, async () => {
                 await this.startTransaction('nymph-save');
+                inTransaction = true;
             }, async (success) => {
-                if (success) {
-                    await this.commit('nymph-save');
-                }
-                else {
-                    await this.rollback('nymph-save');
+                if (inTransaction) {
+                    inTransaction = false;
+                    if (success) {
+                        await this.commit('nymph-save');
+                    }
+                    else {
+                        await this.rollback('nymph-save');
+                    }
                 }
                 return success;
             });
         }
         catch (e) {
-            await this.rollback('nymph-save');
+            this.nymph.config.debugError('sqlite3', `Save entity error: "${e}"`);
+            if (inTransaction) {
+                await this.rollback('nymph-save');
+            }
             throw e;
         }
     }
     async setUID(name, curUid) {
         if (name == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
-        this.checkReadOnlyMode();
+        await this.startTransaction('nymph-set-uid');
         this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
             params: {
                 name,
@@ -1528,16 +2027,54 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 curUid,
             },
         });
+        await this.commit('nymph-set-uid');
         return true;
     }
+    async internalTransaction(name) {
+        await this.startTransaction(name);
+    }
     async startTransaction(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
-            throw new nymph_1.InvalidParametersError('Transaction start attempted without a name.');
+            throw new InvalidParametersError('Transaction start attempted without a name.');
+        }
+        if (!this.config.explicitWrite && !this.store.linkWrite) {
+            this._connect(true);
         }
         this.queryRun(`SAVEPOINT ${SQLite3Driver.escape(name)};`);
         this.store.transactionsStarted++;
         return this.nymph;
     }
+    async needsMigration() {
+        const table = this.queryGet("SELECT `name` FROM `sqlite_master` WHERE `type`='table' AND `name` LIKE @prefix LIMIT 1;", {
+            params: {
+                prefix: this.prefix + 'data_' + '%',
+            },
+        });
+        if (table?.name) {
+            const result = this.queryGet("SELECT 1 AS `exists` FROM pragma_table_info(@table) WHERE `name`='json';", {
+                params: {
+                    table: table.name,
+                },
+            });
+            if (!result?.exists) {
+                return 'json';
+            }
+        }
+        const table2 = this.queryGet("SELECT `name` FROM `sqlite_master` WHERE `type`='table' AND `name` LIKE @tokenTable LIMIT 1;", {
+            params: {
+                tokenTable: this.prefix + 'tokens_' + '%',
+            },
+        });
+        if (!table2 || !table2.name) {
+            return 'tokens';
+        }
+        return false;
+    }
+    async liveMigration(_migrationType) {
+        const etypes = await this.getEtypes();
+        for (let etype of etypes) {
+            this.createTokensTable(etype);
+        }
+    }
 }
-exports.default = SQLite3Driver;
 //# sourceMappingURL=SQLite3Driver.js.map