@nymphjs/driver-sqlite3 1.0.0-beta.13 → 1.0.0-beta.130

package/src/SQLite3Driver.ts

@@ -1,17 +1,28 @@
-import SQLite3 from 'better-sqlite3';
+import { DatabaseSync } from 'node:sqlite';
+import type {
+  SearchTerm,
+  SearchOrTerm,
+  SearchNotTerm,
+  SearchSeriesTerm,
+} from '@sciactive/tokenizer';
 import {
   NymphDriver,
-  EntityConstructor,
-  EntityData,
-  EntityInterface,
-  SerializedEntityData,
+  type EntityConstructor,
+  type EntityData,
+  type EntityObjectType,
+  type EntityInterface,
+  type EntityInstanceType,
+  type SerializedEntityData,
+  type FormattedSelector,
+  type Options,
+  type Selector,
+  EntityConflictError,
+  EntityInvalidDataError,
+  EntityUniqueConstraintError,
   InvalidParametersError,
   NotConfiguredError,
   QueryFailedError,
   UnableToConnectError,
-  FormattedSelector,
-  Options,
-  Selector,
   xor,
 } from '@nymphjs/nymph';
 import { makeTableSuffix } from '@nymphjs/guid';
@@ -19,15 +30,15 @@ import { makeTableSuffix } from '@nymphjs/guid';
 import {
   SQLite3DriverConfig,
   SQLite3DriverConfigDefaults as defaults,
-} from './conf';
+} from './conf/index.js';
 
 class InternalStore {
-  public link: SQLite3.Database;
-  public linkWrite?: SQLite3.Database;
+  public link: DatabaseSync;
+  public linkWrite?: DatabaseSync;
   public connected: boolean = false;
   public transactionsStarted = 0;
 
-  constructor(link: SQLite3.Database) {
+  constructor(link: DatabaseSync) {
     this.link = link;
   }
 }
@@ -44,13 +55,17 @@ export default class SQLite3Driver extends NymphDriver {
   static escape(input: string) {
     if (input.indexOf('\x00') !== -1) {
       throw new InvalidParametersError(
-        'SQLite3 identifiers (like entity ETYPE) cannot contain null characters.'
+        'SQLite3 identifiers (like entity ETYPE) cannot contain null characters.',
       );
     }
 
     return '"' + input.replace(/"/g, () => '""') + '"';
   }
 
+  static escapeValue(input: string) {
+    return "'" + input.replace(/'/g, () => "''") + "'";
+  }
+
   constructor(config: Partial<SQLite3DriverConfig>, store?: InternalStore) {
     super();
     this.config = { ...defaults, ...config };
@@ -91,41 +106,56 @@ export default class SQLite3Driver extends NymphDriver {
   }
 
   private _connect(write: boolean) {
-    const { filename, fileMustExist, timeout, explicitWrite, wal, verbose } =
+    const { filename, fileMustExist, timeout, explicitWrite, wal } =
       this.config;
 
     try {
-      let link: SQLite3.Database;
+      const setOptions = (link: DatabaseSync) => {
+        // Set database and connection options.
+        if (wal) {
+          link.exec('PRAGMA journal_mode = WAL;');
+        }
+        link.exec('PRAGMA encoding = "UTF-8";');
+        link.exec('PRAGMA foreign_keys = 1;');
+        link.exec('PRAGMA case_sensitive_like = 1;');
+        for (let pragma of this.config.pragmas) {
+          link.exec(`PRAGMA ${pragma}`);
+        }
+        // Create the preg_match and regexp functions.
+        link.function('regexp', { deterministic: true }, ((
+          pattern: string,
+          subject: string,
+        ) => (this.posixRegexMatch(pattern, subject) ? 1 : 0)) as (
+          ...params: any[]
+        ) => any);
+      };
+
+      let link: DatabaseSync;
       try {
-        link = new SQLite3(filename, {
-          readonly: !explicitWrite && !write,
-          fileMustExist,
+        link = new DatabaseSync(filename, {
+          readOnly: !explicitWrite && !write,
           timeout,
-          verbose,
         });
       } catch (e: any) {
         if (
-          e.code === 'SQLITE_CANTOPEN' &&
+          e.code === 'ERR_SQLITE_CANTOPEN' &&
           !explicitWrite &&
           !write &&
-          !this.config.fileMustExist
+          !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,
+          const writeLink = new DatabaseSync(filename, {
+            readOnly: false,
             timeout,
-            verbose,
           });
+          setOptions(writeLink);
           writeLink.close();
           // Now open in readonly.
-          link = new SQLite3(filename, {
-            readonly: true,
-            fileMustExist,
+          link = new DatabaseSync(filename, {
+            readOnly: true,
             timeout,
-            verbose,
           });
         } else {
           throw e;
@@ -135,7 +165,7 @@ export default class SQLite3Driver extends NymphDriver {
       if (!this.store) {
         if (write) {
           throw new Error(
-            'Tried to open in write without opening in read first.'
+            'Tried to open in write without opening in read first.',
           );
         }
         this.store = new InternalStore(link);
@@ -145,20 +175,7 @@ export default class SQLite3Driver extends NymphDriver {
         this.store.link = link;
       }
       this.store.connected = true;
-      // 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;');
-      // Create the preg_match and regexp functions.
-      link.function(
-        'regexp',
-        { deterministic: true },
-        (pattern: string, subject: string) =>
-          this.posixRegexMatch(pattern, subject) ? 1 : 0
-      );
+      setOptions(link);
     } catch (e: any) {
       if (this.store) {
         this.store.connected = false;
@@ -166,7 +183,7 @@ export default class SQLite3Driver extends NymphDriver {
       if (filename === ':memory:') {
         throw new NotConfiguredError(
           "It seems the config hasn't been set up correctly. Could not connect: " +
-            e?.message
+            e?.message,
         );
       } else {
         throw new UnableToConnectError('Could not connect: ' + e?.message);
@@ -209,6 +226,231 @@ export default class SQLite3Driver extends NymphDriver {
     return this.store.connected;
   }
 
+  private createEntitiesTable(etype: string) {
+    // 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, "user" CHARACTER(24), "group" CHARACTER(24), "acUser" INT(1), "acGroup" INT(1), "acOther" INT(1), "acRead" TEXT, "acWrite" TEXT, "acFull" TEXT);`,
+    );
+    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.createEntitiesTilmeldIndexes(etype);
+  }
+
+  private addTilmeldColumnsAndIndexes(etype: string) {
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "user" CHARACTER(24);`,
+    );
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "group" CHARACTER(24);`,
+    );
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "acUser" INT(1);`,
+    );
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "acGroup" INT(1);`,
+    );
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "acOther" INT(1);`,
+    );
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "acRead" TEXT;`,
+    );
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "acWrite" TEXT;`,
+    );
+    this.queryRun(
+      `ALTER TABLE ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ADD COLUMN "acFull" TEXT;`,
+    );
+    this.createEntitiesTilmeldIndexes(etype);
+  }
+
+  private createEntitiesTilmeldIndexes(etype: string) {
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_user_acUser`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("user", "acUser");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_group_acGroup`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("group", "acGroup");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_acUser`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("acUser");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_acGroup`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("acGroup");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_acOther`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("acOther");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_acRead`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("acRead");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_acWrite`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("acWrite");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}_id_acFull`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}entities_${etype}`,
+      )} ("acFull");`,
+    );
+  }
+
+  private createDataTable(etype: string) {
+    // 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_name_guid`,
+      )} ON ${SQLite3Driver.escape(`${this.prefix}data_${etype}`)} ("name", "guid");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}_id_name_string_guid`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}`,
+      )} ("name", "string", "guid");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}_id_name_number_guid`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}`,
+      )} ("name", "number", "guid");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}_id_name_truthy_guid`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}`,
+      )} ("name", "truthy", "guid");`,
+    );
+    this.queryRun(
+      `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}_id_name_json_guid`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}data_${etype}`,
+      )} ("name", "json", "guid")`,
+    );
+  }
+
+  private createReferencesTable(etype: string) {
+    // 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_name_reference_guid`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}references_${etype}`,
+      )} ("name", "reference", "guid");`,
+    );
+  }
+
+  private createTokensTable(etype: string) {
+    // 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_guid`,
+      )} ON ${SQLite3Driver.escape(
+        `${this.prefix}tokens_${etype}`,
+      )} ("name", "token", "guid");`,
+    );
+  }
+
+  private createUniquesTable(etype: string) {
+    // 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.
    *
@@ -218,162 +460,41 @@ export default class SQLite3Driver extends NymphDriver {
     this.startTransaction('nymph-tablecreation');
     try {
       if (etype != null) {
-        // 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");`
-        );
-        // 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" 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\';`
-        );
-        // Create the comparisons table.
-        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;`
-        );
-        // 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_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.prefix}uids`,
+          )} ("name" TEXT PRIMARY KEY NOT NULL, "cur_uid" INTEGER NOT NULL);`,
         );
       }
-      this.commit('nymph-tablecreation');
-      return true;
     } catch (e: any) {
       this.rollback('nymph-tablecreation');
       throw e;
     }
+
+    this.commit('nymph-tablecreation');
+    return true;
   }
 
   private query<T extends () => any>(
     runQuery: T,
     query: string,
-    etypes: string[] = []
+    etypes: string[] = [],
   ): ReturnType<T> {
     try {
+      this.nymph.config.debugInfo('sqlite3:query', query);
       return runQuery();
     } catch (e: any) {
       const errorCode = e?.code;
       const errorMsg = e?.message;
       if (
-        errorCode === 'SQLITE_ERROR' &&
+        errorCode === 'ERR_SQLITE_ERROR' &&
         errorMsg.match(/^no such table: /) &&
         this.createTables()
       ) {
@@ -385,24 +506,31 @@ export default class SQLite3Driver extends NymphDriver {
         } catch (e2: any) {
           throw new QueryFailedError(
             'Query failed: ' + e2?.code + ' - ' + e2?.message,
-            query
+            query,
+            e2?.code,
           );
         }
+      } else if (
+        errorCode === 'ERR_SQLITE_ERROR' &&
+        errorMsg.match(/^UNIQUE constraint failed: /)
+      ) {
+        throw new EntityUniqueConstraintError(`Unique constraint violation.`);
       } else {
         throw new QueryFailedError(
           'Query failed: ' + e?.code + ' - ' + e?.message,
-          query
+          query,
+          e?.code,
         );
       }
     }
   }
 
-  private queryIter(
+  private queryArray(
     query: string,
     {
       etypes = [],
       params = {},
-    }: { etypes?: string[]; params?: { [k: string]: any } } = {}
+    }: { etypes?: string[]; params?: { [k: string]: any } } = {},
   ) {
     return this.query(
       () =>
@@ -410,7 +538,7 @@ export default class SQLite3Driver extends NymphDriver {
           .prepare(query)
           .iterate(params),
       `${query} -- ${JSON.stringify(params)}`,
-      etypes
+      etypes,
     );
   }
 
@@ -419,13 +547,13 @@ export default class SQLite3Driver extends NymphDriver {
     {
       etypes = [],
       params = {},
-    }: { etypes?: string[]; params?: { [k: string]: any } } = {}
+    }: { etypes?: string[]; params?: { [k: string]: any } } = {},
   ) {
     return this.query(
       () =>
         (this.store.linkWrite || this.store.link).prepare(query).get(params),
       `${query} -- ${JSON.stringify(params)}`,
-      etypes
+      etypes,
     );
   }
 
@@ -434,20 +562,20 @@ export default class SQLite3Driver extends NymphDriver {
     {
       etypes = [],
       params = {},
-    }: { etypes?: string[]; params?: { [k: string]: any } } = {}
+    }: { etypes?: string[]; params?: { [k: string]: any } } = {},
   ) {
     return this.query(
       () =>
         (this.store.linkWrite || this.store.link).prepare(query).run(params),
       `${query} -- ${JSON.stringify(params)}`,
-      etypes
+      etypes,
     );
   }
 
   public async commit(name: string) {
     if (name == null || typeof name !== 'string' || name.length === 0) {
       throw new InvalidParametersError(
-        'Transaction commit attempted without a name.'
+        'Transaction commit attempted without a name.',
       );
     }
     if (this.store.transactionsStarted === 0) {
@@ -471,7 +599,7 @@ export default class SQLite3Driver extends NymphDriver {
 
   public async deleteEntityByID(
     guid: string,
-    className?: EntityConstructor | string | null
+    className?: EntityConstructor | string | null,
   ) {
     let EntityClass: EntityConstructor;
     if (typeof className === 'string' || className == null) {
@@ -485,58 +613,71 @@ export default class SQLite3Driver extends NymphDriver {
     try {
       this.queryRun(
         `DELETE FROM ${SQLite3Driver.escape(
-          `${this.prefix}entities_${etype}`
+          `${this.prefix}entities_${etype}`,
         )} WHERE "guid"=@guid;`,
         {
           etypes: [etype],
           params: {
             guid,
           },
-        }
+        },
       );
       this.queryRun(
         `DELETE FROM ${SQLite3Driver.escape(
-          `${this.prefix}data_${etype}`
+          `${this.prefix}data_${etype}`,
         )} WHERE "guid"=@guid;`,
         {
           etypes: [etype],
           params: {
             guid,
           },
-        }
+        },
       );
       this.queryRun(
         `DELETE FROM ${SQLite3Driver.escape(
-          `${this.prefix}comparisons_${etype}`
+          `${this.prefix}references_${etype}`,
         )} WHERE "guid"=@guid;`,
         {
           etypes: [etype],
           params: {
             guid,
           },
-        }
+        },
       );
       this.queryRun(
         `DELETE FROM ${SQLite3Driver.escape(
-          `${this.prefix}references_${etype}`
+          `${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');
-      // Remove any cached versions of this entity.
-      if (this.nymph.config.cache) {
-        this.cleanCache(guid);
-      }
-      return true;
     } catch (e: any) {
+      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;
   }
 
   public async deleteUID(name: string) {
@@ -546,133 +687,383 @@ export default class SQLite3Driver extends NymphDriver {
     await this.startTransaction('nymph-delete-uid');
     this.queryRun(
       `DELETE FROM ${SQLite3Driver.escape(
-        `${this.prefix}uids`
+        `${this.prefix}uids`,
       )} WHERE "name"=@name;`,
       {
         params: {
           name,
         },
-      }
+      },
     );
     await this.commit('nymph-delete-uid');
     return true;
   }
 
-  protected async exportEntities(writeLine: (line: string) => void) {
-    writeLine('#nex2');
-    writeLine('# Nymph Entity Exchange v2');
-    writeLine('# http://nymph.io');
-    writeLine('#');
-    writeLine('# Generation Time: ' + new Date().toLocaleString());
-    writeLine('');
+  public async getIndexes(etype: string) {
+    const indexes: {
+      scope: 'data' | 'references' | 'tokens';
+      name: string;
+      property: string;
+    }[] = [];
+
+    for (let [scope, suffix] of [
+      ['data', '_string_guid'],
+      ['references', '_reference_guid'],
+      ['tokens', '_token_guid'],
+    ] as (
+      | ['data', '_string_guid']
+      | ['references', '_reference_guid']
+      | ['tokens', '_token_guid']
+    )[]) {
+      const indexDefinitions: IterableIterator<any> = this.queryArray(
+        `SELECT "name", "sql" FROM "sqlite_master" WHERE "type"='index' AND "name" LIKE @pattern;`,
+        {
+          params: {
+            pattern: `${this.prefix}${scope}_${etype}_id_custom_%${suffix}`,
+          },
+        },
+      );
+      for (const indexDefinition of indexDefinitions) {
+        indexes.push({
+          scope,
+          name: (indexDefinition.name as string).substring(
+            `${this.prefix}${scope}_${etype}_id_custom_`.length,
+            indexDefinition.name.length - suffix.length,
+          ),
+          property:
+            ((indexDefinition.sql as string).match(
+              /WHERE\s+"name"\s*=\s*'(.*)'/,
+            ) ?? [])[1] ?? '',
+        });
+      }
+    }
+
+    return indexes;
+  }
+
+  public async addIndex(
+    etype: string,
+    definition: {
+      scope: 'data' | 'references' | 'tokens';
+      name: string;
+      property: string;
+    },
+  ) {
+    this.checkIndexName(definition.name);
+    await this.deleteIndex(etype, definition.scope, definition.name);
+    if (definition.scope === 'data') {
+      this.queryRun(
+        `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${definition.name}_string_guid`,
+        )} ON ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}`,
+        )} ("string", "guid") WHERE "name"=${SQLite3Driver.escapeValue(definition.property)};`,
+      );
+      this.queryRun(
+        `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${definition.name}_number_guid`,
+        )} ON ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}`,
+        )} ("number", "guid") WHERE "name"=${SQLite3Driver.escapeValue(definition.property)};`,
+      );
+      this.queryRun(
+        `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${definition.name}_truthy_guid`,
+        )} ON ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}`,
+        )} ("truthy", "guid") WHERE "name"=${SQLite3Driver.escapeValue(definition.property)};`,
+      );
+      this.queryRun(
+        `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${definition.name}_json_guid`,
+        )} ON ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}`,
+        )} ("json", "guid") WHERE "name"=${SQLite3Driver.escapeValue(definition.property)};`,
+      );
+    } else if (definition.scope === 'references') {
+      this.queryRun(
+        `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}references_${etype}_id_custom_${definition.name}_reference_guid`,
+        )} ON ${SQLite3Driver.escape(
+          `${this.prefix}references_${etype}`,
+        )} ("reference", "guid") WHERE "name"=${SQLite3Driver.escapeValue(definition.property)};`,
+      );
+    } else if (definition.scope === 'tokens') {
+      this.queryRun(
+        `CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}tokens_${etype}_id_custom_${definition.name}_token_guid`,
+        )} ON ${SQLite3Driver.escape(
+          `${this.prefix}tokens_${etype}`,
+        )} ("token", "guid") WHERE "name"=${SQLite3Driver.escapeValue(definition.property)};`,
+      );
+    }
+    return true;
+  }
+
+  public async deleteIndex(
+    etype: string,
+    scope: 'data' | 'references' | 'tokens',
+    name: string,
+  ) {
+    this.checkIndexName(name);
+    if (scope === 'data') {
+      this.queryRun(
+        `DROP INDEX IF EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${name}_string_guid`,
+        )};`,
+      );
+      this.queryRun(
+        `DROP INDEX IF EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${name}_number_guid`,
+        )};`,
+      );
+      this.queryRun(
+        `DROP INDEX IF EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${name}_truthy_guid`,
+        )};`,
+      );
+      this.queryRun(
+        `DROP INDEX IF EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}data_${etype}_id_custom_${name}_json_guid`,
+        )};`,
+      );
+    } else if (scope === 'references') {
+      this.queryRun(
+        `DROP INDEX IF EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}references_${etype}_id_custom_${name}_reference_guid`,
+        )};`,
+      );
+    } else if (scope === 'tokens') {
+      this.queryRun(
+        `DROP INDEX IF EXISTS ${SQLite3Driver.escape(
+          `${this.prefix}tokens_${etype}_id_custom_${name}_token_guid`,
+        )};`,
+      );
+    }
+    return true;
+  }
+
+  public async getEtypes() {
+    const tables: IterableIterator<any> = this.queryArray(
+      `SELECT "name" FROM "sqlite_master" WHERE "type"='table' AND "name" LIKE @prefix;`,
+      {
+        params: {
+          prefix: this.prefix + 'entities_' + '%',
+        },
+      },
+    );
+    const etypes: string[] = [];
+    for (const table of tables) {
+      etypes.push(table.name.substr((this.prefix + 'entities_').length));
+    }
+
+    return etypes;
+  }
+
+  public async *exportDataIterator(): AsyncGenerator<
+    { type: 'comment' | 'uid' | 'entity'; content: string },
+    void,
+    false | undefined
+  > {
+    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
+#
 
-    writeLine('#');
-    writeLine('# UIDs');
-    writeLine('#');
-    writeLine('');
+`,
+      }
+    ) {
+      return;
+    }
 
     // Export UIDs.
-    let uids = this.queryIter(
+    let uids: IterableIterator<any> = this.queryArray(
       `SELECT * FROM ${SQLite3Driver.escape(
-        `${this.prefix}uids`
-      )} ORDER BY "name";`
+        `${this.prefix}uids`,
+      )} ORDER BY "name";`,
     );
     for (const uid of uids) {
-      writeLine(`<${uid.name}>[${uid.cur_uid}]`);
+      if (yield { type: 'uid', content: `<${uid.name}>[${uid.cur_uid}]\n` }) {
+        return;
+      }
     }
 
