@nymphjs/driver-postgresql 1.0.0-beta.11 → 1.0.0-beta.110

package/dist/PostgreSQLDriver.js

@@ -1,26 +1,57 @@
-"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 pg_1 = require("pg");
-const pg_format_1 = __importDefault(require("pg-format"));
-const nymph_1 = require("@nymphjs/nymph");
-const guid_1 = require("@nymphjs/guid");
-const conf_1 = require("./conf");
-class PostgreSQLDriver extends nymph_1.NymphDriver {
+import pg from 'pg';
+import format from 'pg-format';
+import Cursor from 'pg-cursor';
+import { NymphDriver, EntityUniqueConstraintError, InvalidParametersError, NotConfiguredError, QueryFailedError, UnableToConnectError, xor, } from '@nymphjs/nymph';
+import { makeTableSuffix } from '@nymphjs/guid';
+import { PostgreSQLDriverConfigDefaults as defaults, } from './conf/index.js';
+/**
+ * The PostgreSQL Nymph database driver.
+ */
+export default class PostgreSQLDriver extends NymphDriver {
+    config;
+    postgresqlConfig;
+    prefix;
+    connected = false;
+    // @ts-ignore: this is assigned in connect(), which is called by the constructor.
+    link;
+    transaction = null;
     static escape(input) {
-        return pg_format_1.default.ident(input);
+        return format.ident(input);
     }
     static escapeValue(input) {
-        return pg_format_1.default.literal(input);
+        return format.literal(input);
+    }
+    static escapeNullSequences(input) {
+        // Postgres doesn't support null bytes in `text`, and it converts strings
+        // in JSON to `text`, so we need to escape the escape sequences for null
+        // bytes.
+        return (input
+            .replace(/\uFFFD/g, () => '\uFFFD\uFFFD')
+            // n so that if there's already an escape, it turns into \n
+            // - so that it won't match a \uFFFD that got turned into \uFFFD\uFFFD
+            .replace(/\\u0000/g, () => 'nu\uFFFD-')
+            .replace(/\\x00/g, () => 'nx\uFFFD-'));
+    }
+    static unescapeNullSequences(input) {
+        return input
+            .replace(/nu\uFFFD-/g, () => '\\u0000')
+            .replace(/nx\uFFFD-/g, () => '\\x00')
+            .replace(/\uFFFD\uFFFD/g, () => '\uFFFD');
+    }
+    static escapeNulls(input) {
+        // Postgres doesn't support null bytes in `text`.
+        return input
+            .replace(/\uFFFD/g, () => '\uFFFD\uFFFD')
+            .replace(/\x00/g, () => '-\uFFFD-');
+    }
+    static unescapeNulls(input) {
+        return input
+            .replace(/-\uFFFD-/g, () => '\x00')
+            .replace(/\uFFFD\uFFFD/g, () => '\uFFFD');
     }
     constructor(config, link, transaction) {
         super();
-        this.connected = false;
-        this.transaction = null;
-        this.config = { ...conf_1.PostgreSQLDriverConfigDefaults, ...config };
+        this.config = { ...defaults, ...config };
         const { host, user, password, database, port, customPoolConfig } = this.config;
         this.postgresqlConfig = customPoolConfig ?? {
             host,
@@ -41,19 +72,40 @@ class PostgreSQLDriver 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 PostgreSQLDriver(this.config, this.link, this.transaction ?? undefined);
     }
-    getConnection() {
-        if (this.transaction != null && this.transaction.connection != null) {
+    getConnection(outsideTransaction = false) {
+        if (this.transaction != null &&
+            this.transaction.connection != null &&
+            !outsideTransaction) {
             return Promise.resolve(this.transaction.connection);
         }
-        return new Promise((resolve, reject) => this.link.connect((err, client, done) => err ? reject(err) : resolve({ client, done })));
+        return new Promise((resolve, reject) => this.link.connect((err, client, done) => err
+            ? reject(err)
+            : client
+                ? resolve({ client, done })
+                : reject('No client returned from connect.')));
     }
+    /**
+     * Connect to the PostgreSQL database.
+     *
+     * @returns Whether this instance is connected to a PostgreSQL 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.connect((err, client, done) => err ? reject(err) : resolve({ client, done })));
+                const connection = await new Promise((resolve, reject) => this.link.connect((err, client, done) => err
+                    ? reject(err)
+                    : client
+                        ? resolve({ client, done })
+                        : reject('No client returned from connect.')));
                 await new Promise((resolve, reject) => connection.client.query('SELECT 1;', [], (err, res) => {
                     if (err) {
                         reject(err);
@@ -66,9 +118,10 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
         catch (e) {
             this.connected = false;
         }
+        // Connecting, selecting database
         if (!this.connected) {
             try {
-                this.link = new pg_1.Pool(this.postgresqlConfig);
+                this.link = new pg.Pool(this.postgresqlConfig);
                 this.connected = true;
             }
             catch (e) {
@@ -76,15 +129,20 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                     this.postgresqlConfig.user === 'nymph' &&
                     this.postgresqlConfig.password === 'password' &&
                     this.postgresqlConfig.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 PostgreSQL database.
+     *
+     * @returns Whether this instance is connected to a PostgreSQL database.
+     */
     async disconnect() {
         if (this.connected) {
             await new Promise((resolve) => this.link.end(() => resolve(0)));
@@ -93,87 +151,217 @@ class PostgreSQLDriver 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 PostgreSQL database.
+     */
     isConnected() {
         return this.connected;
     }
-    createTables(etype = null) {
-        if (etype != null) {
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} (
+    async createEntitiesTable(etype, connection) {
+        // Create the entity table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} (
           "guid" BYTEA NOT NULL,
           "tags" TEXT[],
           "cdate" DOUBLE PRECISION NOT NULL,
           "mdate" DOUBLE PRECISION NOT NULL,
+          "user" BYTEA,
+          "group" BYTEA,
+          "acUser" SMALLINT,
+          "acGroup" SMALLINT,
+          "acOther" SMALLINT,
+          "acRead" BYTEA[],
+          "acWrite" BYTEA[],
+          "acFull" BYTEA[],
           PRIMARY KEY ("guid")
-        ) WITH ( OIDS=FALSE );`);
-            this.queryRunSync(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_cdate`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_cdate`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("cdate");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_mdate`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_mdate`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("mdate");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_tags`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_tags`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("tags");`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} (
-          "guid" BYTEA NOT NULL,
-          "name" TEXT NOT NULL,
-          "value" TEXT NOT NULL,
-          PRIMARY KEY ("guid", "name"),
-          FOREIGN KEY ("guid")
-            REFERENCES ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid") MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE
-        ) WITH ( OIDS=FALSE );`);
-            this.queryRunSync(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("name");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__user`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__user`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name" = 'user'::text;`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__group`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__group`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name" = 'group'::text;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} (
+        ) WITH ( OIDS=FALSE );`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_cdate`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_cdate`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("cdate");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_mdate`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_mdate`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("mdate");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_tags`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_tags`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("tags");`, { connection });
+        await this.createEntitiesTilmeldIndexes(etype, connection);
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET ( autovacuum_vacuum_scale_factor = 0.05, autovacuum_analyze_scale_factor = 0.05 );`, { connection });
+    }
+    async addTilmeldColumnsAndIndexes(etype, connection) {
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN IF NOT EXISTS "user" BYTEA,
+        ADD COLUMN IF NOT EXISTS "group" BYTEA,
+        ADD COLUMN IF NOT EXISTS "acUser" SMALLINT,
+        ADD COLUMN IF NOT EXISTS "acGroup" SMALLINT,
+        ADD COLUMN IF NOT EXISTS "acOther" SMALLINT,
+        ADD COLUMN IF NOT EXISTS "acRead" BYTEA[],
+        ADD COLUMN IF NOT EXISTS "acWrite" BYTEA[],
+        ADD COLUMN IF NOT EXISTS "acFull" BYTEA[];`);
+        await this.createEntitiesTilmeldIndexes(etype, connection);
+    }
+    async createEntitiesTilmeldIndexes(etype, connection) {
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_user_acUser`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_user_acUser`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("user", "acUser");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_group_acGroup`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_group_acGroup`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("group", "acGroup");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acUser`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acUser`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("acUser");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acGroup`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acGroup`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("acGroup");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acOther`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acOther`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("acOther");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acRead`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acRead`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("acRead");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acWrite`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acWrite`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("acWrite");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acFull`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acFull`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("acFull");`, { connection });
+    }
+    async createDataTable(etype, connection) {
+        // Create the data table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} (
           "guid" BYTEA NOT NULL,
           "name" TEXT NOT NULL,
-          "truthy" BOOLEAN,
+          "value" CHARACTER(1) NOT NULL,
+          "json" JSONB,
           "string" TEXT,
           "number" DOUBLE PRECISION,
+          "truthy" BOOLEAN,
           PRIMARY KEY ("guid", "name"),
           FOREIGN KEY ("guid")
             REFERENCES ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid") MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE
-        ) WITH ( OIDS=FALSE );`);
-            this.queryRunSync(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_guid`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_guid`)} ON ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} USING btree ("guid");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_name`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_name`)} ON ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} USING btree ("name");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_guid_name_truthy`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_guid_name_truthy`)} ON ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} USING btree ("guid", "name") WHERE "truthy" = TRUE;`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_guid_name_falsy`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}_id_guid_name_falsy`)} ON ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} USING btree ("guid", "name") WHERE "truthy" <> TRUE;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} (
+        ) WITH ( OIDS=FALSE );`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid", "name");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__user`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__user`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name" = 'user'::text;`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__group`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name__group`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name" = 'group'::text;`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("name");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_string`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_string`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("name", LEFT("string", 512));`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_number`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_number`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("name", "number");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name_number`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name_number`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid", "name", "number");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_truthy`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_truthy`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("name", "truthy");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name_truthy`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_guid_name_truthy`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid", "name", "truthy");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_string`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_string`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING gin ("string" gin_trgm_ops);`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_json`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_json`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING gin ("json");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acuserread`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acuserread`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name"='acUser' AND "number" >= 1;`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acgroupread`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acgroupread`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name"='acGroup' AND "number" >= 1;`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acotherread`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acotherread`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name"='acOther' AND "number" >= 1;`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acuser`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acuser`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name"='user';`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acgroup`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_acgroup`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("guid") WHERE "name"='group';`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} SET ( autovacuum_vacuum_scale_factor = 0.05, autovacuum_analyze_scale_factor = 0.05 );`, { connection });
+    }
+    async createReferencesTable(etype, connection) {
+        // Create the references table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} (
           "guid" BYTEA NOT NULL,
           "name" TEXT NOT NULL,
           "reference" BYTEA NOT NULL,
           PRIMARY KEY ("guid", "name", "reference"),
           FOREIGN KEY ("guid")
             REFERENCES ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid") MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE
-        ) WITH ( OIDS=FALSE );`);
-            this.queryRunSync(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_guid`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_guid`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("guid");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_name`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_name`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("name");`);
-            this.queryRunSync(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference`)};`);
-            this.queryRunSync(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("reference");`);
+        ) WITH ( OIDS=FALSE );`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_guid`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_guid`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("guid");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_name`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_name`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("name");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_name_reference`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_name_reference`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("name", "reference");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("reference");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_guid_name_reference`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_guid_name_reference`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("guid", "name", "reference");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_name_guid`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_name_guid`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("reference", "name", "guid");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_guid_name`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_guid_name`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("reference", "guid", "name");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_guid_nameuser`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_guid_nameuser`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("reference", "guid") WHERE "name"='user';`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_guid_namegroup`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_reference_guid_namegroup`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("reference", "guid") WHERE "name"='group';`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} SET ( autovacuum_vacuum_scale_factor = 0.05, autovacuum_analyze_scale_factor = 0.05 );`, { connection });
+    }
+    async createTokensTable(etype, connection) {
+        // Create the tokens table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} (
+          "guid" BYTEA NOT NULL,
+          "name" TEXT NOT NULL,
+          "token" INTEGER NOT NULL,
+          "position" INTEGER NOT NULL,
+          "stem" BOOLEAN NOT NULL,
+          PRIMARY KEY ("guid", "name", "token", "position"),
+          FOREIGN KEY ("guid")
+            REFERENCES ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid") MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE
+        ) WITH ( OIDS=FALSE );`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}_id_name_token`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}_id_name_token`)} ON ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} USING btree ("name", "token");`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} SET ( autovacuum_vacuum_scale_factor = 0.05, autovacuum_analyze_scale_factor = 0.05 );`, { connection });
+    }
+    async createUniquesTable(etype, connection) {
+        // Create the unique strings table.
+        await this.queryRun(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} (
+          "guid" BYTEA NOT NULL,
+          "unique" TEXT NOT NULL UNIQUE,
+          PRIMARY KEY ("guid", "unique"),
+          FOREIGN KEY ("guid")
+            REFERENCES ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid") MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE
+        ) WITH ( OIDS=FALSE );`, { connection });
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`, { connection });
+    }
+    /**
+     * 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) {
+        const connection = await this.getConnection(true);
+        if (etype != null) {
+            await this.createEntitiesTable(etype, connection);
+            await this.createDataTable(etype, connection);
+            await this.createReferencesTable(etype, connection);
+            await this.createTokensTable(etype, connection);
+            await this.createUniquesTable(etype, connection);
         }
         else {
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}uids`)} (
+            // Add trigram extensions.
+            try {
+                await this.queryRun(`CREATE EXTENSION pg_trgm;`, { connection });
+            }
+            catch (e) {
+                // Ignore errors.
+            }
+            // Create the UID table.
+            await this.queryRun(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}uids`)} (
           "name" TEXT NOT NULL,
           "cur_uid" BIGINT NOT NULL,
           PRIMARY KEY ("name")
-        ) WITH ( OIDS = FALSE );`);
-            this.queryRunSync(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}uids`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`);
+        ) WITH ( OIDS = FALSE );`, { connection });
+            await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}uids`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`, { connection });
         }
+        connection.done();
         return true;
     }
     translateQuery(origQuery, origParams) {
@@ -191,49 +379,32 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
     }
     async query(runQuery, query, etypes = []) {
         try {
+            this.nymph.config.debugInfo('postgresql:query', query);
             return await runQuery();
         }
         catch (e) {
             const errorCode = e?.code;
-            if (errorCode === '42P01' && this.createTables()) {
+            if (errorCode === '42P01' && (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?.code + ' - ' + e2?.message, query);
+                    throw new QueryFailedError('Query failed: ' + e2?.code + ' - ' + e2?.message, query, e2?.code);
                 }
             }
-            else {
-                throw e;
-            }
-        }
-    }
-    querySync(runQuery, query, etypes = []) {
-        try {
-            return runQuery();
-        }
-        catch (e) {
-            const errorCode = e?.code;
-            if (errorCode === '42P01' && this.createTables()) {
-                for (let etype of etypes) {
-                    this.createTables(etype);
-                }
-                try {
-                    return runQuery();
-                }
-                catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.code + ' - ' + e2?.message, query);
-                }
+            else if (errorCode === '23505') {
+                throw new EntityUniqueConstraintError(`Unique constraint violation.`);
             }
             else {
-                throw e;
+                throw new QueryFailedError('Query failed: ' + e?.code + ' - ' + e?.message, query, e?.code);
             }
         }
     }
-    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) => {
@@ -249,32 +420,30 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
             return results.rows;
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
-    queryIterSync(query, { etypes = [], params = {}, } = {}) {
+    async queryIter(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 + '/runPostgresqlSync.js'], {
-                input: JSON.stringify({
-                    postgresqlConfig: this.postgresqlConfig,
-                    query: newQuery,
-                    params: newParams,
-                }),
-                timeout: 30000,
-                maxBuffer: 100 * 1024 * 1024,
-                encoding: 'utf8',
-                windowsHide: true,
-            });
-            try {
-                return JSON.parse(output.stdout).rows;
-            }
-            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];
+        const that = this;
+        return this.query(async function* () {
+            const transaction = !!that.transaction?.connection;
+            const connection = await that.getConnection();
+            const cursor = new Cursor(newQuery, newParams);
+            const iter = connection.client.query(cursor);
+            while (true) {
+                const rows = await iter.read(100);
+                if (!rows.length) {
+                    await new Promise((resolve) => {
+                        iter.close(() => {
+                            if (!transaction) {
+                                connection.done();
+                            }
+                            resolve();
+                        });
+                    });
+                    return;
+                }
+                for (let row of rows) {
+                    yield row;
+                }
             }
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
@@ -294,12 +463,13 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
             return results.rows[0];
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
-    queryRun(query, { etypes = [], params = {}, } = {}) {
+    queryRun(query, { etypes = [], params = {}, connection, } = {}) {
         const { query: newQuery, params: newParams } = this.translateQuery(query, params);
         return this.query(async () => {
             const results = await new Promise((resolve, reject) => {
                 try {
-                    (this.transaction?.connection?.client ?? this.link)
+                    ((connection ?? this.transaction?.connection)?.client ??
+                        this.link)
                         .query(newQuery, newParams)
                         .then((results) => resolve(results), (error) => reject(error));
                 }
@@ -310,39 +480,9 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
             return { rowCount: results.rowCount ?? 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 + '/runPostgresqlSync.js'], {
-                input: JSON.stringify({
-                    postgresqlConfig: this.postgresqlConfig,
-                    query: newQuery,
-                    params: newParams,
-                }),
-                timeout: 30000,
-                maxBuffer: 100 * 1024 * 1024,
-                encoding: 'utf8',
-                windowsHide: true,
-            });
-            try {
-                const results = JSON.parse(output.stdout);
-                return { rowCount: results.rowCount ?? 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;
@@ -382,32 +522,40 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                     guid,
                 },
             });
-            await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+            await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                 etypes: [etype],
                 params: {
                     guid,
                 },
             });
-            await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+            await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+                etypes: [etype],
+                params: {
+                    guid,
+                },
+            });
+            await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                 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('postgresql', `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 ${PostgreSQLDriver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
             params: {
@@ -416,79 +564,223 @@ class PostgreSQLDriver 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 ${PostgreSQLDriver.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('SELECT relname FROM pg_stat_user_tables ORDER BY relname;');
+    async getIndexes(etype) {
+        const indexes = [];
+        for (let [scope, suffix] of [
+            ['data', '_json'],
+            ['references', '_reference_guid'],
+            ['tokens', '_token_position_stem'],
+        ]) {
+            const indexDefinitions = await this.queryArray(`SELECT * FROM "pg_indexes" WHERE "indexname" LIKE @pattern;`, {
+                params: {
+                    pattern: `${this.prefix}${scope}_${etype}_id_custom_%${suffix}`,
+                },
+            });
+            for (const indexDefinition of indexDefinitions) {
+                indexes.push({
+                    scope,
+                    name: indexDefinition.indexname.substring(`${this.prefix}${scope}_${etype}_id_custom_`.length, indexDefinition.indexname.length - suffix.length),
+                    property: (indexDefinition.indexdef.match(/WHERE\s+\(?\s*name\s*=\s*'(.*)'/) ?? [])[1] ?? '',
+                });
+            }
+        }
+        return indexes;
+    }
+    async addIndex(etype, definition) {
+        this.checkIndexName(definition.name);
+        await this.deleteIndex(etype, definition.scope, definition.name);
+        const connection = await this.getConnection(true);
+        if (definition.scope === 'data') {
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_json`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING gin ("json") WHERE "name"=${PostgreSQLDriver.escapeValue(definition.property)};`, { connection });
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_string_gin`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING gin ("string" gin_trgm_ops) WHERE "name"=${PostgreSQLDriver.escapeValue(definition.property)};`, { connection });
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_string_btree`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree (LEFT("string", 1024)) WHERE "name"=${PostgreSQLDriver.escapeValue(definition.property)};`, { connection });
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_number`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("number") WHERE "name"=${PostgreSQLDriver.escapeValue(definition.property)};`, { connection });
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${definition.name}_truthy`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("truthy") WHERE "name"=${PostgreSQLDriver.escapeValue(definition.property)};`, { connection });
+        }
+        else if (definition.scope === 'references') {
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_custom_${definition.name}_reference_guid`)} ON ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} USING btree ("reference", "guid") WHERE "name"=${PostgreSQLDriver.escapeValue(definition.property)};`, { connection });
+        }
+        else if (definition.scope === 'tokens') {
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}_id_custom_${definition.name}_token_position_stem`)} ON ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} USING btree ("token", "position", "stem") WHERE "name"=${PostgreSQLDriver.escapeValue(definition.property)};`, { connection });
+        }
+        connection.done();
+        return true;
+    }
+    async deleteIndex(etype, scope, name) {
+        this.checkIndexName(name);
+        const connection = await this.getConnection(true);
+        if (scope === 'data') {
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_json`)};`, { connection });
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_string_gin`)};`, { connection });
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_string_btree`)};`, { connection });
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_number`)};`, { connection });
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_custom_${name}_truthy`)};`, { connection });
+        }
+        else if (scope === 'references') {
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}_id_custom_${name}_reference_guid`)};`, { connection });
+        }
+        else if (scope === 'tokens') {
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}_id_custom_${name}_token_position_stem`)};`, { connection });
+        }
+        connection.done();
+        return true;
+    }
+    async getEtypes() {
+        const tables = await this.queryArray('SELECT "table_name" AS "table_name" FROM "information_schema"."tables" WHERE "table_catalog"=@db AND "table_schema"=\'public\' AND "table_name" LIKE @prefix;', {
+            params: {
+                db: this.config.database,
+                prefix: this.prefix + 'entities_' + '%',
+            },
+        });
         const etypes = [];
-        for (const tableRow of tables) {
-            const table = tableRow.relname;
-            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.queryIter(`SELECT * FROM ${PostgreSQLDriver.escape(`${this.prefix}uids`)} ORDER BY "name";`);
+        for await (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 encode(e."guid", 'hex') 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.queryIter(`SELECT encode(e."guid", 'hex') AS "guid", e."tags", e."cdate", e."mdate", encode(e."user", 'hex') AS "user", encode(e."group", 'hex') AS "group", e."acUser", e."acGroup", e."acOther", array(SELECT encode(n, 'hex') FROM unnest(e."acRead") AS n) as "acRead", array(SELECT encode(n, 'hex') FROM unnest(e."acWrite") AS n) as "acWrite", array(SELECT encode(n, 'hex') FROM unnest(e."acFull") AS n) as "acFull", d."name", d."value", d."json", d."string", d."number"
           FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} e
           LEFT JOIN ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} d ON e."guid"=d."guid"
-          INNER JOIN ${PostgreSQLDriver.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();
+          ORDER BY e."guid";`);
+            let datum = await dataIterator.next();
             while (!datum.done) {
                 const guid = datum.value.guid;
-                const tags = datum.value.tags.join(',');
+                const tags = datum.value.tags.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?.filter((guid) => guid);
+                const acWrite = datum.value.acWrite?.filter((guid) => guid);
+                const acFull = datum.value.acFull?.filter((guid) => guid);
+                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(Number(datum.value.number))
-                            : datum.value.dvalue === 'S'
-                                ? JSON.stringify(datum.value.string)
-                                : datum.value.dvalue;
-                        writeLine(`\t${datum.value.dname}=${value}`);
-                        datum = dataIterator.next();
+                            : datum.value.value === 'S'
+                                ? JSON.stringify(PostgreSQLDriver.unescapeNulls(datum.value.string))
+                                : datum.value.value === 'J'
+                                    ? PostgreSQLDriver.unescapeNullSequences(JSON.stringify(datum.value.json))
+                                    : datum.value.value;
+                        currentEntityExport.push(`\t${datum.value.name}=${value}`);
+                        datum = await dataIterator.next();
                     } while (!datum.done && datum.value.guid === guid);
                 }
                 else {
-                    datum = dataIterator.next();
+                    // Make sure that datum is incremented :)
+                    datum = await 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 PostgreSQL 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) {
@@ -501,7 +793,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const guid = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."guid"=decode(@' +
                                     guid +
@@ -517,7 +809,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const tag = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '@' +
                                     tag +
                                     ' <@ ie."tags"';
@@ -530,17 +822,38 @@ class PostgreSQLDriver 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 ' +
-                                    PostgreSQLDriver.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 +
+                                        '.' +
+                                        PostgreSQLDriver.escape(curVar) +
+                                        ' IS NOT NULL)';
+                            }
+                            else {
+                                const name = `param${++count.i}`;
+                                curQuery +=
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        'EXISTS (SELECT "guid" FROM ' +
+                                        PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                        ' WHERE "guid"=' +
+                                        ieTable +
+                                        '."guid" AND "name"=@' +
+                                        name +
+                                        ')';
+                                params[name] = curVar;
+                            }
                         }
                         break;
                     case 'truthy':
@@ -549,30 +862,34 @@ class PostgreSQLDriver 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;
+                                        '.' +
+                                        PostgreSQLDriver.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 ' +
+                                        PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                        ' WHERE "guid"=' +
                                         ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                        ' WHERE "name"=@' +
+                                        '."guid" AND "name"=@' +
                                         name +
                                         ' AND "truthy"=TRUE)';
                                 params[name] = curVar;
@@ -581,35 +898,63 @@ class PostgreSQLDriver 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]))
+                                    '.' +
+                                    PostgreSQLDriver.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;
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '=decode(@' +
+                                    value +
+                                    ", 'hex')";
+                            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 +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '=' +
+                                    !curValue[1]?.length
+                                    ? '@' + value
+                                    : "array(SELECT decode(n, 'hex') FROM unnest(@" +
+                                        value +
+                                        '::text[]) AS n)';
+                            params[value] = Array.isArray(curValue[1]) ? curValue[1] : '';
                         }
                         else if (typeof curValue[1] === 'number') {
                             if (curQuery) {
@@ -618,11 +963,12 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number"=@' +
                                     value +
@@ -637,17 +983,20 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
-                                    ' AND "string"=@' +
-                                    value +
+                                    ' AND "string"=' +
+                                    (curValue[1].length < 512
+                                        ? 'LEFT(@' + value + ', 512)'
+                                        : '@' + value) +
                                     ')';
                             params[name] = curValue[0];
-                            params[value] = curValue[1];
+                            params[value] = PostgreSQLDriver.escapeNulls(curValue[1]);
                         }
                         else {
                             if (curQuery) {
@@ -664,138 +1013,272 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             const name = `param${++count.i}`;
                             const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
                                     PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    ' WHERE "guid"=' +
+                                    ieTable +
+                                    '."guid" AND "name"=@' +
                                     name +
-                                    ' AND "value"=@' +
+                                    ' AND "json"=@' +
                                     value +
                                     ')';
                             params[name] = curValue[0];
-                            params[value] = svalue;
+                            params[value] = PostgreSQLDriver.escapeNullSequences(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]))
+                                    '.' +
+                                    PostgreSQLDriver.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;
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '=decode(@' +
+                                    value +
+                                    ", 'hex')";
+                            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 ' : '') +
+                                    'decode(@' +
+                                    value +
+                                    ", 'hex')=ANY(" +
+                                    ieTable +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    ')';
+                            params[value] = `${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 {
+                            else if (typeof curValue[1] === 'string' ||
+                                typeof curValue[1] === 'number') {
                                 svalue = JSON.stringify(curValue[1]);
-                                stringValue = `${curValue[1]}`;
+                            }
+                            else {
+                                svalue = JSON.stringify([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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
+                                    ieTable +
+                                    '."guid" AND "name"=@' +
+                                    name +
+                                    ' AND "json" @> @' +
+                                    value +
+                                    ')';
+                            params[name] = curValue[0];
+                            params[value] = PostgreSQLDriver.escapeNullSequences(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 ' +
+                                        PostgreSQLDriver.escape(this.prefix + 'tokens_' + etype) +
+                                        ' WHERE "guid"=' +
                                         ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
-                                        ' WHERE "name"=@' +
+                                        '."guid" AND "name"=@' +
                                         name +
-                                        ' AND position(@' +
+                                        ' AND "token"=@' +
                                         value +
-                                        ' IN "value")>0) 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 ' +
+                                                    PostgreSQLDriver.escape(this.prefix + 'tokens_' + etype) +
+                                                    ' t' +
+                                                    tokenTableSuffix +
+                                                    '0'
+                                                : 'JOIN ' +
+                                                    PostgreSQLDriver.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 ' +
-                                        PostgreSQLDriver.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 ' +
-                                        PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
-                                        ' WHERE "name"=@' +
-                                        name +
-                                        ' AND position(@' +
-                                        value +
-                                        ' IN "value")>0)';
+                                    (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 (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            const cdate = `param${++count.i}`;
-                            curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    '(' +
-                                    ieTable +
-                                    '."cdate" ~ @' +
-                                    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" ~ @' +
-                                    mdate +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    ' ~ @' +
+                                    value +
                                     ')';
-                            params[mdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
                         else {
                             if (curQuery) {
@@ -804,50 +1287,47 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "string" ~ @' +
                                     value +
                                     ')';
                             params[name] = curValue[0];
-                            params[value] = curValue[1];
+                            params[value] = PostgreSQLDriver.escapeNulls(curValue[1]);
                         }
                         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" ~* @' +
-                                    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" ~* @' +
-                                    mdate +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    ' ~* @' +
+                                    value +
                                     ')';
-                            params[mdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
                         else {
                             if (curQuery) {
@@ -856,50 +1336,47 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "string" ~* @' +
                                     value +
                                     ')';
                             params[name] = curValue[0];
-                            params[value] = curValue[1];
+                            params[value] = PostgreSQLDriver.escapeNulls(curValue[1]);
                         }
                         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 +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    ' LIKE @' +
+                                    value +
                                     ')';
-                            params[mdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
                         else {
                             if (curQuery) {
@@ -908,102 +1385,96 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "string" LIKE @' +
                                     value +
                                     ')';
                             params[name] = curValue[0];
-                            params[value] = curValue[1];
+                            params[value] = PostgreSQLDriver.escapeNulls(curValue[1]);
                         }
                         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}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
-                                    '."cdate" ILIKE @' +
-                                    cdate +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    ' ILIKE @' +
+                                    value +
                                     ')';
-                            params[cdate] = curValue[1];
-                            break;
+                            params[value] = curValue[1];
                         }
-                        else if (curValue[0] === 'mdate') {
+                        else {
                             if (curQuery) {
                                 curQuery += typeIsOr ? ' OR ' : ' AND ';
                             }
-                            const mdate = `param${++count.i}`;
+                            const name = `param${++count.i}`;
+                            const value = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    '(' +
-                                    ieTable +
-                                    '."mdate" ILIKE @' +
-                                    mdate +
-                                    ')';
-                            params[mdate] = curValue[1];
-                            break;
-                        }
-                        else {
-                            if (curQuery) {
-                                curQuery += typeIsOr ? ' OR ' : ' AND ';
-                            }
-                            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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "string" ILIKE @' +
                                     value +
                                     ')';
                             params[name] = curValue[0];
-                            params[value] = curValue[1];
+                            params[value] = PostgreSQLDriver.escapeNulls(curValue[1]);
                         }
                         break;
                     case 'gt':
                     case '!gt':
-                        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]))
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '>@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1012,11 +1483,12 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number">@' +
                                     value +
@@ -1029,35 +1501,31 @@ class PostgreSQLDriver 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]))
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '>=@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1066,11 +1534,12 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number">=@' +
                                     value +
@@ -1083,35 +1552,31 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         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') {
+                        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]))
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '<@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1120,11 +1585,12 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number"<@' +
                                     value +
@@ -1137,35 +1603,31 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         break;
                     case 'lte':
                     case '!lte':
-                        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]))
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '<=@' +
+                                    value;
+                            params[value] = isNaN(Number(curValue[1]))
                                 ? null
                                 : Number(curValue[1]);
-                            break;
                         }
                         else {
                             if (curQuery) {
@@ -1174,11 +1636,12 @@ class PostgreSQLDriver 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 ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
+                                    ' WHERE "guid"=' +
                                     ieTable +
-                                    '."guid" IN (SELECT "guid" FROM ' +
-                                    PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                    ' WHERE "name"=@' +
+                                    '."guid" AND "name"=@' +
                                     name +
                                     ' AND "number"<=@' +
                                     value +
@@ -1204,71 +1667,190 @@ class PostgreSQLDriver 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 ' +
-                                PostgreSQLDriver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE "name"=@' +
-                                name +
-                                ' AND "reference"=decode(@' +
-                                guid +
-                                ", 'hex'))";
-                        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 +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    '=decode(@' +
+                                    guid +
+                                    ", 'hex')";
+                            params[guid] = curQguid;
+                        }
+                        else if (this.nymph.tilmeld != null &&
+                            (curValue[0] === 'acRead' ||
+                                curValue[0] === 'acWrite' ||
+                                curValue[0] === 'acFull')) {
+                            const guid = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'decode(@' +
+                                    guid +
+                                    ", 'hex')=ANY(" +
+                                    ieTable +
+                                    '.' +
+                                    PostgreSQLDriver.escape(curValue[0]) +
+                                    ')';
+                            params[guid] = curQguid;
+                        }
+                        else {
+                            const name = `param${++count.i}`;
+                            const guid = `param${++count.i}`;
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    PostgreSQLDriver.escape(this.prefix + 'references_' + etype) +
+                                    ' WHERE "guid"=' +
+                                    ieTable +
+                                    '."guid" AND "name"=@' +
+                                    name +
+                                    ' AND "reference"=decode(@' +
+                                    guid +
+                                    ", 'hex'))";
+                            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 ' : '') +
+                        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 +
+                                '.' +
+                                PostgreSQLDriver.escape(curValue[0]));
+                            curQuery +=
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    'EXISTS (SELECT "guid" FROM ' +
+                                    PostgreSQLDriver.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) => guid +
+                                '=ANY(' +
                                 ieTable +
-                                '."guid" IN (SELECT "guid" FROM ' +
-                                PostgreSQLDriver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE "name"=@' +
-                                qrefName +
-                                ' AND "reference" IN (' +
-                                qrefQuery.query +
-                                '))';
-                        params[qrefName] = curValue[0];
+                                '.' +
+                                PostgreSQLDriver.escape(curValue[0]) +
+                                ')');
+                            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 ' +
+                                    PostgreSQLDriver.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 ${PostgreSQLDriver.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 ${PostgreSQLDriver.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) {
@@ -1285,18 +1867,23 @@ class PostgreSQLDriver 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 COUNT(${ieTable}."guid") AS "guid"
+                SELECT ${ieTable}."guid" AS "guid"
                 FROM ${PostgreSQLDriver.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 ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-              WHERE (${whereClause})`;
+              WHERE ${guidClause}(${whereClause})`;
                     }
                 }
                 else if (options.return === 'guid') {
@@ -1305,8 +1892,9 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         : `${ieTable}."guid"`;
                     query = `SELECT ${guidColumn} AS "guid"
             FROM ${PostgreSQLDriver.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
@@ -1314,20 +1902,30 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
               ${eTable}."tags",
               ${eTable}."cdate",
               ${eTable}."mdate",
+              encode(${eTable}."user", 'hex') AS "user",
+              encode(${eTable}."group", 'hex') AS "group",
+              ${eTable}."acUser",
+              ${eTable}."acGroup",
+              ${eTable}."acOther",
+              array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acRead") AS n) as "acRead",
+              array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acWrite") AS n) as "acWrite",
+              array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acFull") AS n) as "acFull",
               ${dTable}."name",
               ${dTable}."value",
-              ${cTable}."string",
-              ${cTable}."number"
+              ${dTable}."json",
+              ${dTable}."string",
+              ${dTable}."number"
             FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
             LEFT JOIN ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}."guid"=${dTable}."guid"
-            INNER JOIN ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}."guid"=${cTable}."guid" AND ${dTable}."name"=${cTable}."name"
+            ${sortJoin}
             INNER JOIN (
               SELECT ${ieTable}."guid"
               FROM ${PostgreSQLDriver.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"`;
                 }
             }
         }
@@ -1344,16 +1942,21 @@ class PostgreSQLDriver 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 COUNT(${ieTable}."guid") AS "guid"
-                FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}${limit}${offset}
+                SELECT ${ieTable}."guid" AS "guid"
+                FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}${guidClause}${limit}${offset}
               ) ${countTable}`;
                     }
                     else {
                         query = `SELECT COUNT(${ieTable}."guid") AS "count"
-              FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}`;
+              FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}${guidClause}`;
                     }
                 }
                 else if (options.return === 'guid') {
@@ -1362,7 +1965,9 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         : `${ieTable}."guid"`;
                     query = `SELECT ${guidColumn} AS "guid"
             FROM ${PostgreSQLDriver.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) {
@@ -1371,19 +1976,30 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                 ${eTable}."tags",
                 ${eTable}."cdate",
                 ${eTable}."mdate",
+                encode(${eTable}."user", 'hex') AS "user",
+                encode(${eTable}."group", 'hex') AS "group",
+                ${eTable}."acUser",
+                ${eTable}."acGroup",
+                ${eTable}."acOther",
+                array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acRead") AS n) as "acRead",
+                array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acWrite") AS n) as "acWrite",
+                array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acFull") AS n) as "acFull",
                 ${dTable}."name",
                 ${dTable}."value",
-                ${cTable}."string",
-                ${cTable}."number"
+                ${dTable}."json",
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
               LEFT JOIN ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}."guid"=${dTable}."guid"
-              INNER JOIN ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}."guid"=${cTable}."guid" AND ${dTable}."name"=${cTable}."name"
+              ${sortJoin}
               INNER JOIN (
                 SELECT ${ieTable}."guid"
                 FROM ${PostgreSQLDriver.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
@@ -1391,14 +2007,24 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                 ${eTable}."tags",
                 ${eTable}."cdate",
                 ${eTable}."mdate",
+                encode(${eTable}."user", 'hex') AS "user",
+                encode(${eTable}."group", 'hex') AS "group",
+                ${eTable}."acUser",
+                ${eTable}."acGroup",
+                ${eTable}."acOther",
+                array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acRead") AS n) as "acRead",
+                array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acWrite") AS n) as "acWrite",
+                array(SELECT encode(n, 'hex') FROM unnest(${eTable}."acFull") AS n) as "acFull",
                 ${dTable}."name",
                 ${dTable}."value",
-                ${cTable}."string",
-                ${cTable}."number"
+                ${dTable}."json",
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
               LEFT JOIN ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}."guid"=${dTable}."guid"
-              INNER JOIN ${PostgreSQLDriver.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"`;
                     }
                 }
             }
@@ -1414,33 +2040,38 @@ class PostgreSQLDriver 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,
-            cdate: isNaN(Number(row.cdate)) ? null : Number(row.cdate),
-            mdate: isNaN(Number(row.mdate)) ? null : Number(row.mdate),
+            tags: row.tags.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?.filter((guid) => guid) ?? [],
+            acWrite: row.acWrite?.filter((guid) => guid) ?? [],
+            acFull: row.acFull?.filter((guid) => guid) ?? [],
         }), (row) => ({
             name: row.name,
             svalue: row.value === 'N'
                 ? JSON.stringify(Number(row.number))
                 : row.value === 'S'
-                    ? JSON.stringify(row.string)
-                    : row.value,
+                    ? JSON.stringify(PostgreSQLDriver.unescapeNulls(row.string))
+                    : row.value === 'J'
+                        ? PostgreSQLDriver.unescapeNullSequences(JSON.stringify(row.json))
+                        : row.value,
         }));
         const result = await resultPromise;
         const value = process();
@@ -1449,31 +2080,9 @@ class PostgreSQLDriver 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,
-            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(Number(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 ${PostgreSQLDriver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
             params: {
@@ -1482,50 +2091,75 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
         });
         return result?.cur_uid == null ? null : Number(result.cur_uid);
     }
-    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(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+            let promises = [];
+            if (only == null) {
+                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
-                });
-                await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @tags, @cdate, @mdate);`, {
+                }));
+                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                     etypes: [etype],
                     params: {
                         guid,
-                        tags,
-                        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 ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+                }));
+                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
-                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+            }
+            if (only == null || only === 'tokens') {
+                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
-                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+            }
+            if (only == null) {
+                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
-                await Promise.all(promises);
-                delete sdata.cdate;
-                delete sdata.mdate;
+            }
+            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 ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (decode(@guid, 'hex'), @tags, @cdate, @mdate, ${user == null ? '@user' : "decode(@user, 'hex')"}, ${group == null ? '@group' : "decode(@group, 'hex')"}, @acUser, @acGroup, @acOther, ${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, ${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, ${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"});`, {
+                    etypes: [etype],
+                    params: {
+                        guid,
+                        tags,
+                        cdate: isNaN(cdate) ? null : cdate,
+                        mdate: isNaN(mdate) ? null : mdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
+                    },
+                });
                 for (const name in sdata) {
                     const value = sdata[name];
                     const uvalue = JSON.parse(value);
@@ -1536,24 +2170,22 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         ? 'N'
                         : typeof uvalue === 'string'
                             ? 'S'
-                            : value;
-                    const promises = [];
-                    promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value") VALUES (decode(@guid, 'hex'), @name, @storageValue);`, {
+                            : 'J';
+                    const jsonValue = storageValue === 'J'
+                        ? PostgreSQLDriver.escapeNullSequences(value)
+                        : null;
+                    promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value", "json", "string", "number", "truthy") VALUES (decode(@guid, 'hex'), @name, @storageValue, @jsonValue, @string, @number, @truthy);`, {
                         etypes: [etype],
                         params: {
                             guid,
                             name,
                             storageValue,
-                        },
-                    }));
-                    promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ("guid", "name", "truthy", "string", "number") VALUES (decode(@guid, 'hex'), @name, @truthy, @string, @number);`, {
-                        etypes: [etype],
-                        params: {
-                            guid,
-                            name,
-                            truthy: !!uvalue,
-                            string: `${uvalue}`,
+                            jsonValue,
+                            string: storageValue === 'J'
+                                ? null
+                                : PostgreSQLDriver.escapeNulls(`${uvalue}`),
                             number: isNaN(Number(uvalue)) ? null : Number(uvalue),
+                            truthy: !!uvalue,
                         },
                     }));
                     const references = this.findReferences(value);
@@ -1568,43 +2200,130 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         }));
                     }
                 }
-                await Promise.all(promises);
-            }, async (name, curUid) => {
-                await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
-                    params: {
-                        name,
-                    },
-                });
-                await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}uids`)} ("name", "cur_uid") VALUES (@name, @curUid);`, {
+            }
+            if (only === 'tilmeldAC') {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                promises.push(this.queryRun(`UPDATE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET "user"=${user == null ? '@user' : "decode(@user, 'hex')"}, "group"=${group == null ? '@group' : "decode(@group, 'hex')"}, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, "acWrite"=${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, "acFull"=${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"} WHERE "guid"=decode(@guid, 'hex');`, {
+                    etypes: [etype],
                     params: {
-                        name,
-                        curUid,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
+                        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("(decode(@guid, 'hex'), @name, @token" +
+                                    i +
+                                    ', @position' +
+                                    i +
+                                    ', @stem' +
+                                    i +
+                                    ')');
+                            }
+                            promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.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 ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} ("guid", "unique") VALUES (decode(@guid, 'hex'), @unique);`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                            unique,
+                        },
+                    }).catch((e) => {
+                        if (e instanceof EntityUniqueConstraintError) {
+                            this.nymph.config.debugError('postgresql', `Import entity unique constraint violation for GUID "${guid}" on etype "${etype}": "${unique}"`);
+                        }
+                        return e;
+                    }));
+                }
+            }
+            await Promise.all(promises);
+        }
+        catch (e) {
+            this.nymph.config.debugError('postgresql', `Import entity error: "${e}"`);
+            throw e;
+        }
+    }
+    async importUID({ name, value }) {
+        try {
+            await this.internalTransaction(`nymph-import-uid-${name}`);
+            await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
+                params: {
+                    name,
+                },
             });
-            return result;
+            await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}uids`)} ("name", "cur_uid") VALUES (@name, @value);`, {
+                params: {
+                    name,
+                    value,
+                },
+            });
+            await this.commit(`nymph-import-uid-${name}`);
         }
         catch (e) {
-            await this.rollback('nymph-import');
-            return false;
+            this.nymph.config.debugError('postgresql', `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 = undefined;
         try {
             const lock = await this.queryGet(`SELECT "cur_uid" FROM ${PostgreSQLDriver.escape(`${this.prefix}uids`)} WHERE "name"=@name FOR UPDATE;`, {
                 params: {
                     name,
                 },
             });
-            let curUid = lock?.cur_uid == null ? undefined : Number(lock.cur_uid);
+            curUid = lock?.cur_uid == null ? undefined : Number(lock.cur_uid);
             if (curUid == null) {
                 curUid = 1;
                 await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}uids`)} ("name", "cur_uid") VALUES (@name, @curUid);`, {
@@ -1623,17 +2342,18 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                     },
                 });
             }
-            await this.commit('nymph-newuid');
-            return curUid;
         }
         catch (e) {
+            this.nymph.config.debugError('postgresql', `New UID error: "${e}"`);
             await this.rollback('nymph-newuid');
             throw e;
         }
+        await this.commit('nymph-newuid');
+        return curUid;
     }
     async renameUID(oldName, newName) {
         if (oldName == null || newName == null) {
-            throw new nymph_1.InvalidParametersError('Name not given for UID.');
+            throw new InvalidParametersError('Name not given for UID.');
         }
         await this.queryRun(`UPDATE ${PostgreSQLDriver.escape(`${this.prefix}uids`)} SET "name"=@newName WHERE "name"=@oldName;`, {
             params: {
@@ -1645,7 +2365,7 @@ class PostgreSQLDriver 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;
@@ -1662,7 +2382,8 @@ class PostgreSQLDriver 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;
@@ -1671,24 +2392,23 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                     ? 'N'
                     : typeof value === 'string'
                         ? 'S'
-                        : svalue;
+                        : 'J';
+                const jsonValue = storageValue === 'J'
+                    ? PostgreSQLDriver.escapeNullSequences(svalue)
+                    : null;
                 const promises = [];
-                promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value") VALUES (decode(@guid, 'hex'), @name, @storageValue);`, {
+                promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value", "json", "string", "number", "truthy") VALUES (decode(@guid, 'hex'), @name, @storageValue, @jsonValue, @string, @number, @truthy);`, {
                     etypes: [etype],
                     params: {
                         guid,
                         name,
                         storageValue,
-                    },
-                }));
-                promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ("guid", "name", "truthy", "string", "number") VALUES (decode(@guid, 'hex'), @name, @truthy, @string, @number);`, {
-                    etypes: [etype],
-                    params: {
-                        guid,
-                        name,
-                        truthy: !!value,
-                        string: `${value}`,
+                        jsonValue,
+                        string: storageValue === 'J'
+                            ? null
+                            : PostgreSQLDriver.escapeNulls(`${value}`),
                         number: isNaN(Number(value)) ? null : Number(value),
+                        truthy: !!value,
                     },
                 }));
                 const references = this.findReferences(svalue);
@@ -1702,8 +2422,60 @@ class PostgreSQLDriver 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("(decode(@guid, 'hex'), @name, @token" +
+                                i +
+                                ', @position' +
+                                i +
+                                ', @stem' +
+                                i +
+                                ')');
+                        }
+                        promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.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 ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} ("guid", "unique") VALUES (decode(@guid, 'hex'), @unique);`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                            unique,
+                        },
+                    });
+                }
+                catch (e) {
+                    if (e instanceof EntityUniqueConstraintError) {
+                        this.nymph.config.debugError('postgresql', `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]));
             }
@@ -1711,19 +2483,38 @@ class PostgreSQLDriver 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 ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @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 ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (decode(@guid, 'hex'), @tags, @cdate, @cdate, ${user == null ? '@user' : "decode(@user, 'hex')"}, ${group == null ? '@group' : "decode(@group, 'hex')"}, @acUser, @acGroup, @acOther, ${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, ${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, ${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"});`, {
                     etypes: [etype],
                     params: {
                         guid,
                         tags,
                         cdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
                     },
                 });
-                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);
                 const promises = [];
                 promises.push(this.queryRun(`SELECT 1 FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
                     etypes: [etype],
@@ -1737,24 +2528,38 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         guid,
                     },
                 }));
-                promises.push(this.queryRun(`SELECT 1 FROM ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
+                promises.push(this.queryRun(`SELECT 1 FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
-                promises.push(this.queryRun(`SELECT 1 FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
+                promises.push(this.queryRun(`SELECT 1 FROM ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
+                    etypes: [etype],
+                    params: {
+                        guid,
+                    },
+                }));
+                promises.push(this.queryRun(`SELECT 1 FROM ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
                     etypes: [etype],
                     params: {
                         guid,
                     },
                 }));
                 await Promise.all(promises);
-                const info = await this.queryRun(`UPDATE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate WHERE "guid"=decode(@guid, 'hex') AND "mdate" <= @emdate;`, {
+                const info = await this.queryRun(`UPDATE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate, "user"=${user == null ? '@user' : "decode(@user, 'hex')"}, "group"=${group == null ? '@group' : "decode(@group, 'hex')"}, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, "acWrite"=${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, "acFull"=${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"} WHERE "guid"=decode(@guid, 'hex') AND "mdate" <= @emdate;`, {
                     etypes: [etype],
                     params: {
                         tags,
                         mdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
                         guid,
                         emdate: isNaN(Number(entity.mdate)) ? 0 : Number(entity.mdate),
                     },
@@ -1768,44 +2573,57 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             guid,
                         },
                     }));
-                    promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+                    promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                         etypes: [etype],
                         params: {
                             guid,
                         },
                     }));
-                    promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+                    promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+                        etypes: [etype],
+                        params: {
+                            guid,
+                        },
+                    }));
+                    promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                         etypes: [etype],
                         params: {
                             guid,
                         },
                     }));
                     await Promise.all(promises);
-                    await insertData(guid, data, sdata, etype);
+                    await insertData(guid, data, sdata, uniques, etype);
                     success = true;
                 }
                 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('postgresql', `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.internalTransaction('nymph-setuid');
         try {
@@ -1821,23 +2639,25 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                     curUid,
                 },
             });
-            await this.commit('nymph-setuid');
-            return true;
         }
         catch (e) {
             await this.rollback('nymph-setuid');
             throw e;
         }
+        await this.commit('nymph-setuid');
+        return true;
     }
     async internalTransaction(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
-            throw new nymph_1.InvalidParametersError('Transaction start attempted without a name.');
+            throw new InvalidParametersError('Transaction start attempted without a name.');
         }
         if (!this.transaction || this.transaction.count === 0) {
+            // Lock to one connection.
             this.transaction = {
                 count: 0,
                 connection: await this.getConnection(),
             };
+            // We're not in a transaction yet, so start one.
             await this.queryRun('BEGIN;');
         }
         await this.queryRun(`SAVEPOINT ${PostgreSQLDriver.escape(name)};`);
@@ -1845,7 +2665,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
         return this.transaction;
     }
     async startTransaction(name) {
-        const inTransaction = this.inTransaction();
+        const inTransaction = await this.inTransaction();
         const transaction = await this.internalTransaction(name);
         if (!inTransaction) {
             this.transaction = null;
@@ -1854,6 +2674,121 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
         nymph.driver.transaction = transaction;
         return nymph;
     }
+    async removeTilmeldOldRows(etype, connection) {
+        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 ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} WHERE "name"=@name;`, {
+                    etypes: [etype],
+                    params: {
+                        name,
+                    },
+                    connection,
+                });
+                await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} WHERE "name"=@name;`, {
+                    etypes: [etype],
+                    params: {
+                        name,
+                    },
+                    connection,
+                });
+                await this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE "name"=@name;`, {
+                    etypes: [etype],
+                    params: {
+                        name,
+                    },
+                    connection,
+                });
+            }
+        }
+        catch (e) {
+            this.nymph.config.debugError('postgresql', `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_catalog"=@db AND "table_schema"=\'public\' 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_catalog"=@db AND "table_schema"=\'public\' 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_catalog"=@db AND "table_schema"=\'public\' 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_catalog"=@db AND "table_schema"=\'public\' 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_catalog"=@db AND "table_schema"=\'public\' 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();
+            const connection = await this.getConnection(true);
+            for (let etype of etypes) {
+                await this.createTokensTable(etype, connection);
+            }
+            connection.done();
+        }
+        else if (migrationType === 'tilmeldColumns') {
+            const etypes = await this.getEtypes();
+            const connection = await this.getConnection(true);
+            for (let etype of etypes) {
+                await this.addTilmeldColumnsAndIndexes(etype, connection);
+            }
+            connection.done();
+        }
+        else if (migrationType === 'tilmeldRemoveOldRows') {
+            const etypes = await this.getEtypes();
+            const connection = await this.getConnection(true);
+            for (let etype of etypes) {
+                await this.removeTilmeldOldRows(etype, connection);
+            }
+            connection.done();
+        }
+    }
 }
-exports.default = PostgreSQLDriver;
 //# sourceMappingURL=PostgreSQLDriver.js.map