@nymphjs/driver-mysql 1.0.0-beta.12 → 1.0.0-beta.121

package/dist/MySQLDriver.js

@@ -1,26 +1,28 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = __importDefault(require("child_process"));
-const mysql_1 = __importDefault(require("@vlasky/mysql"));
-const nymph_1 = require("@nymphjs/nymph");
-const guid_1 = require("@nymphjs/guid");
-const conf_1 = require("./conf");
-const mysql = mysql_1.default;
-class MySQLDriver extends nymph_1.NymphDriver {
+import mysql from 'mysql2';
+import SqlString from 'sqlstring';
+import { NymphDriver, EntityUniqueConstraintError, InvalidParametersError, NotConfiguredError, QueryFailedError, UnableToConnectError, xor, } from '@nymphjs/nymph';
+import { makeTableSuffix } from '@nymphjs/guid';
+import { MySQLDriverConfigDefaults as defaults, } from './conf/index.js';
+/**
+ * The MySQL Nymph database driver.
+ */
+export default class MySQLDriver extends NymphDriver {
+    config;
+    mysqlConfig;
+    prefix;
+    connected = false;
+    // @ts-ignore: this is assigned in connect(), which is called by the constructor.
+    link;
+    transaction = null;
     static escape(input) {
-        return mysql.escapeId(input);
+        return SqlString.escapeId(input, true);
     }
     static escapeValue(input) {
         return mysql.escape(input);
     }
     constructor(config, link, transaction) {
         super();
-        this.connected = false;
-        this.transaction = null;
-        this.config = { ...conf_1.MySQLDriverConfigDefaults, ...config };
+        this.config = { ...defaults, ...config };
         const { host, user, password, database, port, customPoolConfig } = this.config;
         this.mysqlConfig = customPoolConfig ?? {
             host,
@@ -41,6 +43,11 @@ class MySQLDriver extends nymph_1.NymphDriver {
             this.connect();
         }
     }
+    /**
+     * This is used internally by Nymph. Don't call it yourself.
+     *
+     * @returns A clone of this instance.
+     */
     clone() {
         return new MySQLDriver(this.config, this.link, this.transaction ?? undefined);
     }
@@ -50,22 +57,29 @@ class MySQLDriver extends nymph_1.NymphDriver {
         }
         return new Promise((resolve, reject) => this.link.getConnection((err, con) => (err ? reject(err) : resolve(con))));
     }
+    /**
+     * Connect to the MySQL database.
+     *
+     * @returns Whether this instance is connected to a MySQL database.
+     */
     async connect() {
+        // If we think we're connected, try pinging the server.
         try {
             if (this.connected) {
                 const connection = await new Promise((resolve, reject) => this.link.getConnection((err, con) => err ? reject(err) : resolve(con)));
-                await new Promise((resolve) => connection.ping(() => {
-                    resolve(0);
-                }));
                 connection.release();
             }
         }
         catch (e) {
             this.connected = false;
         }
+        // Connecting, selecting database
         if (!this.connected) {
             try {
-                this.link = mysql.createPool(this.mysqlConfig);
+                this.link = mysql.createPool({
+                    ...this.mysqlConfig,
+                    charset: 'utf8mb4_bin',
+                });
                 this.connected = true;
             }
             catch (e) {
@@ -73,15 +87,20 @@ class MySQLDriver extends nymph_1.NymphDriver {
                     this.mysqlConfig.user === 'nymph' &&
                     this.mysqlConfig.password === 'password' &&
                     this.mysqlConfig.database === 'nymph') {
-                    throw new nymph_1.NotConfiguredError("It seems the config hasn't been set up correctly.");
+                    throw new NotConfiguredError("It seems the config hasn't been set up correctly.");
                 }
                 else {
-                    throw new nymph_1.UnableToConnectError('Could not connect: ' + e?.message);
+                    throw new UnableToConnectError('Could not connect: ' + e?.message);
                 }
             }
         }
         return this.connected;
     }
+    /**
+     * Disconnect from the MySQL database.
+     *
+     * @returns Whether this instance is connected to a MySQL database.
+     */
     async disconnect() {
         if (this.connected) {
             await new Promise((resolve) => this.link.end(() => resolve(0)));
@@ -90,68 +109,185 @@ class MySQLDriver extends nymph_1.NymphDriver {
         return this.connected;
     }
     async inTransaction() {
+        if (this.transaction && this.transaction.count === 0) {
+            this.transaction = null;
+        }
         return !!this.transaction;
     }
+    /**
+     * Check connection status.
+     *
+     * @returns Whether this instance is connected to a MySQL database.
+     */
     isConnected() {
         return this.connected;
     }
-    createTables(etype = null) {
-        this.queryRunSync('SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";');
-        let foreignKeyDataTableGuid = '';
-        let foreignKeyDataComparisonsTableGuid = '';
-        let foreignKeyReferencesTableGuid = '';
-        if (this.config.foreignKeys) {
-            foreignKeyDataTableGuid = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
-            foreignKeyDataComparisonsTableGuid = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
-            foreignKeyReferencesTableGuid = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
-        }
-        if (etype != null) {
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (
+    async createEntitiesTable(etype) {
+        // Create the entity table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (
           \`guid\` BINARY(12) NOT NULL,
           \`tags\` LONGTEXT,
           \`cdate\` DOUBLE PRECISION NOT NULL,
           \`mdate\` DOUBLE PRECISION NOT NULL,
+          \`user\` BINARY(12),
+          \`group\` BINARY(12),
+          \`acUser\` TINYINT UNSIGNED,
+          \`acGroup\` TINYINT UNSIGNED,
+          \`acOther\` TINYINT UNSIGNED,
+          \`acRead\` LONGTEXT,
+          \`acWrite\` LONGTEXT,
+          \`acFull\` LONGTEXT,
           PRIMARY KEY (\`guid\`),
+          INDEX \`id_guid\` USING HASH (\`guid\`),
           INDEX \`id_cdate\` USING BTREE (\`cdate\`),
           INDEX \`id_mdate\` USING BTREE (\`mdate\`),
-          FULLTEXT \`id_tags\` (\`tags\`)
-        ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (
-          \`guid\` BINARY(12) NOT NULL${foreignKeyDataTableGuid},
-          \`name\` TEXT NOT NULL,
-          \`value\` LONGTEXT NOT NULL,
-          PRIMARY KEY (\`guid\`,\`name\`(255)),
-          INDEX \`id_name\` USING HASH (\`name\`(255)),
-          INDEX \`id_name_value\` USING BTREE (\`name\`(255), \`value\`(512))
+          FULLTEXT \`id_tags\` (\`tags\`),
+          INDEX \`id_user_acUser\` USING BTREE (\`user\`, \`acUser\`),
+          INDEX \`id_group_acGroup\` USING BTREE (\`group\`, \`acGroup\`),
+          INDEX \`id_acUser\` USING BTREE (\`acUser\`),
+          INDEX \`id_acGroup\` USING BTREE (\`acGroup\`),
+          INDEX \`id_acOther\` USING BTREE (\`acOther\`),
+          FULLTEXT \`id_acRead\` (\`acRead\`),
+          FULLTEXT \`id_acWrite\` (\`acWrite\`),
+          FULLTEXT \`id_acFull\` (\`acFull\`)
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} (
-          \`guid\` BINARY(12) NOT NULL${foreignKeyDataComparisonsTableGuid},
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+    }
+    async addTilmeldColumnsAndIndexes(etype) {
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`user\` BINARY(12);`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`group\` BINARY(12);`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acUser\` TINYINT UNSIGNED;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acGroup\` TINYINT UNSIGNED;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acOther\` TINYINT UNSIGNED;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acRead\` LONGTEXT;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acWrite\` LONGTEXT;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acFull\` LONGTEXT;`);
+        await this.createEntitiesTilmeldIndexes(etype);
+    }
+    async createEntitiesTilmeldIndexes(etype) {
+        await this.queryRun(`CREATE INDEX \`id_user_acUser\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`user\`, \`acUser\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_group_acGroup\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`group\`, \`acGroup\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_acUser\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acUser\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_acGroup\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acGroup\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_acOther\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acOther\`) USING BTREE;`);
+        await this.queryRun(`CREATE FULLTEXT INDEX \`id_acRead\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acRead\`);`);
+        await this.queryRun(`CREATE FULLTEXT INDEX \`id_acWrite\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acWrite\`);`);
+        await this.queryRun(`CREATE FULLTEXT INDEX \`id_acFull\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acFull\`);`);
+    }
+    async createDataTable(etype) {
+        let foreignKey = '';
+        if (this.config.foreignKeys) {
+            foreignKey = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
+        }
+        // Create the data table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (
+          \`guid\` BINARY(12) NOT NULL${foreignKey},
           \`name\` TEXT NOT NULL,
-          \`truthy\` BOOLEAN,
+          \`value\` CHAR(1) NOT NULL,
+          \`json\` JSON,
           \`string\` LONGTEXT,
           \`number\` DOUBLE,
+          \`truthy\` BOOLEAN,
           PRIMARY KEY (\`guid\`, \`name\`(255)),
-          INDEX \`id_name\` USING HASH (\`name\`(255))
+          INDEX \`id_guid\` USING HASH (\`guid\`),
+          INDEX \`id_guid_name\` USING HASH (\`guid\`, \`name\`(255)),
+          INDEX \`id_name\` USING BTREE (\`name\`(255)),
+          INDEX \`id_name_json\` USING BTREE (\`name\`(255), (CAST(\`json\` AS CHAR(512)) COLLATE utf8mb4_bin)),
+          INDEX \`id_name_string\` USING BTREE (\`name\`(255), \`string\`(512)),
+          INDEX \`id_name_number\` USING BTREE (\`name\`(255), \`number\`),
+          INDEX \`id_guid_name_number\` USING BTREE (\`guid\`, \`name\`(255), \`number\`),
+          INDEX \`id_name_truthy\` USING HASH (\`name\`(255), \`truthy\`),
+          INDEX \`id_guid_name_truthy\` USING HASH (\`guid\`, \`name\`(255), \`truthy\`)
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} (
-          \`guid\` BINARY(12) NOT NULL${foreignKeyReferencesTableGuid},
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+    }
+    async createReferencesTable(etype) {
+        let foreignKey = '';
+        if (this.config.foreignKeys) {
+            foreignKey = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
+        }
+        // Create the references table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} (
+          \`guid\` BINARY(12) NOT NULL${foreignKey},
           \`name\` TEXT NOT NULL,
           \`reference\` BINARY(12) NOT NULL,
           PRIMARY KEY (\`guid\`, \`name\`(255), \`reference\`),
-          INDEX \`id_name_reference\` USING BTREE (\`name\`(255), \`reference\`)
+          INDEX \`id_guid\` USING HASH (\`guid\`),
+          INDEX \`id_name\` USING HASH (\`name\`(255)),
+          INDEX \`id_name_reference\` USING HASH (\`name\`(255), \`reference\`),
+          INDEX \`id_reference\` USING HASH (\`reference\`),
+          INDEX \`id_guid_name\` USING HASH (\`guid\`, \`name\`(255)),
+          INDEX \`id_guid_name_reference\` USING HASH (\`guid\`, \`name\`(255), \`reference\`),
+          INDEX \`id_reference_name_guid\` USING BTREE (\`reference\`, \`name\`(255), \`guid\`),
+          INDEX \`id_reference_guid_name\` USING BTREE (\`reference\`, \`guid\`, \`name\`(255))
+        ) ENGINE ${this.config.engine}
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+    }
+    async createTokensTable(etype) {
+        let foreignKey = '';
+        if (this.config.foreignKeys) {
+            foreignKey = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
+        }
+        // Create the tokens table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} (
+          \`guid\` BINARY(12) NOT NULL${foreignKey},
+          \`name\` TEXT NOT NULL,
+          \`token\` INT NOT NULL,
+          \`position\` INT UNSIGNED NOT NULL,
+          \`stem\` BOOLEAN NOT NULL,
+          PRIMARY KEY (\`guid\`, \`name\`(255), \`token\`, \`position\`),
+          INDEX \`id_guid_name_token_position\` USING HASH (\`guid\`, \`name\`(255), \`token\`, \`position\`),
+          INDEX \`id_name_token\` USING btree (\`name\`(255), \`token\`)
+        ) ENGINE ${this.config.engine}
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+    }
+    async createUniquesTable(etype) {
+        let foreignKey = '';
+        if (this.config.foreignKeys) {
+            foreignKey = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
+        }
+        // Create the unique strings table.
+        // 255 key is max length for charset UTF8.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} (
+          \`guid\` BINARY(12) NOT NULL${foreignKey},
+          \`unique\` TEXT NOT NULL,
+          PRIMARY KEY (\`guid\`, \`unique\`(255)),
+          INDEX \`id_guid\` USING HASH (\`guid\`),
+          CONSTRAINT \`uc_unique\` UNIQUE (\`unique\`(255))
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+    }
+    /**
+     * Create entity tables in the database.
+     *
+     * @param etype The entity type to create a table for. If this is blank, the default tables are created.
+     * @returns True on success, false on failure.
+     */
+    async createTables(etype = null) {
+        await this.queryRun('SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";');
+        if (etype != null) {
+            await this.createEntitiesTable(etype);
+            await this.createDataTable(etype);
+            await this.createReferencesTable(etype);
+            await this.createTokensTable(etype);
+            await this.createUniquesTable(etype);
         }
         else {
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}uids`)} (
+            // Create the UID table.
+            await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}uids`)} (
           \`name\` TEXT NOT NULL,
           \`cur_uid\` BIGINT(20) UNSIGNED NOT NULL,
           PRIMARY KEY (\`name\`(100))
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+        }
+        if (this.transaction &&
+            this.transaction.count > 0 &&
+            this.config.transactions) {
+            this.transaction.count = 0;
+            this.transaction.connection?.release();
+            this.transaction.connection = null;
+            this.transaction = null;
         }
         return true;
     }
@@ -169,190 +305,128 @@ class MySQLDriver extends nymph_1.NymphDriver {
     }
     async query(runQuery, query, etypes = []) {
         try {
+            this.nymph.config.debugInfo('mysql:query', query);
             return await runQuery();
         }
         catch (e) {
             const errorCode = e?.errno;
-            if (errorCode === 1146 && this.createTables()) {
+            if (errorCode === 1146 && (await this.createTables())) {
+                // If the tables don't exist yet, create them.
                 for (let etype of etypes) {
-                    this.createTables(etype);
+                    await this.createTables(etype);
                 }
                 try {
                     return await runQuery();
                 }
                 catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query);
+                    throw new QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query, e2?.errno);
                 }
             }
-            else if (errorCode === 2006) {
-                if (!this.connect()) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e?.errno + ' - ' + e?.message, query);
-                }
-                try {
-                    return await runQuery();
-                }
-                catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query);
-                }
-            }
-            else {
-                throw e;
-            }
-        }
-    }
-    querySync(runQuery, query, etypes = []) {
-        try {
-            return runQuery();
-        }
-        catch (e) {
-            const errorCode = e?.errno;
-            if (errorCode === 1146 && this.createTables()) {
-                for (let etype of etypes) {
-                    this.createTables(etype);
-                }
-                try {
-                    return runQuery();
-                }
-                catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query);
-                }
+            else if (errorCode === 1062) {
+                throw new EntityUniqueConstraintError(`Unique constraint violation.`);
             }
             else if (errorCode === 2006) {
-                if (!this.connect()) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e?.errno + ' - ' + e?.message, query);
+                // If the MySQL server disconnected, reconnect to it.
+                if (!(await this.connect())) {
+                    throw new QueryFailedError('Query failed: ' + e?.errno + ' - ' + e?.message, query, e?.errno);
                 }
                 try {
-                    return runQuery();
+                    return await runQuery();
                 }
                 catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query);
+                    throw new QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query, e2?.errno);
                 }
             }
             else {
-                throw e;
+                throw new QueryFailedError('Query failed: ' + e?.errno + ' - ' + e?.message, query, e?.errno);
             }
         }
     }
-    queryIter(query, { etypes = [], params = {}, } = {}) {
+    queryArray(query, { etypes = [], params = {}, } = {}) {
         const { query: newQuery, params: newParams } = this.translateQuery(query, params);
         return this.query(async () => {
-            const results = await new Promise((resolve, reject) => {
-                try {
-                    (this.transaction?.connection ?? this.link).query(newQuery, newParams, (error, results) => {
-                        if (error) {
-                            reject(error);
-                        }
-                        resolve(results);
-                    });
-                }
-                catch (e) {
-                    reject(e);
+            const results = await new Promise(async (resolve, reject) => {
+                // Only do one query at a time in transations.
+                let myResolve = () => { };
+                const myPromise = new Promise((resolve) => {
+                    myResolve = resolve;
+                });
+                if (this.transaction) {
+                    const latestPromise = this.transaction.latestPromise;
+                    this.transaction.latestPromise = myPromise;
+                    await latestPromise;
                 }
+                (this.transaction?.connection ?? this.link).query(newQuery, newParams, (error, results) => {
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        resolve(results);
+                    }
+                    myResolve();
+                });
             });
             return results;
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
-    queryIterSync(query, { etypes = [], params = {}, } = {}) {
-        const { query: newQuery, params: newParams } = this.translateQuery(query, params);
-        return this.querySync(() => {
-            const output = child_process_1.default.spawnSync(process.argv0, [__dirname + '/runMysqlSync.js'], {
-                input: JSON.stringify({
-                    mysqlConfig: this.mysqlConfig,
-                    query: newQuery,
-                    params: newParams,
-                }),
-                timeout: 30000,
-                maxBuffer: 100 * 1024 * 1024,
-                encoding: 'utf8',
-                windowsHide: true,
-            });
-            try {
-                const { results } = JSON.parse(output.stdout);
-                return results;
-            }
-            catch (e) {
-            }
-            if (output.status === 0) {
-                throw new Error('Unknown parse error.');
-            }
-            const err = JSON.parse(output.stderr);
-            const e = new Error(err.name);
-            for (const name in err) {
-                e[name] = err[name];
-            }
-        }, `${query} -- ${JSON.stringify(params)}`, etypes);
-    }
     queryGet(query, { etypes = [], params = {}, } = {}) {
         const { query: newQuery, params: newParams } = this.translateQuery(query, params);
         return this.query(async () => {
-            const results = await new Promise((resolve, reject) => {
-                try {
-                    (this.transaction?.connection ?? this.link).query(newQuery, newParams, (error, results) => {
-                        if (error) {
-                            reject(error);
-                        }
-                        resolve(results);
-                    });
-                }
-                catch (e) {
-                    reject(e);
+            const results = await new Promise(async (resolve, reject) => {
+                // Only do one query at a time in transations.
+                let myResolve = () => { };
+                const myPromise = new Promise((resolve) => {
+                    myResolve = resolve;
+                });
+                if (this.transaction) {
+                    const latestPromise = this.transaction.latestPromise;
+                    this.transaction.latestPromise = myPromise;
+                    await latestPromise;
                 }
+                (this.transaction?.connection ?? this.link).query(newQuery, newParams, (error, results) => {
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        resolve(results);
+                    }
+                    myResolve();
+                });
             });
             return results[0];
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
-    queryRun(query, { etypes = [], params = {}, } = {}) {
+    queryRun(query, { etypes = [], params = {}, transaction, } = {}) {
         const { query: newQuery, params: newParams } = this.translateQuery(query, params);
         return this.query(async () => {
-            const results = await new Promise((resolve, reject) => {
-                try {
-                    (this.transaction?.connection ?? this.link).query(newQuery, newParams, (error, results) => {
-                        if (error) {
-                            reject(error);
-                        }
-                        resolve(results);
-                    });
-                }
-                catch (e) {
-                    reject(e);
+            const results = await new Promise(async (resolve, reject) => {
+                // Only do one query at a time in transations.
+                let myResolve = () => { };
+                const myPromise = new Promise((resolve) => {
+                    myResolve = resolve;
+                });
+                const trans = transaction ?? this.transaction;
+                if (trans) {
+                    const latestPromise = trans.latestPromise;
+                    trans.latestPromise = myPromise;
+                    await latestPromise;
                 }
+                (trans?.connection ?? this.link).query(newQuery, newParams, (error, results) => {
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        resolve(results);
+                    }
+                    myResolve();
+                });
             });
             return { changes: results.changedRows ?? 0 };
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
-    queryRunSync(query, { etypes = [], params = {}, } = {}) {
-        const { query: newQuery, params: newParams } = this.translateQuery(query, params);
-        return this.querySync(() => {
-            const output = child_process_1.default.spawnSync(process.argv0, [__dirname + '/runMysqlSync.js'], {
-                input: JSON.stringify({
-                    mysqlConfig: this.mysqlConfig,
-                    query: newQuery,
-                    params: newParams,
-                }),
-                timeout: 30000,
-                maxBuffer: 100 * 1024 * 1024,
-                encoding: 'utf8',
-                windowsHide: true,
-            });
-            try {
-                const { results } = JSON.parse(output.stdout);
-                return { changes: results.changedRows ?? 0 };
-            }
-            catch (e) {
-            }
-            if (output.status === 0) {
-                throw new Error('Unknown parse error.');
-            }
-            const err = JSON.parse(output.stderr);
-            const e = new Error(err.name);
-            for (const name in err) {
-                e[name] = err[name];
-            }
-        }, `${query} -- ${JSON.stringify(params)}`, etypes);
-    }
     async commit(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
-            throw new nymph_1.InvalidParametersError('Transaction commit attempted without a name.');
+            throw new InvalidParametersError('Transaction commit attempted without a name.');
         }
         if (!this.transaction || this.transaction.count === 0) {
             this.transaction = null;
@@ -394,32 +468,40 @@ class MySQLDriver extends nymph_1.NymphDriver {
                     guid,
                 },
             });
-            await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+            await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                 etypes: [etype],
                 params: {
                     guid,
                 },
             });
-            await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+            await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+                etypes: [etype],
+                params: {
+                    guid,
+                },
+            });
+            await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                 etypes: [etype],
                 params: {
                     guid,
                 },
             });
-            await this.commit('nymph-delete');
-            if (this.nymph.config.cache) {
-                this.cleanCache(guid);
-            }
-            return true;
         }
         catch (e) {
+            this.nymph.config.debugError('mysql', `Delete entity error: "${e}"`);
             await this.rollback('nymph-delete');
             throw e;
         }
+        await this.commit('nymph-delete');
+        // Remove any cached versions of this entity.
+        if (this.nymph.config.cache) {
+            this.cleanCache(guid);
+        }
+        return true;
     }
     async deleteUID(name) {
         if (!name) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID');
+            throw new InvalidParametersError('Name not given for UID');
         }
         await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}uids`)} WHERE \`name\`=@name;`, {
             params: {
@@ -428,79 +510,228 @@ class MySQLDriver extends nymph_1.NymphDriver {
         });
         return true;
     }
-    async exportEntities(writeLine) {
-        writeLine('#nex2');
-        writeLine('# Nymph Entity Exchange v2');
-        writeLine('# http://nymph.io');
-        writeLine('#');
-        writeLine('# Generation Time: ' + new Date().toLocaleString());
-        writeLine('');
-        writeLine('#');
-        writeLine('# UIDs');
-        writeLine('#');
-        writeLine('');
-        let uids = await this.queryIter(`SELECT * FROM ${MySQLDriver.escape(`${this.prefix}uids`)} ORDER BY \`name\`;`);
-        for (const uid of uids) {
-            writeLine(`<${uid.name}>[${uid.cur_uid}]`);
-        }
-        writeLine('');
-        writeLine('#');
-        writeLine('# Entities');
-        writeLine('#');
-        writeLine('');
-        const tables = await this.queryIter('SHOW TABLES;');
+    async getIndexes(etype) {
+        const indexes = [];
+        for (let [scope, suffix] of [
+            ['data', '_json'],
+            ['references', '_reference_guid'],
+            ['tokens', '_token_position_stem'],
+        ]) {
+            const indexDefinitions = await this.queryArray(`SHOW INDEXES FROM ${MySQLDriver.escape(`${this.prefix}${scope}_${etype}`)} WHERE \`Key_name\` LIKE @pattern AND \`Seq_in_index\`=1;`, {
+                params: {
+                    pattern: `${this.prefix}${scope}_${etype}_id_custom_%${suffix}`,
+                },
+            });
+            for (const indexDefinition of indexDefinitions) {
+                indexes.push({
+                    scope,
+                    name: indexDefinition.Key_name.substring(`${this.prefix}${scope}_${etype}_id_custom_`.length, indexDefinition.Key_name.length - suffix.length),
+                    property: (indexDefinition.Expression.match(/\s*\(?\s*`?name`?\s*=\s*(?:\w*)\\*'(.*?)\\*'/) ?? [])[1] ?? '',
+                });
+            }
+        }
+        return indexes;
+    }
+    async addIndex(etype, definition) {
+        this.checkIndexName(definition.name);
+        await this.deleteIndex(etype, definition.scope, definition.name);
+        if (definition.scope === 'data') {
+            await this.queryRun(`CREATE INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_json`)} USING btree ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (((\`name\` = ${MySQLDriver.escapeValue(definition.property)})), (CAST(\`json\` AS CHAR(512)) COLLATE utf8mb4_bin));`);
+            await this.queryRun(`CREATE INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_string`)} USING btree ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (((\`name\` = ${MySQLDriver.escapeValue(definition.property)})), \`string\`(512));`);
+            await this.queryRun(`CREATE INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_number`)} USING btree ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (((\`name\` = ${MySQLDriver.escapeValue(definition.property)})), \`number\`);`);
+            await this.queryRun(`CREATE INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_truthy`)} USING btree ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (((\`name\` = ${MySQLDriver.escapeValue(definition.property)})), \`truthy\`);`);
+        }
+        else if (definition.scope === 'references') {
+            await this.queryRun(`CREATE INDEX ${MySQLDriver.escape(`${this.prefix}references_${etype}_id_custom_${definition.name}_reference_guid`)} USING btree ON ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} (((\`name\` = ${MySQLDriver.escapeValue(definition.property)})), \`reference\`, \`guid\`);`);
+        }
+        else if (definition.scope === 'tokens') {
+            await this.queryRun(`CREATE INDEX ${MySQLDriver.escape(`${this.prefix}tokens_${etype}_id_custom_${definition.name}_token_position_stem`)} USING btree ON ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} (((\`name\` = ${MySQLDriver.escapeValue(definition.property)})), \`token\`, \`position\`, \`stem\`);`);
+        }
+        return true;
+    }
+    async deleteIndex(etype, scope, name) {
+        this.checkIndexName(name);
+        try {
+            if (scope === 'data') {
+                await this.queryRun(`DROP INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_json`)} ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)};`);
+                await this.queryRun(`DROP INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_string`)} ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)};`);
+                await this.queryRun(`DROP INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_number`)} ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)};`);
+                await this.queryRun(`DROP INDEX ${MySQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_truthy`)} ON ${MySQLDriver.escape(`${this.prefix}data_${etype}`)};`);
+            }
+            else if (scope === 'references') {
+                await this.queryRun(`DROP INDEX ${MySQLDriver.escape(`${this.prefix}references_${etype}_id_custom_${name}_reference_guid`)} ON ${MySQLDriver.escape(`${this.prefix}references_${etype}`)};`);
+            }
+            else if (scope === 'tokens') {
+                await this.queryRun(`DROP INDEX ${MySQLDriver.escape(`${this.prefix}tokens_${etype}_id_custom_${name}_token_position_stem`)} ON ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)};`);
+            }
+        }
+        catch (e) {
+            if (e?.errorCode !== 1091) {
+                throw e;
+            }
+        }
+        return true;
+    }
+    async getEtypes() {
+        const tables = await this.queryArray('SELECT `table_name` AS `table_name` FROM `information_schema`.`tables` WHERE `table_schema`=@db AND `table_name` LIKE @prefix;', {
+            params: {
+                db: this.config.database,
+                prefix: this.prefix + 'entities_' + '%',
+            },
+        });
         const etypes = [];
-        for (const tableRow of tables) {
-            const table = tableRow[Object.keys(tableRow)[0]];
-            if (table.startsWith(this.prefix + 'entities_')) {
-                etypes.push(table.substr((this.prefix + 'entities_').length));
+        for (const table of tables) {
+            etypes.push(table.table_name.substr((this.prefix + 'entities_').length));
+        }
+        return etypes;
+    }
+    async *exportDataIterator() {
+        if (yield {
+            type: 'comment',
+            content: `#nex2
+# Nymph Entity Exchange v2
+# http://nymph.io
+#
+# Generation Time: ${new Date().toLocaleString()}
+`,
+        }) {
+            return;
+        }
+        if (yield {
+            type: 'comment',
+            content: `
+
+#
+# UIDs
+#
+
+`,
+        }) {
+            return;
+        }
+        // Export UIDs.
+        let uids = await this.queryArray(`SELECT * FROM ${MySQLDriver.escape(`${this.prefix}uids`)} ORDER BY \`name\`;`);
+        for (const uid of uids) {
+            if (yield { type: 'uid', content: `<${uid.name}>[${uid.cur_uid}]\n` }) {
+                return;
             }
         }
+        if (yield {
+            type: 'comment',
+            content: `
+
+#
+# Entities
+#
+
+`,
+        }) {
+            return;
+        }
+        // Get the etypes.
+        const etypes = await this.getEtypes();
         for (const etype of etypes) {
-            const dataIterator = (await this.queryIter(`SELECT LOWER(HEX(e.\`guid\`)) AS \`guid\`, e.\`tags\`, e.\`cdate\`, e.\`mdate\`, d.\`name\` AS \`dname\`, d.\`value\` AS \`dvalue\`, c.\`string\`, c.\`number\`
+            // Export entities.
+            const dataIterator = (await this.queryArray(`SELECT LOWER(HEX(e.\`guid\`)) AS \`guid\`, e.\`tags\`, e.\`cdate\`, e.\`mdate\`, LOWER(HEX(e.\`user\`)) AS \`user\`, LOWER(HEX(e.\`group\`)) AS \`group\`, e.\`acUser\`, e.\`acGroup\`, e.\`acOther\`, e.\`acRead\`, e.\`acWrite\`, e.\`acFull\`, d.\`name\`, d.\`value\`, d.\`json\`, d.\`string\`, d.\`number\`
           FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} e
           LEFT JOIN ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} d ON e.\`guid\`=d.\`guid\`
-          INNER JOIN ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} c ON d.\`guid\`=c.\`guid\` AND d.\`name\`=c.\`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).split(' ').join(',');
+                const tags = datum.value.tags
+                    .slice(1, -1)
+                    .split(' ')
+                    .filter((tag) => tag)
+                    .join(',');
                 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) {
+                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 = [];
+                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. $row will end on the next entity.
                     do {
-                        const value = datum.value.dvalue === 'N'
+                        const value = datum.value.value === 'N'
                             ? JSON.stringify(datum.value.number)
-                            : datum.value.dvalue === 'S'
+                            : datum.value.value === 'S'
                                 ? JSON.stringify(datum.value.string)
-                                : datum.value.dvalue;
-                        writeLine(`\t${datum.value.dname}=${value}`);
+                                : datum.value.value === 'J'
+                                    ? JSON.stringify(datum.value.json)
+                                    : datum.value.value;
+                        currentEntityExport.push(`\t${datum.value.name}=${value}`);
                         datum = dataIterator.next();
                     } while (!datum.done && datum.value.guid === guid);
                 }
                 else {
+                    // Make sure that datum is incremented :)
                     datum = dataIterator.next();
                 }
+                currentEntityExport.push('');
+                if (yield { type: 'entity', content: currentEntityExport.join('\n') }) {
+                    return;
+                }
             }
         }
-        return;
     }
-    makeEntityQuery(options, formattedSelectors, etype, count = { i: 0 }, params = {}, subquery = false, tableSuffix = '', etypes = []) {
+    /**
+     * Generate the MySQL query.
+     * @param options The options array.
+     * @param formattedSelectors The formatted selector array.
+     * @param etype
+     * @param count Used to track internal params.
+     * @param params Used to store internal params.
+     * @param subquery Whether only a subquery should be returned.
+     * @returns The SQL query.
+     */
+    makeEntityQuery(options, formattedSelectors, etype, count = { i: 0 }, params = {}, subquery = false, tableSuffix = '', etypes = [], guidSelector = undefined, guidExplicitSelector = 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 countTable = `count${tableSuffix}`;
-        const sort = options.sort ?? 'cdate';
-        const queryParts = this.iterateSelectorsForQuery(formattedSelectors, (key, value, typeIsOr, typeIsNot) => {
+        const sTable = `s${tableSuffix}`;
+        const sort = options.sort === undefined ? 'cdate' : options.sort;
+        const queryParts = this.iterateSelectorsForQuery(formattedSelectors, ({ key, value, typeIsOr, typeIsNot }) => {
             const clauseNot = key.startsWith('!');
             let curQuery = '';
             for (const curValue of value) {
@@ -513,7 +744,7 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             }
                             const guid = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '.`guid`=UNHEX(@' +
                                     guid +
@@ -523,7 +754,7 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'tag':
                     case '!tag':
-                        if ((0, nymph_1.xor)(typeIsNot, clauseNot)) {
+                        if (xor(typeIsNot, clauseNot)) {
                             if (typeIsOr) {
                                 for (const curTag of curValue) {
                                     if (curQuery) {
@@ -564,17 +795,38 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             if (curQuery) {
                                 curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
-                            const name = `param${++count.i}`;
-                            curQuery +=
-                                ieTable +
-                                    '.`guid` ' +
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    'IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.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 +
+                                        '.' +
+                                        MySQLDriver.escape(curVar) +
+                                        ' IS NOT NULL)';
+                            }
+                            else {
+                                const name = `param${++count.i}`;
+                                curQuery +=
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        'EXISTS (SELECT `guid` FROM ' +
+                                        MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                        ' WHERE `guid`=' +
+                                        ieTable +
+                                        '.`guid` AND `name`=@' +
+                                        name +
+                                        ')';
+                                params[name] = curVar;
+                            }
                         }
                         break;
                     case 'truthy':
@@ -583,30 +835,34 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             if (curQuery) {
                                 curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
-                            if (curVar === 'cdate') {
-                                curQuery +=
-                                    ((0, nymph_1.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 +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                         '(' +
                                         ieTable +
-                                        '.`mdate` NOT NULL)';
-                                break;
+                                        '.' +
+                                        MySQLDriver.escape(curVar) +
+                                        ' IS NOT NULL)';
                             }
                             else {
                                 const name = `param${++count.i}`;
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        'EXISTS (SELECT `guid` FROM ' +
+                                        MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                        ' WHERE `guid`=' +
                                         ieTable +
-                                        '.`guid` IN (SELECT `guid` FROM ' +
-                                        MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                        ' WHERE `name`=@' +
+                                        '.`guid` AND `name`=@' +
                                         name +
                                         ' AND `truthy`=TRUE)';
                                 params[name] = curVar;
@@ -615,35 +871,61 @@ class MySQLDriver extends nymph_1.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 cdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`cdate`=@' +
-                                    cdate;
-                            params[cdate] = isNaN(Number(curValue[1]))
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '=@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
-                        else if (curValue[0] === 'mdate') {
+                        else if (this.nymph.tilmeld != null &&
+                            (curValue[0] === 'user' || curValue[0] === 'group')) {
                             if (curQuery) {
                                 curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
-                            const mdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`mdate`=@' +
-                                    mdate;
-                            params[mdate] = isNaN(Number(curValue[1]))
-                                ? null
-                                : Number(curValue[1]);
-                            break;
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '=UNHEX(@' +
+                                    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 value = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    ieTable +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '=@' +
+                                    value;
+                            params[value] = Array.isArray(curValue[1])
+                                ? ' ' + curValue[1].join(' ') + ' '
+                                : '';
                         }
                         else if (typeof curValue[1] === 'number') {
                             if (curQuery) {
@@ -652,11 +934,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `number`=@' +
                                     value +
@@ -671,11 +954,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `string`=@' +
                                     value +
@@ -697,139 +981,284 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             }
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
-                                    ' WHERE `name`=@' +
-                                    name +
-                                    ' AND `value`=@' +
-                                    value +
-                                    ')';
+                            if (svalue.length < 512) {
+                                curQuery +=
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        'EXISTS (SELECT `guid` FROM ' +
+                                        MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                        ' WHERE `guid`=' +
+                                        ieTable +
+                                        '.`guid` AND `name`=@' +
+                                        name +
+                                        ' AND (CAST(`json` AS CHAR(512)) COLLATE utf8mb4_bin)=CAST(CAST(@' +
+                                        value +
+                                        ' AS JSON) AS CHAR(512)))';
+                            }
+                            else {
+                                curQuery +=
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        'EXISTS (SELECT `guid` FROM ' +
+                                        MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                        ' WHERE `guid`=' +
+                                        ieTable +
+                                        '.`guid` AND `name`=@' +
+                                        name +
+                                        ' AND `json`=CAST(@' +
+                                        value +
+                                        ' AS JSON))';
+                            }
                             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 cdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`cdate`=' +
-                                    cdate;
-                            params[cdate] = isNaN(Number(curValue[1]))
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '=@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
-                        else if (curValue[0] === 'mdate') {
+                        else if (this.nymph.tilmeld != null &&
+                            (curValue[0] === 'user' || curValue[0] === 'group')) {
                             if (curQuery) {
                                 curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
-                            const mdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`mdate`=' +
-                                    mdate;
-                            params[mdate] = isNaN(Number(curValue[1]))
-                                ? null
-                                : Number(curValue[1]);
-                            break;
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '=UNHEX(@' +
+                                    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 queryParam = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'MATCH (' +
+                                    ieTable +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    ') AGAINST (@' +
+                                    queryParam +
+                                    ' IN BOOLEAN MODE)';
+                            params[queryParam] = '+' + curValue[1];
                         }
                         else {
                             if (curQuery) {
                                 curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
                             let svalue;
-                            let stringValue;
                             if (curValue[1] instanceof Object &&
                                 typeof curValue[1].toReference === 'function') {
                                 svalue = JSON.stringify(curValue[1].toReference());
-                                stringValue = `${curValue[1].toReference()}`;
                             }
                             else {
                                 svalue = JSON.stringify(curValue[1]);
-                                stringValue = `${curValue[1]}`;
                             }
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
-                            if (typeof curValue[1] === 'string') {
-                                const stringParam = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
+                                    ieTable +
+                                    '.`guid` AND `name`=@' +
+                                    name +
+                                    ' AND JSON_CONTAINS(`json`, @' +
+                                    value +
+                                    '))';
+                            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 ' : '') + '(FALSE)';
+                        }
+                        else {
+                            if (curQuery) {
+                                curQuery += typeIsOr ? ' OR ' : ' AND ';
+                            }
+                            const parsedFTSQuery = this.tokenizer.parseSearchQuery(curValue[1]);
+                            if (!parsedFTSQuery.length) {
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                        '(' +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') + '(FALSE)';
+                            }
+                            else {
+                                const name = `param${++count.i}`;
+                                const queryPartToken = (term) => {
+                                    const value = `param${++count.i}`;
+                                    params[value] = term.token;
+                                    return ('EXISTS (SELECT `guid` FROM ' +
+                                        MySQLDriver.escape(this.prefix + 'tokens_' + etype) +
+                                        ' WHERE `guid`=' +
                                         ieTable +
-                                        '.`guid` IN (SELECT `guid` FROM ' +
-                                        MySQLDriver.escape(this.prefix + 'data_' + etype) +
-                                        ' WHERE `name`=@' +
+                                        '.`guid` AND `name`=@' +
                                         name +
-                                        ' AND INSTR(`value`, @' +
+                                        ' AND `token`=@' +
                                         value +
-                                        ')) OR ' +
+                                        (term.nostemmed ? ' AND `stem`=FALSE' : '') +
+                                        ')');
+                                };
+                                const queryPartSeries = (series) => {
+                                    const tokenTableSuffix = makeTableSuffix();
+                                    const tokenParts = series.tokens.map((token, i) => {
+                                        const value = `param${++count.i}`;
+                                        params[value] = token.token;
+                                        return {
+                                            fromClause: i === 0
+                                                ? 'FROM ' +
+                                                    MySQLDriver.escape(this.prefix + 'tokens_' + etype) +
+                                                    ' t' +
+                                                    tokenTableSuffix +
+                                                    '0'
+                                                : 'JOIN ' +
+                                                    MySQLDriver.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`=FALSE'
+                                                    : ''),
+                                        };
+                                    });
+                                    return ('EXISTS (SELECT t' +
+                                        tokenTableSuffix +
+                                        '0.`guid` ' +
+                                        tokenParts.map((part) => part.fromClause).join(' ') +
+                                        ' WHERE t' +
+                                        tokenTableSuffix +
+                                        '0.`guid`=' +
                                         ieTable +
-                                        '.`guid` IN (SELECT `guid` FROM ' +
-                                        MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                        ' WHERE `name`=@' +
+                                        '.`guid` AND t' +
+                                        tokenTableSuffix +
+                                        '0.`name`=@' +
                                         name +
-                                        ' AND `string`=@' +
-                                        stringParam +
-                                        '))';
-                                params[stringParam] = stringValue;
-                            }
-                            else {
+                                        ' AND ' +
+                                        tokenParts.map((part) => part.whereClause).join(' AND ') +
+                                        ')');
+                                };
+                                const queryPartTerm = (term) => {
+                                    if (term.type === 'series') {
+                                        return queryPartSeries(term);
+                                    }
+                                    else if (term.type === 'not') {
+                                        return 'NOT ' + queryPartTerm(term.operand);
+                                    }
+                                    else if (term.type === 'or') {
+                                        let queryParts = [];
+                                        for (let operand of term.operands) {
+                                            queryParts.push(queryPartTerm(operand));
+                                        }
+                                        return '(' + queryParts.join(' OR ') + ')';
+                                    }
+                                    return queryPartToken(term);
+                                };
+                                // Run through the query and add terms.
+                                let termStrings = [];
+                                for (let term of parsedFTSQuery) {
+                                    termStrings.push(queryPartTerm(term));
+                                }
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                        ieTable +
-                                        '.`guid` IN (SELECT `guid` FROM ' +
-                                        MySQLDriver.escape(this.prefix + 'data_' + etype) +
-                                        ' WHERE `name`=@' +
-                                        name +
-                                        ' AND INSTR(`value`, @' +
-                                        value +
-                                        '))';
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        '(' +
+                                        termStrings.join(' AND ') +
+                                        ')';
+                                params[name] = curValue[0];
                             }
-                            params[name] = curValue[0];
-                            params[value] = svalue;
                         }
                         break;
                     case 'match':
                     case '!match':
-                        if (curValue[0] === 'cdate') {
+                        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 cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    '(' +
-                                    ieTable +
-                                    '.`cdate` REGEXP @' +
-                                    cdate +
-                                    ')';
-                            params[cdate] = curValue[1];
-                            break;
-                        }
-                        else if (curValue[0] === 'mdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const mdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
-                                    '.`mdate` REGEXP @' +
-                                    mdate +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    ' REGEXP @' +
+                                    value +
                                     ')';
-                            params[mdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
                         else {
                             if (curQuery) {
@@ -838,11 +1267,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `string` REGEXP @' +
                                     value +
@@ -853,35 +1283,31 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'imatch':
                     case '!imatch':
-                        if (curValue[0] === 'cdate') {
+                        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 cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    '(' +
-                                    ieTable +
-                                    '.`cdate` REGEXP @' +
-                                    cdate +
-                                    ')';
-                            params[cdate] = curValue[1];
-                            break;
-                        }
-                        else if (curValue[0] === 'mdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const mdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
-                                    '.`mdate` REGEXP @' +
-                                    mdate +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    ' REGEXP @' +
+                                    value +
                                     ')';
-                            params[mdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
                         else {
                             if (curQuery) {
@@ -890,11 +1316,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND LOWER(`string`) REGEXP LOWER(@' +
                                     value +
@@ -905,35 +1332,31 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'like':
                     case '!like':
-                        if (curValue[0] === 'cdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    '(' +
-                                    ieTable +
-                                    '.`cdate` LIKE @' +
-                                    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 +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
-                                    '.`mdate` LIKE @' +
-                                    mdate +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    ' LIKE @' +
+                                    value +
                                     ')';
-                            params[mdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
                         else {
                             if (curQuery) {
@@ -942,11 +1365,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `string` LIKE @' +
                                     value +
@@ -957,35 +1381,31 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'ilike':
                     case '!ilike':
-                        if (curValue[0] === 'cdate') {
+                        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 cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    '(' +
-                                    ieTable +
-                                    '.`cdate` LIKE @' +
-                                    cdate +
-                                    ')';
-                            params[cdate] = curValue[1];
-                            break;
-                        }
-                        else if (curValue[0] === 'mdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const mdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
-                                    '.`mdate` LIKE @' +
-                                    mdate +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    ' LIKE @' +
+                                    value +
                                     ')';
-                            params[mdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
                         else {
                             if (curQuery) {
@@ -994,11 +1414,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND LOWER(`string`) LIKE LOWER(@' +
                                     value +
@@ -1009,35 +1430,31 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'gt':
                     case '!gt':
-                        if (curValue[0] === 'cdate') {
+                        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 cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    ieTable +
-                                    '.`cdate`>@' +
-                                    cdate;
-                            params[cdate] = isNaN(Number(curValue[1]))
-                                ? null
-                                : Number(curValue[1]);
-                            break;
-                        }
-                        else if (curValue[0] === 'mdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const mdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`mdate`>@' +
-                                    mdate;
-                            params[mdate] = isNaN(Number(curValue[1]))
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '>@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1046,11 +1463,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `number`>@' +
                                     value +
@@ -1063,35 +1481,31 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'gte':
                     case '!gte':
-                        if (curValue[0] === 'cdate') {
+                        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 cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    ieTable +
-                                    '.`cdate`>=@' +
-                                    cdate;
-                            params[cdate] = isNaN(Number(curValue[1]))
-                                ? null
-                                : Number(curValue[1]);
-                            break;
-                        }
-                        else if (curValue[0] === 'mdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const mdate = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`mdate`>=@' +
-                                    mdate;
-                            params[mdate] = isNaN(Number(curValue[1]))
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '>=@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1100,11 +1514,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `number`>=@' +
                                     value +
@@ -1114,38 +1529,34 @@ class MySQLDriver extends nymph_1.NymphDriver {
                                 ? null
                                 : Number(curValue[1]);
                         }
-                        break;
-                    case 'lt':
-                    case '!lt':
-                        if (curValue[0] === 'cdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    ieTable +
-                                    '.`cdate`<@' +
-                                    cdate;
-                            params[cdate] = isNaN(Number(curValue[1]))
-                                ? null
-                                : Number(curValue[1]);
-                            break;
-                        }
-                        else if (curValue[0] === 'mdate') {
+                        break;
+                    case 'lt':
+                    case '!lt':
+                        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 +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`mdate`<@' +
-                                    mdate;
-                            params[mdate] = isNaN(Number(curValue[1]))
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '<@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1154,11 +1565,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `number`<@' +
                                     value +
@@ -1171,35 +1583,31 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'lte':
                     case '!lte':
-                        if (curValue[0] === 'cdate') {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    ieTable +
-                                    '.`cdate`<=@' +
-                                    cdate;
-                            params[cdate] = isNaN(Number(curValue[1]))
-                                ? null
-                                : 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 +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '.`mdate`<=@' +
-                                    mdate;
-                            params[mdate] = isNaN(Number(curValue[1]))
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '<=@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1208,11 +1616,12 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE `guid`=' +
                                     ieTable +
-                                    '.`guid` IN (SELECT `guid` FROM ' +
-                                    MySQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE `name`=@' +
+                                    '.`guid` AND `name`=@' +
                                     name +
                                     ' AND `number`<=@' +
                                     value +
@@ -1238,71 +1647,190 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         if (curQuery) {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
-                        const name = `param${++count.i}`;
-                        const guid = `param${++count.i}`;
-                        curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                ieTable +
-                                '.`guid` IN (SELECT `guid` FROM ' +
-                                MySQLDriver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE `name`=@' +
-                                name +
-                                ' AND `reference`=UNHEX(@' +
-                                guid +
-                                '))';
-                        params[name] = curValue[0];
-                        params[guid] = curQguid;
+                        if (this.nymph.tilmeld != null &&
+                            (curValue[0] === 'user' || curValue[0] === 'group')) {
+                            const guid = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    ieTable +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    '=UNHEX(@' +
+                                    guid +
+                                    ')';
+                            params[guid] = curQguid;
+                        }
+                        else if (this.nymph.tilmeld != null &&
+                            (curValue[0] === 'acRead' ||
+                                curValue[0] === 'acWrite' ||
+                                curValue[0] === 'acFull')) {
+                            const queryParam = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'MATCH (' +
+                                    ieTable +
+                                    '.' +
+                                    MySQLDriver.escape(curValue[0]) +
+                                    ') AGAINST (@' +
+                                    queryParam +
+                                    ' IN BOOLEAN MODE)';
+                            params[queryParam] = '+' + curQguid;
+                        }
+                        else {
+                            const name = `param${++count.i}`;
+                            const guid = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.escape(this.prefix + 'references_' + etype) +
+                                    ' WHERE `guid`=' +
+                                    ieTable +
+                                    '.`guid` AND `name`=@' +
+                                    name +
+                                    ' AND `reference`=UNHEX(@' +
+                                    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);
+                        const innerquery = this.makeEntityQuery({ ...options, sort: null, limit: undefined }, [curValue], etype, count, params, true, tableSuffix, etypes);
                         if (curQuery) {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
                         curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                            (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                 '(' +
-                                subquery.query +
+                                innerquery.query +
                                 ')';
                         break;
                     case 'qref':
                     case '!qref':
+                        const referenceTableSuffix = makeTableSuffix();
                         const [qrefOptions, ...qrefSelectors] = curValue[1];
                         const QrefEntityClass = qrefOptions.class;
                         etypes.push(QrefEntityClass.ETYPE);
-                        const qrefQuery = this.makeEntityQuery({ ...qrefOptions, return: 'guid', class: QrefEntityClass }, qrefSelectors, QrefEntityClass.ETYPE, count, params, false, (0, guid_1.makeTableSuffix)(), etypes);
                         if (curQuery) {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
-                        const qrefName = `param${++count.i}`;
-                        curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                ieTable +
-                                '.`guid` IN (SELECT `guid` FROM ' +
-                                MySQLDriver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE `name`=@' +
-                                qrefName +
-                                ' AND `reference` IN (' +
-                                qrefQuery.query +
-                                '))';
-                        params[qrefName] = curValue[0];
+                        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 +
+                                '.' +
+                                MySQLDriver.escape(curValue[0]));
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT `guid` FROM ' +
+                                    MySQLDriver.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, undefined, (guid) => ieTable +
+                                '.' +
+                                MySQLDriver.escape(curValue[0]) +
+                                " LIKE CONCAT('% ', LOWER(HEX(" +
+                                guid +
+                                ")), ' %')");
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    '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 ' +
+                                    MySQLDriver.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;
-        switch (sort) {
-            case 'mdate':
-                sortBy = '`mdate`';
-                break;
-            case 'cdate':
-            default:
-                sortBy = '`cdate`';
-                break;
-        }
-        if (options.reverse) {
-            sortBy += ' DESC';
+        let sortByInner;
+        let sortJoin = '';
+        let sortJoinInner = '';
+        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 ${MySQLDriver.escape(this.prefix + 'data_' + etype)}
+              WHERE \`name\`=@${name}
+              ORDER BY \`number\`${order}, \`string\`${order}
+            ) ${sTable} ON ${eTable}.\`guid\`=${sTable}.\`guid\``;
+                    sortJoinInner = `LEFT JOIN (
+              SELECT \`guid\`, \`string\`, \`number\`
+              FROM ${MySQLDriver.escape(this.prefix + 'data_' + etype)}
+              WHERE \`name\`=@${name}
+              ORDER BY \`number\`${order}, \`string\`${order}
+            ) ${sTable} ON ${ieTable}.\`guid\`=${sTable}.\`guid\``;
+                    sortBy = `ORDER BY ${sTable}.\`number\`${order}, ${sTable}.\`string\`${order}`;
+                    sortByInner = sortBy;
+                    params[name] = sort;
+                    break;
+            }
         }
         let query;
         if (queryParts.length) {
@@ -1319,18 +1847,23 @@ class MySQLDriver extends nymph_1.NymphDriver {
                     offset = ` OFFSET ${Math.floor(isNaN(Number(options.offset)) ? 0 : Number(options.offset))}`;
                 }
                 const whereClause = queryParts.join(') AND (');
+                const guidClause = guidExplicitSelector
+                    ? `${guidExplicitSelector(`${ieTable}.\`guid\``)} AND `
+                    : guidSelector
+                        ? `${ieTable}.\`guid\`=${guidSelector} AND `
+                        : '';
                 if (options.return === 'count') {
                     if (limit || offset) {
                         query = `SELECT COUNT(${countTable}.\`guid\`) AS \`count\` FROM (
                 SELECT ${ieTable}.\`guid\` AS \`guid\`
                 FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-                WHERE (${whereClause})${limit}${offset}
+                WHERE ${guidClause}(${whereClause})${limit}${offset}
               ) ${countTable}`;
                     }
                     else {
                         query = `SELECT COUNT(${ieTable}.\`guid\`) AS \`count\`
               FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-              WHERE (${whereClause})`;
+              WHERE ${guidClause}(${whereClause})`;
                     }
                 }
                 else if (options.return === 'guid') {
@@ -1339,8 +1872,9 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         : `${ieTable}.\`guid\``;
                     query = `SELECT ${guidColumn} AS \`guid\`
             FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-            WHERE (${whereClause})
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoinInner}
+            WHERE ${guidClause}(${whereClause})
+            ${sortByInner ? sortByInner + ', ' : 'ORDER BY '}${ieTable}.\`guid\`${limit}${offset}`;
                 }
                 else {
                     query = `SELECT
@@ -1348,20 +1882,30 @@ class MySQLDriver extends nymph_1.NymphDriver {
               ${eTable}.\`tags\`,
               ${eTable}.\`cdate\`,
               ${eTable}.\`mdate\`,
+              LOWER(HEX(${eTable}.\`user\`)) AS \`user\`,
+              LOWER(HEX(${eTable}.\`group\`)) AS \`group\`,
+              ${eTable}.\`acUser\`,
+              ${eTable}.\`acGroup\`,
+              ${eTable}.\`acOther\`,
+              ${eTable}.\`acRead\`,
+              ${eTable}.\`acWrite\`,
+              ${eTable}.\`acFull\`,
               ${dTable}.\`name\`,
               ${dTable}.\`value\`,
-              ${cTable}.\`string\`,
-              ${cTable}.\`number\`
+              ${dTable}.\`json\`,
+              ${dTable}.\`string\`,
+              ${dTable}.\`number\`
             FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
             LEFT JOIN ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}.\`guid\`=${dTable}.\`guid\`
-            INNER JOIN ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}.\`guid\`=${cTable}.\`guid\` AND ${dTable}.\`name\`=${cTable}.\`name\`
+            ${sortJoin}
             INNER JOIN (
               SELECT ${ieTable}.\`guid\`
               FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-              WHERE (${whereClause})
-              ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+              ${sortJoinInner}
+              WHERE ${guidClause}(${whereClause})
+              ${sortByInner}${limit}${offset}
             ) ${fTable} ON ${eTable}.\`guid\`=${fTable}.\`guid\`
-            ORDER BY ${eTable}.${sortBy}`;
+            ${sortBy ? sortBy + ', ' : 'ORDER BY '}${eTable}.\`guid\``;
                 }
             }
         }
@@ -1378,16 +1922,21 @@ class MySQLDriver extends nymph_1.NymphDriver {
                 if ('offset' in options) {
                     offset = ` OFFSET ${Math.floor(isNaN(Number(options.offset)) ? 0 : Number(options.offset))}`;
                 }
+                const guidClause = guidExplicitSelector
+                    ? ` WHERE ${guidExplicitSelector(`${ieTable}.\`guid\``)}`
+                    : guidSelector
+                        ? ` WHERE ${ieTable}.\`guid\`=${guidSelector}`
+                        : '';
                 if (options.return === 'count') {
                     if (limit || offset) {
                         query = `SELECT COUNT(${countTable}.\`guid\`) AS \`count\` FROM (
                 SELECT ${ieTable}.\`guid\` AS \`guid\`
-                FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}${limit}${offset}
+                FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}${guidClause}${limit}${offset}
               ) ${countTable}`;
                     }
                     else {
                         query = `SELECT COUNT(${ieTable}.\`guid\`) AS \`count\`
-              FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}`;
+              FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}${guidClause}`;
                     }
                 }
                 else if (options.return === 'guid') {
@@ -1396,7 +1945,9 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         : `${ieTable}.\`guid\``;
                     query = `SELECT ${guidColumn} AS \`guid\`
             FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoinInner}
+            ${guidClause}
+            ${sortByInner ? sortByInner + ', ' : 'ORDER BY '}${ieTable}.\`guid\`${limit}${offset}`;
                 }
                 else {
                     if (limit || offset) {
@@ -1405,19 +1956,30 @@ class MySQLDriver extends nymph_1.NymphDriver {
                 ${eTable}.\`tags\`,
                 ${eTable}.\`cdate\`,
                 ${eTable}.\`mdate\`,
+                LOWER(HEX(${eTable}.\`user\`)) AS \`user\`,
+                LOWER(HEX(${eTable}.\`group\`)) AS \`group\`,
+                ${eTable}.\`acUser\`,
+                ${eTable}.\`acGroup\`,
+                ${eTable}.\`acOther\`,
+                ${eTable}.\`acRead\`,
+                ${eTable}.\`acWrite\`,
+                ${eTable}.\`acFull\`,
                 ${dTable}.\`name\`,
                 ${dTable}.\`value\`,
-                ${cTable}.\`string\`,
-                ${cTable}.\`number\`
+                ${dTable}.\`json\`,
+                ${dTable}.\`string\`,
+                ${dTable}.\`number\`
               FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
               LEFT JOIN ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}.\`guid\`=${dTable}.\`guid\`
-              INNER JOIN ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}.\`guid\`=${cTable}.\`guid\` AND ${dTable}.\`name\`=${cTable}.\`name\`
+              ${sortJoin}
               INNER JOIN (
                 SELECT ${ieTable}.\`guid\`
                 FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-                ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+                ${sortJoinInner}
+                ${guidClause}
+                ${sortByInner}${limit}${offset}
               ) ${fTable} ON ${eTable}.\`guid\`=${fTable}.\`guid\`
-              ORDER BY ${eTable}.${sortBy}`;
+              ${sortBy ? sortBy + ', ' : 'ORDER BY '}${eTable}.\`guid\``;
                     }
                     else {
                         query = `SELECT
@@ -1425,14 +1987,24 @@ class MySQLDriver extends nymph_1.NymphDriver {
                 ${eTable}.\`tags\`,
                 ${eTable}.\`cdate\`,
                 ${eTable}.\`mdate\`,
+                LOWER(HEX(${eTable}.\`user\`)) AS \`user\`,
+                LOWER(HEX(${eTable}.\`group\`)) AS \`group\`,
+                ${eTable}.\`acUser\`,
+                ${eTable}.\`acGroup\`,
+                ${eTable}.\`acOther\`,
+                ${eTable}.\`acRead\`,
+                ${eTable}.\`acWrite\`,
+                ${eTable}.\`acFull\`,
                 ${dTable}.\`name\`,
                 ${dTable}.\`value\`,
-                ${cTable}.\`string\`,
-                ${cTable}.\`number\`
+                ${dTable}.\`json\`,
+                ${dTable}.\`string\`,
+                ${dTable}.\`number\`
               FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
               LEFT JOIN ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}.\`guid\`=${dTable}.\`guid\`
-              INNER JOIN ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}.\`guid\`=${cTable}.\`guid\` AND ${dTable}.\`name\`=${cTable}.\`name\`
-              ORDER BY ${eTable}.${sortBy}`;
+              ${sortJoin}
+              ${guidExplicitSelector ? `WHERE ${guidExplicitSelector(`${eTable}.\`guid\``)}` : guidSelector ? `WHERE ${eTable}.\`guid\`=${guidSelector}` : ''}
+              ${sortBy ? sortBy + ', ' : 'ORDER BY '}${eTable}.\`guid\``;
                     }
                 }
             }
@@ -1448,33 +2020,43 @@ class MySQLDriver extends nymph_1.NymphDriver {
     }
     performQuery(options, formattedSelectors, etype) {
         const { query, params, etypes } = this.makeEntityQuery(options, formattedSelectors, etype);
-        const result = this.queryIter(query, { etypes, params }).then((val) => val[Symbol.iterator]());
-        return {
-            result,
-        };
-    }
-    performQuerySync(options, formattedSelectors, etype) {
-        const { query, params, etypes } = this.makeEntityQuery(options, formattedSelectors, etype);
-        const result = (this.queryIterSync(query, { etypes, params }) || [])[Symbol.iterator]();
+        const result = this.queryArray(query, { etypes, params }).then((val) => val[Symbol.iterator]());
         return {
             result,
         };
     }
     async getEntities(options = {}, ...selectors) {
-        const { result: resultPromise, process } = this.getEntitesRowLike(options, selectors, (options, formattedSelectors, etype) => this.performQuery(options, formattedSelectors, etype), () => {
+        const { result: resultPromise, process } = this.getEntitiesRowLike(
+        // @ts-ignore: options is correct here.
+        options, selectors, ({ options, selectors, etype }) => this.performQuery(options, selectors, etype), () => {
             const next = result.next();
             return next.done ? null : next.value;
         }, () => undefined, (row) => Number(row.count), (row) => row.guid, (row) => ({
-            tags: row.tags.length > 2 ? row.tags.slice(1, -1).split(' ') : [],
-            cdate: isNaN(Number(row.cdate)) ? null : Number(row.cdate),
-            mdate: isNaN(Number(row.mdate)) ? null : Number(row.mdate),
+            tags: row.tags.length > 2
+                ? row.tags
+                    .slice(1, -1)
+                    .split(' ')
+                    .filter((tag) => tag)
+                : [],
+            cdate: isNaN(Number(row.cdate)) ? Date.now() : Number(row.cdate),
+            mdate: isNaN(Number(row.mdate)) ? Date.now() : 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,
             svalue: row.value === 'N'
                 ? JSON.stringify(row.number)
                 : row.value === 'S'
                     ? JSON.stringify(row.string)
-                    : row.value,
+                    : row.value === 'J'
+                        ? JSON.stringify(row.json)
+                        : row.value,
         }));
         const result = await resultPromise;
         const value = process();
@@ -1483,31 +2065,9 @@ class MySQLDriver extends nymph_1.NymphDriver {
         }
         return value;
     }
-    getEntitiesSync(options = {}, ...selectors) {
-        const { result, process } = this.getEntitesRowLike(options, selectors, (options, formattedSelectors, etype) => this.performQuerySync(options, formattedSelectors, etype), () => {
-            const next = result.next();
-            return next.done ? null : next.value;
-        }, () => undefined, (row) => Number(row.count), (row) => row.guid, (row) => ({
-            tags: row.tags.length > 2 ? row.tags.slice(1, -1).split(',') : [],
-            cdate: isNaN(Number(row.cdate)) ? null : Number(row.cdate),
-            mdate: isNaN(Number(row.mdate)) ? null : Number(row.mdate),
-        }), (row) => ({
-            name: row.name,
-            svalue: row.value === 'N'
-                ? JSON.stringify(row.number)
-                : row.value === 'S'
-                    ? JSON.stringify(row.string)
-                    : row.value,
-        }));
-        const value = process();
-        if (value instanceof Error) {
-            throw value;
-        }
-        return value;
-    }
     async getUID(name) {
         if (name == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
         const result = await this.queryGet(`SELECT \`cur_uid\` FROM ${MySQLDriver.escape(`${this.prefix}uids`)} WHERE \`name\`=@name;`, {
             params: {
@@ -1516,44 +2076,75 @@ class MySQLDriver extends nymph_1.NymphDriver {
         });
         return result?.cur_uid ?? null;
     }
-    async import(filename) {
+    async importEntity(entity) {
+        return await this.importEntityInternal(entity);
+    }
+    async importEntityTokens(entity) {
+        return await this.importEntityInternal(entity, { only: 'tokens' });
+    }
+    async importEntityTilmeldAC(entity) {
+        return await this.importEntityInternal(entity, { only: 'tilmeldAC' });
+    }
+    async importEntityInternal({ guid, cdate, mdate, tags, sdata, etype, }, { only = undefined } = {}) {
         try {
-            const result = await this.importFromFile(filename, async (guid, tags, sdata, etype) => {
-                await this.queryRun(`REPLACE INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`) VALUES (UNHEX(@guid), @tags, @cdate, @mdate);`, {
+            let promises = [];
+            if (only == null) {
+                promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                     etypes: [etype],
                     params: {
                         guid,
-                        tags: ' ' + tags.join(' ') + ' ',
-                        cdate: isNaN(Number(JSON.parse(sdata.cdate)))
-                            ? null
-                            : Number(JSON.parse(sdata.cdate)),
-                        mdate: isNaN(Number(JSON.parse(sdata.mdate)))
-                            ? null
-                            : Number(JSON.parse(sdata.mdate)),
                     },
-                });
-                const promises = [];
+                }));
                 promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
-                promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+                promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
-                promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+            }
+            if (only == null || only === 'tokens') {
+                promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
-                await Promise.all(promises);
-                delete sdata.cdate;
-                delete sdata.mdate;
+            }
+            if (only == null) {
+                promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+                    etypes: [etype],
+                    params: {
+                        guid,
+                    },
+                }));
+            }
+            await Promise.all(promises);
+            promises = [];
+            if (only == null) {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`, \`user\`, \`group\`, \`acUser\`, \`acGroup\`, \`acOther\`, \`acRead\`, \`acWrite\`, \`acFull\`) VALUES (UNHEX(@guid), @tags, @cdate, @mdate, ${user == null ? '@user' : 'UNHEX(@user)'}, ${group == null ? '@group' : 'UNHEX(@group)'}, @acUser, @acGroup, @acOther, @acRead, @acWrite, @acFull);`, {
+                    etypes: [etype],
+                    params: {
+                        guid,
+                        tags: ' ' + tags.join(' ') + ' ',
+                        cdate: isNaN(cdate) ? null : cdate,
+                        mdate: isNaN(mdate) ? null : 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);
@@ -1564,24 +2155,18 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         ? 'N'
                         : typeof uvalue === 'string'
                             ? 'S'
-                            : value;
-                    const promises = [];
-                    promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (\`guid\`, \`name\`, \`value\`) VALUES (UNHEX(@guid), @name, @storageValue);`, {
+                            : 'J';
+                    const jsonValue = storageValue === 'J' ? value : null;
+                    promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (\`guid\`, \`name\`, \`value\`, \`json\`, \`string\`, \`number\`, \`truthy\`) VALUES (UNHEX(@guid), @name, @storageValue, @jsonValue, @string, @number, @truthy);`, {
                         etypes: [etype],
                         params: {
                             guid,
                             name,
                             storageValue,
-                        },
-                    }));
-                    promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} (\`guid\`, \`name\`, \`truthy\`, \`string\`, \`number\`) VALUES (UNHEX(@guid), @name, @truthy, @string, @number);`, {
-                        etypes: [etype],
-                        params: {
-                            guid,
-                            name,
-                            truthy: !!uvalue,
-                            string: `${uvalue}`,
+                            jsonValue,
+                            string: storageValue === 'J' ? null : `${uvalue}`,
                             number: isNaN(Number(uvalue)) ? null : Number(uvalue),
+                            truthy: !!uvalue,
                         },
                     }));
                     const references = this.findReferences(value);
@@ -1596,37 +2181,123 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         }));
                     }
                 }
-                await Promise.all(promises);
-            }, async (name, curUid) => {
-                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}uids`)} (\`name\`, \`cur_uid\`) VALUES (@name, @curUid) ON DUPLICATE KEY UPDATE \`cur_uid\`=@curUid;`, {
+            }
+            if (only === 'tilmeldAC') {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                promises.push(this.queryRun(`UPDATE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} SET \`user\`=${user == null ? '@user' : 'UNHEX(@user)'}, \`group\`=${group == null ? '@group' : 'UNHEX(@group)'}, \`acUser\`=@acUser, \`acGroup\`=@acGroup, \`acOther\`=@acOther, \`acRead\`=@acRead, \`acWrite\`=@acWrite, \`acFull\`=@acFull WHERE \`guid\`=UNHEX(@guid);`, {
+                    etypes: [etype],
                     params: {
-                        name,
-                        curUid,
+                        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 = null;
+                    try {
+                        tokenString = EntityClass.getFTSText(name, JSON.parse(sdata[name]));
+                    }
+                    catch (e) {
+                        // Ignore error.
+                    }
+                    if (tokenString != null) {
+                        const tokens = this.tokenizer.tokenize(tokenString);
+                        while (tokens.length) {
+                            const currentTokens = tokens.splice(0, 100);
+                            const params = {
+                                guid,
+                                name,
+                            };
+                            const values = [];
+                            for (let i = 0; i < currentTokens.length; i++) {
+                                const token = currentTokens[i];
+                                params['token' + i] = token.token;
+                                params['position' + i] = token.position;
+                                params['stem' + i] = token.stem;
+                                values.push('(UNHEX(@guid), @name, @token' +
+                                    i +
+                                    ', @position' +
+                                    i +
+                                    ', @stem' +
+                                    i +
+                                    ')');
+                            }
+                            promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.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,
                 });
-            }, async () => {
-                await this.internalTransaction('nymph-import');
-            }, async () => {
-                await this.commit('nymph-import');
+                for (const unique of uniques) {
+                    promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} (\`guid\`, \`unique\`) VALUES (UNHEX(@guid), @unique);`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                            unique,
+                        },
+                    }).catch((e) => {
+                        if (e instanceof EntityUniqueConstraintError) {
+                            this.nymph.config.debugError('mysql', `Import entity unique constraint violation for GUID "${guid}" on etype "${etype}": "${unique}"`);
+                        }
+                        return e;
+                    }));
+                }
+            }
+            await Promise.all(promises);
+        }
+        catch (e) {
+            this.nymph.config.debugError('mysql', `Import entity error: "${e}"`);
+            throw e;
+        }
+    }
+    async importUID({ name, value }) {
+        try {
+            await this.internalTransaction(`nymph-import-uid-${name}`);
+            await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}uids`)} (\`name\`, \`cur_uid\`) VALUES (@name, @value) ON DUPLICATE KEY UPDATE \`cur_uid\`=@value;`, {
+                params: {
+                    name,
+                    value,
+                },
             });
-            return result;
+            await this.commit(`nymph-import-uid-${name}`);
         }
         catch (e) {
-            await this.rollback('nymph-import');
-            return false;
+            this.nymph.config.debugError('mysql', `Import UID error: "${e}"`);
+            await this.rollback(`nymph-import-uid-${name}`);
+            throw e;
         }
     }
     async newUID(name) {
         if (name == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
         await this.internalTransaction('nymph-newuid');
+        let curUid = null;
         try {
             const lock = await this.queryGet(`SELECT GET_LOCK(${MySQLDriver.escapeValue(`${this.prefix}uids_${name}`)}, 10) AS \`lock\`;`);
             if (lock.lock !== 1) {
-                throw new nymph_1.QueryFailedError("Couldn't get lock for UID: " + name);
+                throw new QueryFailedError("Couldn't get lock for UID: " + name);
             }
-            let curUid = null;
             await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}uids`)} (\`name\`, \`cur_uid\`) VALUES (@name, 1) ON DUPLICATE KEY UPDATE \`cur_uid\`=\`cur_uid\`+1;`, {
                 params: {
                     name,
@@ -1638,21 +2309,22 @@ class MySQLDriver extends nymph_1.NymphDriver {
                 },
             });
             await this.queryRun(`SELECT RELEASE_LOCK(${MySQLDriver.escapeValue(`${this.prefix}uids_${name}`)});`);
-            await this.commit('nymph-newuid');
             curUid = result.cur_uid ?? null;
-            return curUid;
         }
         catch (e) {
+            this.nymph.config.debugError('mysql', `New UID error: "${e}"`);
             if (e?.message !== "Couldn't get lock for UID: " + name) {
                 await this.queryRun(`SELECT RELEASE_LOCK(${MySQLDriver.escapeValue(`${this.prefix}uids_${name}`)});`);
             }
             await this.rollback('nymph-newuid');
             throw e;
         }
+        await this.commit('nymph-newuid');
+        return curUid;
     }
     async renameUID(oldName, newName) {
         if (oldName == null || newName == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
         await this.queryRun(`UPDATE ${MySQLDriver.escape(`${this.prefix}uids`)} SET \`name\`=@newName WHERE \`name\`=@oldName;`, {
             params: {
@@ -1664,7 +2336,7 @@ class MySQLDriver extends nymph_1.NymphDriver {
     }
     async rollback(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
-            throw new nymph_1.InvalidParametersError('Transaction rollback attempted without a name.');
+            throw new InvalidParametersError('Transaction rollback attempted without a name.');
         }
         if (!this.transaction || this.transaction.count === 0) {
             this.transaction = null;
@@ -1683,7 +2355,8 @@ class MySQLDriver extends nymph_1.NymphDriver {
         return true;
     }
     async saveEntity(entity) {
-        const insertData = async (guid, data, sdata, etype) => {
+        const insertData = async (guid, data, sdata, uniques, etype) => {
+            const EntityClass = this.nymph.getEntityClassByEtype(etype);
             const runInsertQuery = async (name, value, svalue) => {
                 if (value === undefined) {
                     return;
@@ -1692,24 +2365,19 @@ class MySQLDriver extends nymph_1.NymphDriver {
                     ? 'N'
                     : typeof value === 'string'
                         ? 'S'
-                        : svalue;
+                        : 'J';
+                const jsonValue = storageValue === 'J' ? svalue : null;
                 const promises = [];
-                promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (\`guid\`, \`name\`, \`value\`) VALUES (UNHEX(@guid), @name, @storageValue);`, {
+                promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (\`guid\`, \`name\`, \`value\`, \`json\`, \`string\`, \`number\`, \`truthy\`) VALUES (UNHEX(@guid), @name, @storageValue, @jsonValue, @string, @number, @truthy);`, {
                     etypes: [etype],
                     params: {
                         guid,
                         name,
                         storageValue,
-                    },
-                }));
-                promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} (\`guid\`, \`name\`, \`truthy\`, \`string\`, \`number\`) VALUES (UNHEX(@guid), @name, @truthy, @string, @number);`, {
-                    etypes: [etype],
-                    params: {
-                        guid,
-                        name,
-                        truthy: !!value,
-                        string: `${value}`,
+                        jsonValue,
+                        string: storageValue === 'J' ? null : `${value}`,
                         number: isNaN(Number(value)) ? null : Number(value),
+                        truthy: !!value,
                     },
                 }));
                 const references = this.findReferences(svalue);
@@ -1723,8 +2391,60 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         },
                     }));
                 }
+                let tokenString = null;
+                try {
+                    tokenString = EntityClass.getFTSText(name, value);
+                }
+                catch (e) {
+                    // Ignore error.
+                }
+                if (tokenString != null) {
+                    const tokens = this.tokenizer.tokenize(tokenString);
+                    while (tokens.length) {
+                        const currentTokens = tokens.splice(0, 100);
+                        const params = {
+                            guid,
+                            name,
+                        };
+                        const values = [];
+                        for (let i = 0; i < currentTokens.length; i++) {
+                            const token = currentTokens[i];
+                            params['token' + i] = token.token;
+                            params['position' + i] = token.position;
+                            params['stem' + i] = token.stem;
+                            values.push('(UNHEX(@guid), @name, @token' +
+                                i +
+                                ', @position' +
+                                i +
+                                ', @stem' +
+                                i +
+                                ')');
+                        }
+                        promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} (\`guid\`, \`name\`, \`token\`, \`position\`, \`stem\`) VALUES ${values.join(', ')};`, {
+                            etypes: [etype],
+                            params,
+                        }));
+                    }
+                }
                 await Promise.all(promises);
             };
+            for (const unique of uniques) {
+                try {
+                    await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} (\`guid\`, \`unique\`) VALUES (UNHEX(@guid), @unique);`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                            unique,
+                        },
+                    });
+                }
+                catch (e) {
+                    if (e instanceof EntityUniqueConstraintError) {
+                        this.nymph.config.debugError('mysql', `Save entity unique constraint violation for GUID "${guid}" on etype "${etype}": "${unique}"`);
+                    }
+                    throw e;
+                }
+            }
             for (const name in data) {
                 await runInsertQuery(name, data[name], JSON.stringify(data[name]));
             }
@@ -1732,19 +2452,38 @@ class MySQLDriver extends nymph_1.NymphDriver {
                 await runInsertQuery(name, JSON.parse(sdata[name]), sdata[name]);
             }
         };
+        let inTransaction = false;
         try {
-            const result = await this.saveEntityRowLike(entity, async (_entity, guid, tags, data, sdata, cdate, etype) => {
-                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`) VALUES (UNHEX(@guid), @tags, @cdate, @cdate);`, {
+            const result = await this.saveEntityRowLike(entity, async ({ guid, tags, data, sdata, uniques, cdate, etype }) => {
+                if (Object.keys(data).length === 0 &&
+                    Object.keys(sdata).length === 0) {
+                    return false;
+                }
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
+                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`, \`user\`, \`group\`, \`acUser\`, \`acGroup\`, \`acOther\`, \`acRead\`, \`acWrite\`, \`acFull\`) VALUES (UNHEX(@guid), @tags, @cdate, @cdate, ${user == null ? '@user' : 'UNHEX(@user)'}, ${group == null ? '@group' : 'UNHEX(@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(' ') + ' ',
                     },
                 });
-                await insertData(guid, data, sdata, etype);
+                await insertData(guid, data, sdata, uniques, etype);
                 return true;
-            }, async (entity, guid, tags, data, sdata, mdate, etype) => {
+            }, async ({ entity, guid, tags, data, sdata, uniques, mdate, etype }) => {
+                if (Object.keys(data).length === 0 &&
+                    Object.keys(sdata).length === 0) {
+                    return false;
+                }
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
                 if (this.config.rowLocking) {
                     const promises = [];
                     promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
@@ -1759,13 +2498,19 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             guid,
                         },
                     }));
-                    promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
+                    promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
                         etypes: [etype],
                         params: {
                             guid,
                         },
                     }));
-                    promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
+                    promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                        },
+                    }));
+                    promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
                         etypes: [etype],
                         params: {
                             guid,
@@ -1774,13 +2519,21 @@ class MySQLDriver extends nymph_1.NymphDriver {
                     await Promise.all(promises);
                 }
                 if (this.config.tableLocking) {
-                    await this.queryRun(`LOCK TABLES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WRITE;`);
+                    await this.queryRun(`LOCK TABLES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} WRITE;`);
                 }
-                const info = await this.queryRun(`UPDATE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} SET \`tags\`=@tags, \`mdate\`=@mdate WHERE \`guid\`=UNHEX(@guid) AND \`mdate\` <= @emdate;`, {
+                const info = await this.queryRun(`UPDATE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} SET \`tags\`=@tags, \`mdate\`=@mdate, \`user\`=${user == null ? '@user' : 'UNHEX(@user)'}, \`group\`=${group == null ? '@group' : 'UNHEX(@group)'}, \`acUser\`=@acUser, \`acGroup\`=@acGroup, \`acOther\`=@acOther, \`acRead\`=@acRead, \`acWrite\`=@acWrite, \`acFull\`=@acFull WHERE \`guid\`=UNHEX(@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: isNaN(Number(entity.mdate)) ? 0 : Number(entity.mdate),
                     },
@@ -1794,20 +2547,26 @@ class MySQLDriver extends nymph_1.NymphDriver {
                             guid,
                         },
                     }));
-                    promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+                    promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                         etypes: [etype],
                         params: {
                             guid,
                         },
                     }));
-                    promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+                    promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                        },
+                    }));
+                    promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                         etypes: [etype],
                         params: {
                             guid,
                         },
                     }));
                     await Promise.all(promises);
-                    await insertData(guid, data, sdata, etype);
+                    await insertData(guid, data, sdata, uniques, etype);
                     success = true;
                 }
                 if (this.config.tableLocking) {
@@ -1816,25 +2575,32 @@ class MySQLDriver extends nymph_1.NymphDriver {
                 return success;
             }, async () => {
                 await this.internalTransaction('nymph-save');
+                inTransaction = true;
             }, async (success) => {
-                if (success) {
-                    await this.commit('nymph-save');
-                }
-                else {
-                    await this.rollback('nymph-save');
+                if (inTransaction) {
+                    inTransaction = false;
+                    if (success) {
+                        await this.commit('nymph-save');
+                    }
+                    else {
+                        await this.rollback('nymph-save');
+                    }
                 }
                 return success;
             });
             return result;
         }
         catch (e) {
-            await this.rollback('nymph-save');
+            this.nymph.config.debugError('mysql', `Save entity error: "${e}"`);
+            if (inTransaction) {
+                await this.rollback('nymph-save');
+            }
             throw e;
         }
     }
     async setUID(name, curUid) {
         if (name == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
         await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}uids`)} (\`name\`, \`cur_uid\`) VALUES (@name, @curUid) ON DUPLICATE KEY UPDATE \`cur_uid\`=@curUid;`, {
             params: {
@@ -1844,35 +2610,146 @@ class MySQLDriver extends nymph_1.NymphDriver {
         });
         return true;
     }
-    async internalTransaction(name) {
+    async internalTransaction(name, setOnSelf = true) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
-            throw new nymph_1.InvalidParametersError('Transaction start attempted without a name.');
+            throw new InvalidParametersError('Transaction start attempted without a name.');
         }
-        if (!this.transaction || this.transaction.count === 0) {
-            this.transaction = {
+        let transaction = this.transaction;
+        if (!transaction) {
+            // Lock to one connection.
+            transaction = {
                 count: 0,
                 connection: await this.getConnection(),
+                latestPromise: Promise.resolve(),
             };
-            if (this.config.transactions) {
-                await this.queryRun('START TRANSACTION;');
+            if (setOnSelf) {
+                this.transaction = transaction;
             }
         }
+        if (this.config.transactions && transaction.count === 0) {
+            // We're not in a transaction yet, so start one.
+            await this.queryRun('START TRANSACTION;', { transaction });
+        }
+        transaction.count++;
         if (this.config.transactions) {
-            await this.queryRun(`SAVEPOINT ${MySQLDriver.escape(name)};`);
+            await this.queryRun(`SAVEPOINT ${MySQLDriver.escape(name)};`, {
+                transaction,
+            });
         }
-        this.transaction.count++;
-        return this.transaction;
+        return transaction;
     }
     async startTransaction(name) {
-        const inTransaction = this.inTransaction();
-        const transaction = await this.internalTransaction(name);
-        if (!inTransaction) {
-            this.transaction = null;
-        }
+        const transaction = await this.internalTransaction(name, false);
         const nymph = this.nymph.clone();
         nymph.driver.transaction = transaction;
         return nymph;
     }
+    async removeTilmeldOldRows(etype) {
+        await this.internalTransaction('nymph-remove-tilmeld-rows');
+        try {
+            for (let name of [
+                'user',
+                'group',
+                'acUser',
+                'acGroup',
+                'acOther',
+                'acRead',
+                'acWrite',
+                'acFull',
+            ]) {
+                await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} WHERE \`name\`=@name;`, {
+                    etypes: [etype],
+                    params: {
+                        name,
+                    },
+                });
+                await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE \`name\`=@name;`, {
+                    etypes: [etype],
+                    params: {
+                        name,
+                    },
+                });
+                await this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE \`name\`=@name;`, {
+                    etypes: [etype],
+                    params: {
+                        name,
+                    },
+                });
+            }
+        }
+        catch (e) {
+            this.nymph.config.debugError('mysql', `Remove tilmeld rows error: "${e}"`);
+            await this.rollback('nymph-remove-tilmeld-rows');
+            throw e;
+        }
+        await this.commit('nymph-remove-tilmeld-rows');
+        return true;
+    }
+    async needsMigration() {
+        const table = await this.queryGet('SELECT `table_name` AS `table_name` FROM `information_schema`.`tables` WHERE `table_schema`=@db AND `table_name` LIKE @prefix LIMIT 1;', {
+            params: {
+                db: this.config.database,
+                prefix: this.prefix + 'data_' + '%',
+            },
+        });
+        if (table?.table_name) {
+            const result = await this.queryGet("SELECT 1 AS `exists` FROM `information_schema`.`columns` WHERE `table_schema`=@db AND `table_name`=@table AND `column_name`='json';", {
+                params: {
+                    db: this.config.database,
+                    table: table.table_name,
+                },
+            });
+            if (!result?.exists) {
+                return 'json';
+            }
+        }
+        const table2 = await this.queryGet('SELECT `table_name` AS `table_name` FROM `information_schema`.`tables` WHERE `table_schema`=@db AND `table_name` LIKE @tokenTable LIMIT 1;', {
+            params: {
+                db: this.config.database,
+                tokenTable: this.prefix + 'tokens_' + '%',
+            },
+        });
+        if (!table2 || !table2.table_name) {
+            return 'tokens';
+        }
+        const table3 = await this.queryGet('SELECT `table_name` AS `table_name` FROM `information_schema`.`tables` WHERE `table_schema`=@db AND `table_name` LIKE @prefix LIMIT 1;', {
+            params: {
+                db: this.config.database,
+                prefix: this.prefix + 'entities_' + '%',
+            },
+        });
+        if (table3?.table_name) {
+            const result = await this.queryGet("SELECT 1 AS `exists` FROM `information_schema`.`columns` WHERE `table_schema`=@db AND `table_name`=@table AND `column_name`='user';", {
+                params: {
+                    db: this.config.database,
+                    table: table3.table_name,
+                },
+            });
+            if (!result?.exists) {
+                return 'tilmeldColumns';
+            }
+        }
+        return false;
+    }
+    async liveMigration(migrationType) {
+        if (migrationType === 'tokenTables') {
+            const etypes = await this.getEtypes();
+            for (let etype of etypes) {
+                await this.createTokensTable(etype);
+            }
+        }
+        else if (migrationType === 'tilmeldColumns') {
+            const etypes = await this.getEtypes();
+            for (let etype of etypes) {
+                await this.addTilmeldColumnsAndIndexes(etype);
+            }
+        }
+        else if (migrationType === 'tilmeldRemoveOldRows') {
+            const etypes = await this.getEtypes();
+            for (let etype of etypes) {
+                await this.removeTilmeldOldRows(etype);
+            }
+        }
+    }
 }
-exports.default = MySQLDriver;
 //# sourceMappingURL=MySQLDriver.js.map