-    writeLine('');
-    writeLine('#');
-    writeLine('# Entities');
-    writeLine('#');
-    writeLine('');
+    if (
+      yield {
+        type: 'comment',
+        content: `
 
-    // Get the etypes.
-    const tables = this.queryIter(
-      "SELECT name FROM sqlite_master WHERE type = 'table' ORDER BY name;"
-    );
-    const etypes = [];
-    for (const table of tables) {
-      if (table.name.startsWith(this.prefix + 'entities_')) {
-        etypes.push(table.name.substr((this.prefix + 'entities_').length));
+#
+# Entities
+#
+
+`,
       }
+    ) {
+      return;
     }
 
+    // Get the etypes.
+    const etypes = await this.getEtypes();
+
     for (const etype of etypes) {
       // Export entities.
-      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]();
-      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) {
-          // 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'
-                ? JSON.stringify(datum.value.number)
-                : datum.value.dvalue === 'S'
-                ? JSON.stringify(datum.value.string)
-                : datum.value.dvalue;
-            writeLine(`\t${datum.value.dname}=${value}`);
-            datum = dataIterator.next();
-          } while (!datum.done && datum.value.guid === guid);
-        } else {
-          // Make sure that datum is incremented :)
-          datum = dataIterator.next();
-        }
+      const entityIterator = this.exportEntityInternal(etype);
+      for await (let content of entityIterator) {
+        yield { type: 'entity', content };
       }
     }
+  }
+
+  public async exportEntity(etype: string, guid: string): Promise<string> {
+    const entityIterator = this.exportEntityInternal(etype, guid);
+    let exportContent = '';
+    for await (let content of entityIterator) {
+      exportContent += content;
+    }
 
-    return;
+    return exportContent;
   }
 
-  /**
-   * 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.
-   */
-  private makeEntityQuery(
-    options: Options,
-    formattedSelectors: FormattedSelector[],
+  private async *exportEntityInternal(
     etype: string,
-    count = { i: 0 },
-    params: { [k: string]: any } = {},
-    subquery = false,
+    guid?: string,
+  ): AsyncGenerator<string, void, false | undefined> {
+    // Export entities.
+    const dataIterator: IterableIterator<any> = this.queryArray(
+      `SELECT e."guid", e."tags", e."cdate", e."mdate", e."user", e."group", e."acUser", e."acGroup", e."acOther", e."acRead", e."acWrite", e."acFull", 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")${guid == null ? '' : ` WHERE e."guid"=@guid`} ORDER BY e."guid", d."name";`,
+      guid == null ? undefined : { params: { 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;
+      const user = datum.value.user;
+      const group = datum.value.group;
+      const acUser = datum.value.acUser;
+      const acGroup = datum.value.acGroup;
+      const acOther = datum.value.acOther;
+      const acRead = datum.value.acRead?.slice(1, -1).split(',');
+      const acWrite = datum.value.acWrite?.slice(1, -1).split(',');
+      const acFull = datum.value.acFull?.slice(1, -1).split(',');
+      let currentEntityExport: string[] = [];
+      currentEntityExport.push(`{${guid}}<${etype}>[${tags}]`);
+      currentEntityExport.push(`\tcdate=${JSON.stringify(cdate)}`);
+      currentEntityExport.push(`\tmdate=${JSON.stringify(mdate)}`);
+      if (this.nymph.tilmeld != null) {
+        if (user != null) {
+          currentEntityExport.push(
+            `\tuser=${JSON.stringify(['nymph_entity_reference', user, 'User'])}`,
+          );
+        }
+        if (group != null) {
+          currentEntityExport.push(
+            `\tgroup=${JSON.stringify(['nymph_entity_reference', group, 'Group'])}`,
+          );
+        }
+        if (acUser != null) {
+          currentEntityExport.push(`\tacUser=${JSON.stringify(acUser)}`);
+        }
+        if (acGroup != null) {
+          currentEntityExport.push(`\tacGroup=${JSON.stringify(acGroup)}`);
+        }
+        if (acOther != null) {
+          currentEntityExport.push(`\tacOther=${JSON.stringify(acOther)}`);
+        }
+        if (acRead != null) {
+          currentEntityExport.push(`\tacRead=${JSON.stringify(acRead)}`);
+        }
+        if (acWrite != null) {
+          currentEntityExport.push(`\tacWrite=${JSON.stringify(acWrite)}`);
+        }
+        if (acFull != null) {
+          currentEntityExport.push(`\tacFull=${JSON.stringify(acFull)}`);
+        }
+      }
+      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.value === 'N'
+              ? JSON.stringify(datum.value.number)
+              : datum.value.value === 'S'
+                ? JSON.stringify(datum.value.string)
+                : 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 currentEntityExport.join('\n')) {
+        return;
+      }
+    }
+  }
+
+  /**
+   * 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.
+   */
+  private makeEntityQuery(
+    options: Options,
+    formattedSelectors: FormattedSelector[],
+    etype: string,
+    count = { i: 0 },
+    params: { [k: string]: any } = {},
+    subquery = false,
     tableSuffix = '',
-    etypes: string[] = []
+    etypes: string[] = [],
+    guidSelector: string | undefined = 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 sort = options.sort ?? 'cdate';
+    const sTable = `s${tableSuffix}`;
+    const sort = options.sort === undefined ? 'cdate' : options.sort;
     const queryParts = this.iterateSelectorsForQuery(
       formattedSelectors,
-      (key, value, typeIsOr, typeIsNot) => {
+      ({ key, value, typeIsOr, typeIsNot }) => {
         const clauseNot = key.startsWith('!');
         let curQuery = '';
         for (const curValue of value) {
@@ -720,17 +1111,39 @@ export default class SQLite3Driver extends NymphDriver {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const name = `param${++count.i}`;
-                curQuery +=
-                  ieTable +
-                  '."guid" ' +
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  'IN (SELECT "guid" FROM ' +
-                  SQLite3Driver.escape(this.prefix + 'data_' + etype) +
-                  ' WHERE "name"=@' +
-                  name +
-                  ')';
-                params[name] = curVar;
+                if (
+                  curVar === 'cdate' ||
+                  curVar === 'mdate' ||
+                  (this.nymph.tilmeld != null &&
+                    (curVar === 'user' ||
+                      curVar === 'group' ||
+                      curVar === 'acUser' ||
+                      curVar === 'acGroup' ||
+                      curVar === 'acOther' ||
+                      curVar === 'acRead' ||
+                      curVar === 'acWrite' ||
+                      curVar === 'acFull'))
+                ) {
+                  curQuery +=
+                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                    '(' +
+                    ieTable +
+                    '.' +
+                    SQLite3Driver.escape(curVar) +
+                    ' IS NOT NULL)';
+                } else {
+                  const name = `param${++count.i}`;
+                  curQuery +=
+                    ieTable +
+                    '."guid" ' +
+                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                    'IN (SELECT "guid" FROM ' +
+                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
+                    ' WHERE "name"=@' +
+                    name +
+                    ')';
+                  params[name] = curVar;
+                }
               }
               break;
             case 'truthy':
@@ -739,28 +1152,35 @@ export default class SQLite3Driver extends NymphDriver {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                if (curVar === 'cdate') {
-                  curQuery +=
-                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                    '(' +
-                    ieTable +
-                    '."cdate" NOT NULL)';
-                  break;
-                } else if (curVar === 'mdate') {
+                if (
+                  curVar === 'cdate' ||
+                  curVar === 'mdate' ||
+                  (this.nymph.tilmeld != null &&
+                    (curVar === 'user' ||
+                      curVar === 'group' ||
+                      curVar === 'acUser' ||
+                      curVar === 'acGroup' ||
+                      curVar === 'acOther' ||
+                      curVar === 'acRead' ||
+                      curVar === 'acWrite' ||
+                      curVar === 'acFull'))
+                ) {
                   curQuery +=
                     (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                     '(' +
                     ieTable +
-                    '."mdate" NOT NULL)';
-                  break;
+                    '.' +
+                    SQLite3Driver.escape(curVar) +
+                    ' IS NOT NULL)';
                 } else {
                   const name = `param${++count.i}`;
                   curQuery +=
                     (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;
@@ -769,30 +1189,62 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'equal':
             case '!equal':
-              if (curValue[0] === 'cdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther'))
+              ) {
+                if (curQuery) {
+                  curQuery += typeIsOr ? ' OR ' : ' AND ';
+                }
+                const value = `param${++count.i}`;
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  ieTable +
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '=@' +
+                  value;
+                params[value] = Number(curValue[1]);
+              } else if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'user' || curValue[0] === 'group')
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const cdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."cdate"=@' +
-                  cdate;
-                params[cdate] = Number(curValue[1]);
-                break;
-              } else if (curValue[0] === 'mdate') {
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '=@' +
+                  value;
+                params[value] = `${curValue[1]}`;
+              } else if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'acRead' ||
+                  curValue[0] === 'acWrite' ||
+                  curValue[0] === 'acFull')
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."mdate"=@' +
-                  mdate;
-                params[mdate] = Number(curValue[1]);
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '=@' +
+                  value;
+                params[value] = Array.isArray(curValue[1])
+                  ? ',' + curValue[1].join(',') + ','
+                  : '';
               } else if (typeof curValue[1] === 'number') {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -801,10 +1253,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -819,10 +1272,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -846,130 +1300,302 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  ieTable +
-                  '."guid" IN (SELECT "guid" FROM ' +
+                  '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;
               }
               break;
             case 'contain':
             case '!contain':
-              if (curValue[0] === 'cdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther'))
+              ) {
+                if (curQuery) {
+                  curQuery += typeIsOr ? ' OR ' : ' AND ';
+                }
+                const value = `param${++count.i}`;
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  ieTable +
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '=@' +
+                  value;
+                params[value] = Number(curValue[1]);
+              } else if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'user' || curValue[0] === 'group')
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const cdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."cdate"=' +
-                  cdate;
-                params[cdate] = Number(curValue[1]);
-                break;
-              } else if (curValue[0] === 'mdate') {
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '=@' +
+                  value;
+                params[value] = `${curValue[1]}`;
+              } else if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'acRead' ||
+                  curValue[0] === 'acWrite' ||
+                  curValue[0] === 'acFull')
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const id = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."mdate"=' +
-                  mdate;
-                params[mdate] = Number(curValue[1]);
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  ' LIKE @' +
+                  id +
+                  " ESCAPE '\\'";
+                params[id] =
+                  '%,' +
+                  curValue[1]
+                    .replace('\\', '\\\\')
+                    .replace('%', '\\%')
+                    .replace('_', '\\_') +
+                  ',%';
               } else {
+                const containTableSuffix = makeTableSuffix();
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
                 let svalue: string;
-                let stringValue: string;
                 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 +=
-                    (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' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
+                if (curQuery) {
+                  curQuery += typeIsOr ? ' OR ' : ' AND ';
+                }
+                curQuery += (xor(typeIsNot, clauseNot) ? 'NOT ' : '') + '(0)';
+              } else {
+                if (curQuery) {
+                  curQuery += typeIsOr ? ' OR ' : ' AND ';
+                }
+
+                const parsedFTSQuery = this.tokenizer.parseSearchQuery(
+                  curValue[1],
+                );
+
+                if (!parsedFTSQuery.length) {
+                  curQuery += (xor(typeIsNot, clauseNot) ? 'NOT ' : '') + '(0)';
                 } else {
+                  const name = `param${++count.i}`;
+
+                  const queryPartToken = (term: SearchTerm) => {
+                    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: SearchSeriesTerm) => {
+                    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:
+                      | SearchTerm
+                      | SearchOrTerm
+                      | SearchNotTerm
+                      | SearchSeriesTerm,
+                  ): string => {
+                    if (term.type === 'series') {
+                      return queryPartSeries(term);
+                    } else if (term.type === 'not') {
+                      return 'NOT ' + queryPartTerm(term.operand);
+                    } else if (term.type === 'or') {
+                      let queryParts: string[] = [];
+                      for (let operand of term.operands) {
+                        queryParts.push(queryPartTerm(operand));
+                      }
+                      return '(' + queryParts.join(' OR ') + ')';
+                    }
+                    return queryPartToken(term);
+                  };
+
+                  // Run through the query and add terms.
+                  let termStrings: string[] = [];
+                  for (let term of parsedFTSQuery) {
+                    termStrings.push(queryPartTerm(term));
+                  }
+
                   curQuery +=
                     (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                    ieTable +
-                    '."guid" IN (SELECT "guid" FROM ' +
-                    SQLite3Driver.escape(this.prefix + 'data_' + etype) +
-                    ' WHERE "name"=@' +
-                    name +
-                    ' AND instr("value", @' +
-                    value +
-                    '))';
+                    '(' +
+                    termStrings.join(' AND ') +
+                    ')';
+
+                  params[name] = curValue[0];
                 }
-                params[name] = curValue[0];
-                params[value] = svalue;
               }
               break;
             case 'match':
             case '!match':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  '(' +
-                  ieTable +
-                  '."cdate" REGEXP @' +
-                  cdate +
-                  ')';
-                params[cdate] = curValue[1];
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   '(' +
                   ieTable +
-                  '."mdate" REGEXP @' +
-                  mdate +
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  ' REGEXP @' +
+                  value +
                   ')';
-                params[mdate] = curValue[1];
-                break;
+                params[value] = curValue[1];
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -978,10 +1604,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -992,34 +1619,33 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'imatch':
             case '!imatch':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  '(' +
-                  ieTable +
-                  '."cdate" REGEXP @' +
-                  cdate +
-                  ')';
-                params[cdate] = curValue[1];
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  '(' +
+                  '(lower(' +
                   ieTable +
-                  '."mdate" REGEXP @' +
-                  mdate +
-                  ')';
-                params[mdate] = curValue[1];
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  ') REGEXP lower(@' +
+                  value +
+                  '))';
+                params[value] = curValue[1];
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -1028,10 +1654,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -1042,34 +1669,33 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'like':
             case '!like':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  '(' +
-                  ieTable +
-                  '."cdate" LIKE @' +
-                  cdate +
-                  " ESCAPE '\\')";
-                params[cdate] = curValue[1];
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   '(' +
                   ieTable +
-                  '."mdate" LIKE @' +
-                  mdate +
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  ' LIKE @' +
+                  value +
                   " ESCAPE '\\')";
-                params[mdate] = curValue[1];
-                break;
+                params[value] = curValue[1];
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -1078,10 +1704,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -1092,34 +1719,33 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'ilike':
             case '!ilike':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  '(' +
-                  ieTable +
-                  '."cdate" LIKE @' +
-                  cdate +
-                  " ESCAPE '\\')";
-                params[cdate] = curValue[1];
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  '(' +
+                  '(lower(' +
                   ieTable +
-                  '."mdate" LIKE @' +
-                  mdate +
-                  " ESCAPE '\\')";
-                params[mdate] = curValue[1];
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  ') LIKE lower(@' +
+                  value +
+                  ") ESCAPE '\\')";
+                params[value] = curValue[1];
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -1128,10 +1754,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -1142,30 +1769,31 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'gt':
             case '!gt':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  ieTable +
-                  '."cdate">@' +
-                  cdate;
-                params[cdate] = Number(curValue[1]);
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."mdate">@' +
-                  mdate;
-                params[mdate] = Number(curValue[1]);
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '>@' +
+                  value;
+                params[value] = Number(curValue[1]);
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -1174,10 +1802,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -1188,30 +1817,31 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'gte':
             case '!gte':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  ieTable +
-                  '."cdate">=@' +
-                  cdate;
-                params[cdate] = Number(curValue[1]);
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."mdate">=@' +
-                  mdate;
-                params[mdate] = Number(curValue[1]);
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '>=@' +
+                  value;
+                params[value] = Number(curValue[1]);
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -1220,10 +1850,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -1234,30 +1865,31 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'lt':
             case '!lt':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  ieTable +
-                  '."cdate"<@' +
-                  cdate;
-                params[cdate] = Number(curValue[1]);
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."mdate"<@' +
-                  mdate;
-                params[mdate] = Number(curValue[1]);
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '<@' +
+                  value;
+                params[value] = Number(curValue[1]);
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -1266,10 +1898,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -1280,30 +1913,31 @@ export default class SQLite3Driver extends NymphDriver {
               break;
             case 'lte':
             case '!lte':
-              if (curValue[0] === 'cdate') {
-                if (curQuery) {
-                  curQuery += typeIsOr ? ' OR ' : ' AND ';
-                }
-                const cdate = `param${++count.i}`;
-                curQuery +=
-                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                  ieTable +
-                  '."cdate"<=@' +
-                  cdate;
-                params[cdate] = Number(curValue[1]);
-                break;
-              } else if (curValue[0] === 'mdate') {
+              if (
+                curValue[0] === 'cdate' ||
+                curValue[0] === 'mdate' ||
+                (this.nymph.tilmeld != null &&
+                  (curValue[0] === 'user' ||
+                    curValue[0] === 'group' ||
+                    curValue[0] === 'acUser' ||
+                    curValue[0] === 'acGroup' ||
+                    curValue[0] === 'acOther' ||
+                    curValue[0] === 'acRead' ||
+                    curValue[0] === 'acWrite' ||
+                    curValue[0] === 'acFull'))
+              ) {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
                 }
-                const mdate = `param${++count.i}`;
+                const value = `param${++count.i}`;
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."mdate"<=@' +
-                  mdate;
-                params[mdate] = Number(curValue[1]);
-                break;
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '<=@' +
+                  value;
+                params[value] = Number(curValue[1]);
               } else {
                 if (curQuery) {
                   curQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -1312,10 +1946,11 @@ export default class SQLite3Driver extends NymphDriver {
                 const value = `param${++count.i}`;
                 curQuery +=
                   (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 +
@@ -1337,94 +1972,255 @@ export default class SQLite3Driver extends NymphDriver {
               if (curQuery) {
                 curQuery += typeIsOr ? ' OR ' : ' AND ';
               }
-              const name = `param${++count.i}`;
-              const guid = `param${++count.i}`;
-              curQuery +=
-                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                ieTable +
-                '."guid" IN (SELECT "guid" FROM ' +
-                SQLite3Driver.escape(this.prefix + 'references_' + etype) +
-                ' WHERE "name"=@' +
-                name +
-                ' AND "reference"=@' +
-                guid +
-                ')';
-              params[name] = curValue[0];
-              params[guid] = curQguid;
-              break;
-            case 'selector':
-            case '!selector':
-              const subquery = this.makeEntityQuery(
-                options,
-                [curValue],
-                etype,
-                count,
-                params,
-                true,
-                tableSuffix,
-                etypes
-              );
-              if (curQuery) {
-                curQuery += typeIsOr ? ' OR ' : ' AND ';
-              }
-              curQuery +=
-                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                '(' +
-                subquery.query +
-                ')';
-              break;
-            case 'qref':
-            case '!qref':
-              const [qrefOptions, ...qrefSelectors] = curValue[1] as [
-                Options,
-                ...FormattedSelector[]
-              ];
-              const QrefEntityClass = qrefOptions.class as EntityConstructor;
-              etypes.push(QrefEntityClass.ETYPE);
-              const qrefQuery = this.makeEntityQuery(
-                { ...qrefOptions, return: 'guid', class: QrefEntityClass },
-                qrefSelectors,
-                QrefEntityClass.ETYPE,
+              if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'user' || curValue[0] === 'group')
+              ) {
+                const guid = `param${++count.i}`;
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  ieTable +
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  '=@' +
+                  guid;
+                params[guid] = curQguid;
+              } else if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'acRead' ||
+                  curValue[0] === 'acWrite' ||
+                  curValue[0] === 'acFull')
+              ) {
+                const guid = `param${++count.i}`;
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  ieTable +
+                  '.' +
+                  SQLite3Driver.escape(curValue[0]) +
+                  ' LIKE @' +
+                  guid +
+                  " ESCAPE '\\'";
+                params[guid] =
+                  '%,' +
+                  curQguid
+                    .replace('\\', '\\\\')
+                    .replace('%', '\\%')
+                    .replace('_', '\\_') +
+                  ',%';
+              } else {
+                const name = `param${++count.i}`;
+                const guid = `param${++count.i}`;
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  'EXISTS (SELECT "guid" FROM ' +
+                  SQLite3Driver.escape(this.prefix + 'references_' + etype) +
+                  ' WHERE "guid"=' +
+                  ieTable +
+                  '."guid" AND "name"=@' +
+                  name +
+                  ' AND "reference"=@' +
+                  guid +
+                  ')';
+                params[name] = curValue[0];
+                params[guid] = curQguid;
+              }
+              break;
+            case 'selector':
+            case '!selector':
+              const innerquery = this.makeEntityQuery(
+                { ...options, sort: null, limit: undefined },
+                [curValue],
+                etype,
                 count,
                 params,
-                false,
-                makeTableSuffix(),
-                etypes
+                true,
+                tableSuffix,
+                etypes,
               );
               if (curQuery) {
                 curQuery += typeIsOr ? ' OR ' : ' AND ';
               }
-              const qrefName = `param${++count.i}`;
               curQuery +=
                 (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                ieTable +
-                '."guid" IN (SELECT "guid" FROM ' +
-                SQLite3Driver.escape(this.prefix + 'references_' + etype) +
-                ' WHERE "name"=@' +
-                qrefName +
-                ' AND "reference" IN (' +
-                qrefQuery.query +
-                '))';
-              params[qrefName] = curValue[0];
+                '(' +
+                innerquery.query +
+                ')';
+              break;
+            case 'qref':
+            case '!qref':
+              const referenceTableSuffix = makeTableSuffix();
+              const [qrefOptions, ...qrefSelectors] = curValue[1] as [
+                Options,
+                ...FormattedSelector[],
+              ];
+              const QrefEntityClass = qrefOptions.class as EntityConstructor;
+              etypes.push(QrefEntityClass.ETYPE);
+              if (curQuery) {
+                curQuery += typeIsOr ? ' OR ' : ' AND ';
+              }
+              if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'user' || curValue[0] === 'group')
+              ) {
+                const qrefQuery = this.makeEntityQuery(
+                  {
+                    ...qrefOptions,
+                    sort: qrefOptions.sort ?? null,
+                    return: 'guid',
+                    class: QrefEntityClass,
+                  },
+                  qrefSelectors,
+                  QrefEntityClass.ETYPE,
+                  count,
+                  params,
+                  false,
+                  makeTableSuffix(),
+                  etypes,
+                  'r' +
+                    referenceTableSuffix +
+                    '.' +
+                    SQLite3Driver.escape(curValue[0]),
+                );
+
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  'EXISTS (SELECT "guid" FROM ' +
+                  SQLite3Driver.escape(this.prefix + 'entities_' + etype) +
+                  ' r' +
+                  referenceTableSuffix +
+                  ' WHERE r' +
+                  referenceTableSuffix +
+                  '."guid"=' +
+                  ieTable +
+                  '."guid" AND EXISTS (' +
+                  qrefQuery.query +
+                  '))';
+              } else if (
+                this.nymph.tilmeld != null &&
+                (curValue[0] === 'acRead' ||
+                  curValue[0] === 'acWrite' ||
+                  curValue[0] === 'acFull')
+              ) {
+                const qrefQuery = this.makeEntityQuery(
+                  {
+                    ...qrefOptions,
+                    sort: qrefOptions.sort ?? null,
+                    return: 'guid',
+                    class: QrefEntityClass,
+                  },
+                  qrefSelectors,
+                  QrefEntityClass.ETYPE,
+                  count,
+                  params,
+                  false,
+                  makeTableSuffix(),
+                  etypes,
+                  'r' + referenceTableSuffix + '."ref"',
+                );
+
+                const splitTableSuffix = makeTableSuffix();
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  `EXISTS (SELECT "guid", "ref" FROM (
+                    WITH RECURSIVE "spl${splitTableSuffix}" AS (
+                      SELECT
+                        "guid",
+                        SUBSTR(${SQLite3Driver.escape(curValue[0])}, 1, INSTR(${SQLite3Driver.escape(curValue[0])}, ',') - 1) AS "ref",
+                        SUBSTR(${SQLite3Driver.escape(curValue[0])}, INSTR(${SQLite3Driver.escape(curValue[0])}, ',') + 1) AS "remainder"
+                      FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)}
+                      UNION ALL
+                      SELECT
+                        "guid",
+                        SUBSTR("remainder", 1, INSTR("remainder", ',') - 1) AS "ref",
+                        SUBSTR("remainder", INSTR("remainder", ',') + 1) AS "remainder"
+                      FROM "spl${splitTableSuffix}" WHERE "remainder" != ''
+                    )
+                    SELECT "guid", "ref" FROM "spl${splitTableSuffix}" WHERE "ref" != ''
+                  ) ` +
+                  ' r' +
+                  referenceTableSuffix +
+                  ' WHERE r' +
+                  referenceTableSuffix +
+                  '."guid"=' +
+                  ieTable +
+                  '."guid" AND EXISTS (' +
+                  qrefQuery.query +
+                  '))';
+              } else {
+                const qrefQuery = this.makeEntityQuery(
+                  {
+                    ...qrefOptions,
+                    sort: qrefOptions.sort ?? null,
+                    return: 'guid',
+                    class: QrefEntityClass,
+                  },
+                  qrefSelectors,
+                  QrefEntityClass.ETYPE,
+                  count,
+                  params,
+                  false,
+                  makeTableSuffix(),
+                  etypes,
+                  'r' + referenceTableSuffix + '."reference"',
+                );
+
+                const qrefName = `param${++count.i}`;
+                curQuery +=
+                  (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                  'EXISTS (SELECT "guid" FROM ' +
+                  SQLite3Driver.escape(this.prefix + 'references_' + etype) +
+                  ' r' +
+                  referenceTableSuffix +
+                  ' WHERE r' +
+                  referenceTableSuffix +
+                  '."guid"=' +
+                  ieTable +
+                  '."guid" AND r' +
+                  referenceTableSuffix +
+                  '."name"=@' +
+                  qrefName +
+                  ' AND EXISTS (' +
+                  qrefQuery.query +
+                  '))';
+                params[qrefName] = curValue[0];
+              }
               break;
           }
         }
         return curQuery;
-      }
+      },
     );
 
     let sortBy: string;
-    switch (sort) {
-      case 'mdate':
-        sortBy = '"mdate"';
-        break;
-      case 'cdate':
-      default:
-        sortBy = '"cdate"';
-        break;
-    }
-    if (options.reverse) {
-      sortBy += ' DESC';
+    let sortByInner: string;
+    let sortJoin = '';
+    const order = options.reverse ? ' DESC' : '';
+    if (sort == null) {
+      sortBy = '';
+      sortByInner = '';
+    } else {
+      switch (sort) {
+        case 'mdate':
+          sortBy = `ORDER BY ${eTable}."mdate"${order}`;
+          sortByInner = `ORDER BY ${ieTable}."mdate"${order}`;
+          break;
+        case 'cdate':
+          sortBy = `ORDER BY ${eTable}."cdate"${order}`;
+          sortByInner = `ORDER BY ${ieTable}."cdate"${order}`;
+          break;
+        default:
+          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 = `ORDER BY ${sTable}."number"${order}, ${sTable}."string"${order}`;
+          sortByInner = sortBy;
+          params[name] = sort;
+          break;
+      }
     }
 
     let query: string;
@@ -1441,57 +2237,69 @@ export default class SQLite3Driver extends 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
+                  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
+                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
+              this.prefix + 'entities_' + etype,
             )} ${ieTable}
-            WHERE (${whereClause})
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoin}
+            WHERE ${guidClause}(${whereClause})
+            ${sortByInner ? sortByInner + ', ' : 'ORDER BY '}"guid"${limit}${offset}`;
         } else {
           query = `SELECT
               ${eTable}."guid",
               ${eTable}."tags",
               ${eTable}."cdate",
               ${eTable}."mdate",
+              ${eTable}."user",
+              ${eTable}."group",
+              ${eTable}."acUser",
+              ${eTable}."acGroup",
+              ${eTable}."acOther",
+              ${eTable}."acRead",
+              ${eTable}."acWrite",
+              ${eTable}."acFull",
               ${dTable}."name",
               ${dTable}."value",
-              ${cTable}."string",
-              ${cTable}."number"
+              json(${dTable}."json") as "json",
+              ${dTable}."string",
+              ${dTable}."number"
             FROM ${SQLite3Driver.escape(
-              this.prefix + 'entities_' + etype
+              this.prefix + 'entities_' + etype,
             )} ${eTable}
             LEFT JOIN ${SQLite3Driver.escape(
-              this.prefix + 'data_' + etype
+              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
+                this.prefix + 'entities_' + etype,
               )} ${ieTable}
-              WHERE (${whereClause})
-              ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+              ${sortJoin}
+              WHERE ${guidClause}(${whereClause})
+              ${sortByInner}${limit}${offset}
             ) ${fTable} USING ("guid")
-            ORDER BY ${eTable}.${sortBy}`;
+            ${sortBy ? sortBy + ', ' : 'ORDER BY '}${eTable}."guid"`;
         }
       }
     } else {
@@ -1506,26 +2314,31 @@ export default class SQLite3Driver extends 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}
+                  this.prefix + 'entities_' + etype,
+                )} ${ieTable}${guidClause}${limit}${offset}
               )`;
           } else {
             query = `SELECT COUNT("guid") AS "count"
               FROM ${SQLite3Driver.escape(
-                this.prefix + 'entities_' + etype
-              )} ${ieTable}`;
+                this.prefix + 'entities_' + etype,
+              )} ${ieTable}${guidClause}`;
           }
         } else if (options.return === 'guid') {
           query = `SELECT "guid"
             FROM ${SQLite3Driver.escape(
-              this.prefix + 'entities_' + etype
+              this.prefix + 'entities_' + etype,
             )} ${ieTable}
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoin}
+            ${guidClause}
+            ${sortByInner ? sortByInner + ', ' : 'ORDER BY '}"guid"${limit}${offset}`;
         } else {
           if (limit || offset) {
             query = `SELECT
@@ -1533,47 +2346,64 @@ export default class SQLite3Driver extends NymphDriver {
                 ${eTable}."tags",
                 ${eTable}."cdate",
                 ${eTable}."mdate",
+                ${eTable}."user",
+                ${eTable}."group",
+                ${eTable}."acUser",
+                ${eTable}."acGroup",
+                ${eTable}."acOther",
+                ${eTable}."acRead",
+                ${eTable}."acWrite",
+                ${eTable}."acFull",
                 ${dTable}."name",
                 ${dTable}."value",
-                ${cTable}."string",
-                ${cTable}."number"
+                json(${dTable}."json") as "json",
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${SQLite3Driver.escape(
-                this.prefix + 'entities_' + etype
+                this.prefix + 'entities_' + etype,
               )} ${eTable}
               LEFT JOIN ${SQLite3Driver.escape(
-                this.prefix + 'data_' + etype
+                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
+                  this.prefix + 'entities_' + etype,
                 )} ${ieTable}
-                ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+                ${sortJoin}
+                ${guidClause}
+                ${sortByInner}${limit}${offset}
               ) ${fTable} USING ("guid")
-              ORDER BY ${eTable}.${sortBy}`;
+              ${sortBy ? sortBy + ', ' : 'ORDER BY '}${eTable}."guid"`;
           } else {
             query = `SELECT
                 ${eTable}."guid",
                 ${eTable}."tags",
                 ${eTable}."cdate",
                 ${eTable}."mdate",
+                ${eTable}."user",
+                ${eTable}."group",
+                ${eTable}."acUser",
+                ${eTable}."acGroup",
+                ${eTable}."acOther",
+                ${eTable}."acRead",
+                ${eTable}."acWrite",
+                ${eTable}."acFull",
                 ${dTable}."name",
                 ${dTable}."value",
-                ${cTable}."string",
-                ${cTable}."number"
+                json(${dTable}."json") as "json",
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${SQLite3Driver.escape(
-                this.prefix + 'entities_' + etype
+                this.prefix + 'entities_' + etype,
               )} ${eTable}
               LEFT JOIN ${SQLite3Driver.escape(
-                this.prefix + 'data_' + etype
+                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}` : ''}
+              ${sortBy ? sortBy + ', ' : 'ORDER BY '}${eTable}."guid"`;
           }
         }
       }
@@ -1593,16 +2423,18 @@ export default class SQLite3Driver extends NymphDriver {
   protected performQuery(
     options: Options,
     formattedSelectors: FormattedSelector[],
-    etype: string
+    etype: string,
   ): {
     result: any;
   } {
     const { query, params, etypes } = this.makeEntityQuery(
       options,
       formattedSelectors,
-      etype
+      etype,
     );
-    const result = this.queryIter(query, { etypes, params })[Symbol.iterator]();
+    const result = this.queryArray(query, { etypes, params })[
+      Symbol.iterator
+    ]();
     return {
       result,
     };
@@ -1617,37 +2449,24 @@ export default class SQLite3Driver extends NymphDriver {
     ...selectors: Selector[]
   ): Promise<string[]>;
   public async getEntities<T extends EntityConstructor = EntityConstructor>(
-    options?: Options<T>,
+    options: Options<T> & { return: 'object' },
     ...selectors: Selector[]
-  ): Promise<ReturnType<T['factorySync']>[]>;
+  ): Promise<EntityObjectType<T>[]>;
   public async getEntities<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> = {},
-    ...selectors: Selector[]
-  ): Promise<ReturnType<T['factorySync']>[] | string[] | number> {
-    return this.getEntitiesSync(options, ...selectors);
-  }
-
-  protected getEntitiesSync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> & { return: 'count' },
-    ...selectors: Selector[]
-  ): number;
-  protected getEntitiesSync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> & { return: 'guid' },
-    ...selectors: Selector[]
-  ): string[];
-  protected getEntitiesSync<T extends EntityConstructor = EntityConstructor>(
     options?: Options<T>,
     ...selectors: Selector[]
-  ): ReturnType<T['factorySync']>[];
-  protected getEntitiesSync<T extends EntityConstructor = EntityConstructor>(
+  ): Promise<EntityInstanceType<T>[]>;
+  public async getEntities<T extends EntityConstructor = EntityConstructor>(
     options: Options<T> = {},
     ...selectors: Selector[]
-  ): ReturnType<T['factorySync']>[] | string[] | number {
-    const { result, process } = this.getEntitesRowLike<T>(
+  ): Promise<
+    EntityInstanceType<T>[] | EntityObjectType<T>[] | string[] | number
+  > {
+    const { result, process } = this.getEntitiesRowLike<T>(
       options,
       selectors,
-      (options, formattedSelectors, etype) =>
-        this.performQuery(options, formattedSelectors, etype),
+      ({ options, selectors, etype }) =>
+        this.performQuery(options, selectors, etype),
       () => {
         const next: any = result.next();
         return next.done ? null : next.value;
@@ -1656,9 +2475,23 @@ export default class SQLite3Driver extends NymphDriver {
       (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: string) => tag)
+            : [],
         cdate: Number(row.cdate),
         mdate: Number(row.mdate),
+        user: row.user,
+        group: row.group,
+        acUser: row.acUser,
+        acGroup: row.acGroup,
+        acOther: row.acOther,
+        acRead: row.acRead?.slice(1, -1).split(',') ?? [],
+        acWrite: row.acWrite?.slice(1, -1).split(',') ?? [],
+        acFull: row.acFull?.slice(1, -1).split(',') ?? [],
       }),
       (row) => ({
         name: row.name,
@@ -1666,9 +2499,11 @@ export default class SQLite3Driver extends NymphDriver {
           row.value === 'N'
             ? JSON.stringify(row.number)
             : row.value === 'S'
-            ? JSON.stringify(row.string)
-            : row.value,
-      })
+              ? JSON.stringify(row.string)
+              : row.value === 'J'
+                ? row.json
+                : row.value,
+      }),
     );
     const value = process();
     if (value instanceof Error) {
@@ -1681,174 +2516,355 @@ export default class SQLite3Driver extends NymphDriver {
     if (name == null) {
       throw new InvalidParametersError('Name not given for UID.');
     }
-    const result = this.queryGet(
+    const result: any = this.queryGet(
       `SELECT "cur_uid" FROM ${SQLite3Driver.escape(
-        `${this.prefix}uids`
+        `${this.prefix}uids`,
       )} WHERE "name"=@name;`,
       {
         params: {
           name: name,
         },
-      }
+      },
     );
     return (result?.cur_uid as number | null) ?? null;
   }
 
-  public async import(filename: string) {
+  public async importEntity(entity: {
+    guid: string;
+    cdate: number;
+    mdate: number;
+    tags: string[];
+    sdata: SerializedEntityData;
+    etype: string;
+  }) {
+    return await this.importEntityInternal(entity);
+  }
+
+  public async importEntityTokens(entity: {
+    guid: string;
+    cdate: number;
+    mdate: number;
+    tags: string[];
+    sdata: SerializedEntityData;
+    etype: string;
+  }) {
+    return await this.importEntityInternal(entity, { only: 'tokens' });
+  }
+
+  public async importEntityTilmeldAC(entity: {
+    guid: string;
+    cdate: number;
+    mdate: number;
+    tags: string[];
+    sdata: SerializedEntityData;
+    etype: string;
+  }) {
+    return await this.importEntityInternal(entity, { only: 'tilmeldAC' });
+  }
+
+  private async importEntityInternal(
+    {
+      guid,
+      cdate,
+      mdate,
+      tags,
+      sdata,
+      etype,
+    }: {
+      guid: string;
+      cdate: number;
+      mdate: number;
+      tags: string[];
+      sdata: SerializedEntityData;
+      etype: string;
+    },
+    { only = undefined }: { only?: 'tokens' | 'tilmeldAC' } = {},
+  ) {
     try {
-      return this.importFromFile(
-        filename,
-        async (guid, tags, sdata, etype) => {
-          this.queryRun(
-            `DELETE FROM ${SQLite3Driver.escape(
-              `${this.prefix}entities_${etype}`
-            )} WHERE "guid"=@guid;`,
-            {
-              etypes: [etype],
-              params: {
-                guid,
-              },
-            }
-          );
-          this.queryRun(
-            `DELETE FROM ${SQLite3Driver.escape(
-              `${this.prefix}data_${etype}`
-            )} WHERE "guid"=@guid;`,
-            {
-              etypes: [etype],
-              params: {
-                guid,
-              },
-            }
-          );
-          this.queryRun(
-            `DELETE FROM ${SQLite3Driver.escape(
-              `${this.prefix}comparisons_${etype}`
-            )} WHERE "guid"=@guid;`,
-            {
-              etypes: [etype],
-              params: {
-                guid,
-              },
-            }
-          );
-          this.queryRun(
-            `DELETE FROM ${SQLite3Driver.escape(
-              `${this.prefix}references_${etype}`
-            )} WHERE "guid"=@guid;`,
-            {
-              etypes: [etype],
-              params: {
-                guid,
-              },
-            }
-          );
+      if (only == null) {
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}entities_${etype}`,
+          )} WHERE "guid"=@guid;`,
+          {
+            etypes: [etype],
+            params: {
+              guid,
+            },
+          },
+        );
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}data_${etype}`,
+          )} WHERE "guid"=@guid;`,
+          {
+            etypes: [etype],
+            params: {
+              guid,
+            },
+          },
+        );
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}references_${etype}`,
+          )} WHERE "guid"=@guid;`,
+          {
+            etypes: [etype],
+            params: {
+              guid,
+            },
+          },
+        );
+      }
+      if (only == null || only === 'tokens') {
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}tokens_${etype}`,
+          )} WHERE "guid"=@guid;`,
+          {
+            etypes: [etype],
+            params: {
+              guid,
+            },
+          },
+        );
+      }
+      if (only == null) {
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}uniques_${etype}`,
+          )} WHERE "guid"=@guid;`,
+          {
+            etypes: [etype],
+            params: {
+              guid,
+            },
+          },
+        );
+      }
+
+      if (only == null) {
+        let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } =
+          this.removeAndReturnACValues(etype, {}, sdata);
+
+        this.queryRun(
+          `INSERT INTO ${SQLite3Driver.escape(
+            `${this.prefix}entities_${etype}`,
+          )} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (@guid, @tags, @cdate, @mdate, @user, @group, @acUser, @acGroup, @acOther, @acRead, @acWrite, @acFull);`,
+          {
+            etypes: [etype],
+            params: {
+              guid,
+              tags: ',' + tags.join(',') + ',',
+              cdate,
+              mdate,
+              user,
+              group,
+              acUser,
+              acGroup,
+              acOther,
+              acRead: acRead && ',' + acRead.join(',') + ',',
+              acWrite: acWrite && ',' + acWrite.join(',') + ',',
+              acFull: acFull && ',' + acFull.join(',') + ',',
+            },
+          },
+        );
+
+        for (const name in sdata) {
+          const value = sdata[name];
+          const uvalue = JSON.parse(value);
+          if (value === undefined) {
+            continue;
+          }
+          const storageValue =
+            typeof uvalue === 'number'
+              ? 'N'
+              : typeof uvalue === 'string'
+                ? 'S'
+                : 'J';
+          const jsonValue = storageValue === 'J' ? value : null;
+
           this.queryRun(
             `INSERT INTO ${SQLite3Driver.escape(
-              `${this.prefix}entities_${etype}`
-            )} ("guid", "tags", "cdate", "mdate") VALUES (@guid, @tags, @cdate, @mdate);`,
+              `${this.prefix}data_${etype}`,
+            )} ("guid", "name", "value", "json", "string", "number", "truthy") VALUES (@guid, @name, @storageValue, jsonb(@jsonValue), @string, @number, @truthy);`,
             {
               etypes: [etype],
               params: {
                 guid,
-                tags: ',' + tags.join(',') + ',',
-                cdate: Number(JSON.parse(sdata.cdate)),
-                mdate: Number(JSON.parse(sdata.mdate)),
+                name,
+                storageValue,
+                jsonValue,
+                string: storageValue === 'J' ? null : `${uvalue}`,
+                number: Number(uvalue),
+                truthy: uvalue ? 1 : 0,
               },
-            }
+            },
           );
-          delete sdata.cdate;
-          delete sdata.mdate;
-          for (const name in sdata) {
-            const value = sdata[name];
-            const uvalue = JSON.parse(value);
-            if (value === undefined) {
-              continue;
-            }
-            const storageValue =
-              typeof uvalue === 'number'
-                ? 'N'
-                : typeof uvalue === 'string'
-                ? 'S'
-                : value;
+
+          const references = this.findReferences(value);
+          for (const reference of references) {
             this.queryRun(
               `INSERT INTO ${SQLite3Driver.escape(
-                `${this.prefix}data_${etype}`
-              )} ("guid", "name", "value") VALUES (@guid, @name, @storageValue);`,
+                `${this.prefix}references_${etype}`,
+              )} ("guid", "name", "reference") VALUES (@guid, @name, @reference);`,
               {
                 etypes: [etype],
                 params: {
                   guid,
                   name,
-                  storageValue,
+                  reference,
                 },
-              }
+              },
             );
+          }
+        }
+      }
+
+      if (only === 'tilmeldAC') {
+        let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } =
+          this.removeAndReturnACValues(etype, {}, sdata);
+
+        this.queryRun(
+          `UPDATE OR IGNORE ${SQLite3Driver.escape(
+            `${this.prefix}entities_${etype}`,
+          )} SET "user"=@user, "group"=@group, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=@acRead, "acWrite"=@acWrite, "acFull"=@acFull WHERE "guid"=@guid;`,
+          {
+            etypes: [etype],
+            params: {
+              user,
+              group,
+              acUser,
+              acGroup,
+              acOther,
+              acRead: acRead && ',' + acRead.join(',') + ',',
+              acWrite: acWrite && ',' + acWrite.join(',') + ',',
+              acFull: acFull && ',' + acFull.join(',') + ',',
+              guid,
+            },
+          },
+        );
+      }
+
+      const EntityClass = this.nymph.getEntityClassByEtype(etype);
+
+      if (only == null || only === 'tokens') {
+        for (let name in sdata) {
+          let tokenString: string | null = null;
+          try {
+            tokenString = EntityClass.getFTSText(name, JSON.parse(sdata[name]));
+          } catch (e: any) {
+            // Ignore error.
+          }
+
+          if (tokenString != null) {
+            const tokens = this.tokenizer.tokenize(tokenString);
+            while (tokens.length) {
+              const currentTokens = tokens.splice(0, 100);
+              const params: { [k: string]: any } = {
+                guid,
+                name,
+              };
+              const values: string[] = [];
+
+              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 (only == null) {
+        const uniques = await EntityClass.getUniques({
+          guid,
+          cdate,
+          mdate,
+          tags,
+          data: {},
+          sdata,
+        });
+        for (const unique of uniques) {
+          try {
             this.queryRun(
               `INSERT INTO ${SQLite3Driver.escape(
-                `${this.prefix}comparisons_${etype}`
-              )} ("guid", "name", "truthy", "string", "number") VALUES (@guid, @name, @truthy, @string, @number);`,
+                `${this.prefix}uniques_${etype}`,
+              )} ("guid", "unique") VALUES (@guid, @unique);`,
               {
                 etypes: [etype],
                 params: {
                   guid,
-                  name,
-                  truthy: uvalue ? 1 : 0,
-                  string: `${uvalue}`,
-                  number: Number(uvalue),
+                  unique,
                 },
-              }
+              },
             );
-            const references = this.findReferences(value);
-            for (const reference of references) {
-              this.queryRun(
-                `INSERT INTO ${SQLite3Driver.escape(
-                  `${this.prefix}references_${etype}`
-                )} ("guid", "name", "reference") VALUES (@guid, @name, @reference);`,
-                {
-                  etypes: [etype],
-                  params: {
-                    guid,
-                    name,
-                    reference,
-                  },
-                }
+          } catch (e: any) {
+            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: any) {
+      this.nymph.config.debugError('sqlite3', `Import entity error: "${e}"`);
+      throw e;
+    }
+  }
+
+  public async importUID({ name, value }: { name: string; value: number }) {
+    try {
+      await this.startTransaction(`nymph-import-uid-${name}`);
+      this.queryRun(
+        `DELETE FROM ${SQLite3Driver.escape(
+          `${this.prefix}uids`,
+        )} WHERE "name"=@name;`,
+        {
+          params: {
+            name,
+          },
         },
-        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,
-              },
-            }
-          );
-        },
-        async () => {
-          await this.startTransaction('nymph-import');
+      );
+      this.queryRun(
+        `INSERT INTO ${SQLite3Driver.escape(
+          `${this.prefix}uids`,
+        )} ("name", "cur_uid") VALUES (@name, @value);`,
+        {
+          params: {
+            name,
+            value,
+          },
         },
-        async () => {
-          await this.commit('nymph-import');
-        }
       );
+      await this.commit(`nymph-import-uid-${name}`);
     } catch (e: any) {
-      await this.rollback('nymph-import');
+      this.nymph.config.debugError('sqlite3', `Import UID error: "${e}"`);
+      await this.rollback(`nymph-import-uid-${name}`);
       throw e;
     }
   }
@@ -1858,51 +2874,56 @@ export default class SQLite3Driver extends NymphDriver {
       throw new InvalidParametersError('Name not given for UID.');
     }
     await this.startTransaction('nymph-newuid');
+    let curUid: number | undefined = undefined;
     try {
-      let curUid =
-        this.queryGet(
-          `SELECT "cur_uid" FROM ${SQLite3Driver.escape(
-            `${this.prefix}uids`
-          )} WHERE "name"=@name;`,
-          {
-            params: {
-              name,
+      curUid =
+        (
+          this.queryGet(
+            `SELECT "cur_uid" FROM ${SQLite3Driver.escape(
+              `${this.prefix}uids`,
+            )} WHERE "name"=@name;`,
+            {
+              params: {
+                name,
+              },
             },
-          }
+          ) as any
         )?.cur_uid ?? null;
       if (curUid == null) {
         curUid = 1;
         this.queryRun(
           `INSERT INTO ${SQLite3Driver.escape(
-            `${this.prefix}uids`
+            `${this.prefix}uids`,
           )} ("name", "cur_uid") VALUES (@name, @curUid);`,
           {
             params: {
               name,
               curUid,
             },
-          }
+          },
         );
       } else {
         curUid++;
         this.queryRun(
           `UPDATE ${SQLite3Driver.escape(
-            `${this.prefix}uids`
+            `${this.prefix}uids`,
           )} SET "cur_uid"=@curUid WHERE "name"=@name;`,
           {
             params: {
               curUid,
               name,
             },
-          }
+          },
         );
       }
-      await this.commit('nymph-newuid');
-      return curUid as number;
     } catch (e: any) {
+      this.nymph.config.debugError('sqlite3', `New UID error: "${e}"`);
       await this.rollback('nymph-newuid');
       throw e;
     }
+
+    await this.commit('nymph-newuid');
+    return curUid as number;
   }
 
   public async renameUID(oldName: string, newName: string) {
@@ -1912,14 +2933,14 @@ export default class SQLite3Driver extends NymphDriver {
     await this.startTransaction('nymph-rename-uid');
     this.queryRun(
       `UPDATE ${SQLite3Driver.escape(
-        `${this.prefix}uids`
+        `${this.prefix}uids`,
       )} SET "name"=@newName WHERE "name"=@oldName;`,
       {
         params: {
           newName,
           oldName,
         },
-      }
+      },
     );
     await this.commit('nymph-rename-uid');
     return true;
@@ -1928,7 +2949,7 @@ export default class SQLite3Driver extends NymphDriver {
   public async rollback(name: string) {
     if (name == null || typeof name !== 'string' || name.length === 0) {
       throw new InvalidParametersError(
-        'Transaction rollback attempted without a name.'
+        'Transaction rollback attempted without a name.',
       );
     }
     if (this.store.transactionsStarted === 0) {
@@ -1955,8 +2976,11 @@ export default class SQLite3Driver extends NymphDriver {
       guid: string,
       data: EntityData,
       sdata: SerializedEntityData,
-      etype: string
+      uniques: string[],
+      etype: string,
     ) => {
+      const EntityClass = this.nymph.getEntityClassByEtype(etype);
+
       const runInsertQuery = (name: string, value: any, svalue: string) => {
         if (value === undefined) {
           return;
@@ -1965,41 +2989,33 @@ export default class SQLite3Driver extends NymphDriver {
           typeof value === 'number'
             ? 'N'
             : typeof value === 'string'
-            ? 'S'
-            : svalue;
+              ? 'S'
+              : 'J';
+        const jsonValue = storageValue === 'J' ? svalue : null;
+
         this.queryRun(
           `INSERT INTO ${SQLite3Driver.escape(
-            `${this.prefix}data_${etype}`
-          )} ("guid", "name", "value") VALUES (@guid, @name, @storageValue);`,
+            `${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);
         for (const reference of references) {
           this.queryRun(
             `INSERT INTO ${SQLite3Driver.escape(
-              `${this.prefix}references_${etype}`
+              `${this.prefix}references_${etype}`,
             )} ("guid", "name", "reference") VALUES (@guid, @name, @reference);`,
             {
               etypes: [etype],
@@ -2008,10 +3024,80 @@ export default class SQLite3Driver extends NymphDriver {
                 name,
                 reference,
               },
-            }
+            },
           );
         }
+
+        let tokenString: string | null = null;
+        try {
+          tokenString = EntityClass.getFTSText(name, value);
+        } catch (e: any) {
+          // Ignore error.
+        }
+
+        if (tokenString != null) {
+          const tokens = this.tokenizer.tokenize(tokenString);
+          while (tokens.length) {
+            const currentTokens = tokens.splice(0, 100);
+            const params: { [k: string]: any } = {
+              guid,
+              name,
+            };
+            const values: string[] = [];
+
+            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: any) {
+          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]));
       }
@@ -2019,95 +3105,179 @@ export default class SQLite3Driver extends 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) => {
+        async ({ guid, tags, data, sdata, uniques, cdate, etype }) => {
+          if (
+            Object.keys(data).length === 0 &&
+            Object.keys(sdata).length === 0
+          ) {
+            throw new EntityInvalidDataError('Entity contains no data.');
+          }
+          let processedData = this.removeAndReturnACValues(
+            etype,
+            { ...data },
+            { ...sdata },
+          );
+          ({ data, sdata } = processedData);
+          let {
+            user,
+            group,
+            acUser,
+            acGroup,
+            acOther,
+            acRead,
+            acWrite,
+            acFull,
+          } = processedData;
           this.queryRun(
             `INSERT INTO ${SQLite3Driver.escape(
-              `${this.prefix}entities_${etype}`
-            )} ("guid", "tags", "cdate", "mdate") VALUES (@guid, @tags, @cdate, @cdate);`,
+              `${this.prefix}entities_${etype}`,
+            )} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (@guid, @tags, @cdate, @cdate, @user, @group, @acUser, @acGroup, @acOther, @acRead, @acWrite, @acFull);`,
             {
               etypes: [etype],
               params: {
                 guid,
                 tags: ',' + tags.join(',') + ',',
                 cdate,
+                user,
+                group,
+                acUser,
+                acGroup,
+                acOther,
+                acRead: acRead && ',' + acRead.join(',') + ',',
+                acWrite: acWrite && ',' + acWrite.join(',') + ',',
+                acFull: acFull && ',' + acFull.join(',') + ',',
               },
-            }
+            },
           );
-          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
+          ) {
+            throw new EntityInvalidDataError('Entity contains no data.');
+          }
+          let processedData = this.removeAndReturnACValues(
+            etype,
+            { ...data },
+            { ...sdata },
+          );
+          ({ data, sdata } = processedData);
+          let {
+            user,
+            group,
+            acUser,
+            acGroup,
+            acOther,
+            acRead,
+            acWrite,
+            acFull,
+          } = processedData;
           const info = this.queryRun(
             `UPDATE ${SQLite3Driver.escape(
-              `${this.prefix}entities_${etype}`
-            )} SET "tags"=@tags, "mdate"=@mdate WHERE "guid"=@guid AND "mdate" <= @emdate;`,
+              `${this.prefix}entities_${etype}`,
+            )} SET "tags"=@tags, "mdate"=@mdate, "user"=@user, "group"=@group, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=@acRead, "acWrite"=@acWrite, "acFull"=@acFull WHERE "guid"=@guid AND "mdate" <= @emdate;`,
             {
               etypes: [etype],
               params: {
                 tags: ',' + tags.join(',') + ',',
                 mdate,
+                user,
+                group,
+                acUser,
+                acGroup,
+                acOther,
+                acRead: acRead && ',' + acRead.join(',') + ',',
+                acWrite: acWrite && ',' + acWrite.join(',') + ',',
+                acFull: acFull && ',' + acFull.join(',') + ',',
                 guid,
                 emdate: Number(entity.mdate),
               },
-            }
+            },
           );
           let success = false;
           if (info.changes === 1) {
             this.queryRun(
               `DELETE FROM ${SQLite3Driver.escape(
-                `${this.prefix}data_${etype}`
+                `${this.prefix}data_${etype}`,
               )} WHERE "guid"=@guid;`,
               {
                 etypes: [etype],
                 params: {
                   guid,
                 },
-              }
+              },
             );
             this.queryRun(
               `DELETE FROM ${SQLite3Driver.escape(
-                `${this.prefix}comparisons_${etype}`
+                `${this.prefix}references_${etype}`,
               )} WHERE "guid"=@guid;`,
               {
                 etypes: [etype],
                 params: {
                   guid,
                 },
-              }
+              },
             );
             this.queryRun(
               `DELETE FROM ${SQLite3Driver.escape(
-                `${this.prefix}references_${etype}`
+                `${this.prefix}tokens_${etype}`,
               )} WHERE "guid"=@guid;`,
               {
                 etypes: [etype],
                 params: {
                   guid,
                 },
-              }
+              },
             );
-            insertData(guid, data, sdata, etype);
+            this.queryRun(
+              `DELETE FROM ${SQLite3Driver.escape(
+                `${this.prefix}uniques_${etype}`,
+              )} WHERE "guid"=@guid;`,
+              {
+                etypes: [etype],
+                params: {
+                  guid,
+                },
+              },
+            );
+            insertData(guid, data, sdata, uniques, etype);
             success = true;
           }
+          if (!success && info.changes === 0) {
+            throw new EntityConflictError(
+              "Entity either doesn't exist or is newer in the DB.",
+            );
+          }
           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) {
+              success = await this.commit('nymph-save');
+            } else {
+              await this.rollback('nymph-save');
+            }
           }
           return success;
-        }
+        },
       );
     } catch (e: any) {
-      await this.rollback('nymph-save');
+      this.nymph.config.debugError('sqlite3', `Save entity error: "${e}"`);
+      if (inTransaction) {
+        await this.rollback('nymph-save');
+      }
       throw e;
     }
   }
@@ -2119,33 +3289,37 @@ export default class SQLite3Driver extends NymphDriver {
     await this.startTransaction('nymph-set-uid');
     this.queryRun(
       `DELETE FROM ${SQLite3Driver.escape(
-        `${this.prefix}uids`
+        `${this.prefix}uids`,
       )} WHERE "name"=@name;`,
       {
         params: {
           name,
         },
-      }
+      },
     );
     this.queryRun(
       `INSERT INTO ${SQLite3Driver.escape(
-        `${this.prefix}uids`
+        `${this.prefix}uids`,
       )} ("name", "cur_uid") VALUES (@name, @curUid);`,
       {
         params: {
           name,
           curUid,
         },
-      }
+      },
     );
     await this.commit('nymph-set-uid');
     return true;
   }
 
+  public async internalTransaction(name: string) {
+    await this.startTransaction(name);
+  }
+
   public async startTransaction(name: string) {
     if (name == null || typeof name !== 'string' || name.length === 0) {
       throw new InvalidParametersError(
-        'Transaction start attempted without a name.'
+        'Transaction start attempted without a name.',
       );
     }
     if (!this.config.explicitWrite && !this.store.linkWrite) {
@@ -2155,4 +3329,147 @@ export default class SQLite3Driver extends NymphDriver {
     this.store.transactionsStarted++;
     return this.nymph;
   }
+
+  private async removeTilmeldOldRows(etype: string) {
+    await this.startTransaction('nymph-remove-tilmeld-rows');
+    try {
+      for (let name of [
+        'user',
+        'group',
+        'acUser',
+        'acGroup',
+        'acOther',
+        'acRead',
+        'acWrite',
+        'acFull',
+      ]) {
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}data_${etype}`,
+          )} WHERE "name"=@name;`,
+          {
+            etypes: [etype],
+            params: {
+              name,
+            },
+          },
+        );
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}references_${etype}`,
+          )} WHERE "name"=@name;`,
+          {
+            etypes: [etype],
+            params: {
+              name,
+            },
+          },
+        );
+        this.queryRun(
+          `DELETE FROM ${SQLite3Driver.escape(
+            `${this.prefix}tokens_${etype}`,
+          )} WHERE "name"=@name;`,
+          {
+            etypes: [etype],
+            params: {
+              name,
+            },
+          },
+        );
+      }
+    } catch (e: any) {
+      this.nymph.config.debugError(
+        'sqlite3',
+        `Remove tilmeld rows error: "${e}"`,
+      );
+      await this.rollback('nymph-remove-tilmeld-rows');
+      throw e;
+    }
+
+    await this.commit('nymph-remove-tilmeld-rows');
+    return true;
+  }
+
+  public async needsMigration(): Promise<
+    'json' | 'tokens' | 'tilmeldColumns' | false
+  > {
+    const table: any = 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: any = 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: any = 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';
+    }
+    const table3: any = this.queryGet(
+      `SELECT "name" FROM "sqlite_master" WHERE "type"='table' AND "name" LIKE @prefix LIMIT 1;`,
+      {
+        params: {
+          prefix: this.prefix + 'entities_' + '%',
+        },
+      },
+    );
+    if (table3?.name) {
+      const result: any = this.queryGet(
+        `SELECT 1 AS "exists" FROM pragma_table_info(@table) WHERE "name"='user';`,
+        {
+          params: {
+            table: table3.name,
+          },
+        },
+      );
+      if (!result?.exists) {
+        return 'tilmeldColumns';
+      }
+    }
+    return false;
+  }
+
+  public async liveMigration(
+    migrationType: 'tokenTables' | 'tilmeldColumns' | 'tilmeldRemoveOldRows',
+  ) {
+    if (migrationType === 'tokenTables') {
+      const etypes = await this.getEtypes();
+
+      for (let etype of etypes) {
+        this.createTokensTable(etype);
+      }
+    } else if (migrationType === 'tilmeldColumns') {
+      const etypes = await this.getEtypes();
+
+      for (let etype of etypes) {
+        this.addTilmeldColumnsAndIndexes(etype);
+      }
+    } else if (migrationType === 'tilmeldRemoveOldRows') {
+      const etypes = await this.getEtypes();
+
+      for (let etype of etypes) {
+        await this.removeTilmeldOldRows(etype);
+      }
+    }
+  }
 }