@nymphjs/driver-postgresql 1.0.0-beta.9 → 1.0.0-beta.91

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,121 @@ 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) {
+    /**
+     * 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) {
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} (
+            // 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,
           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 });
+            // 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_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") WHERE "truthy" = TRUE;`, { connection });
+            await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_falsy`)};`, { connection });
+            await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}_id_name_falsy`)} ON ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} USING btree ("name") WHERE "truthy" <> TRUE;`, { 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 });
+            // 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 });
+            // 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 });
         }
         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 +283,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);
                 }
             }
-            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);
             }
         }
     }
-    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 +324,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 +367,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 +384,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 +426,34 @@ 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}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 +462,124 @@ 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('');
+    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 (const uid of uids) {
-            writeLine(`<${uid.name}>[${uid.cur_uid}]`);
+        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;
         }
-        writeLine('');
-        writeLine('#');
-        writeLine('# Entities');
-        writeLine('#');
-        writeLine('');
-        const tables = await this.queryIter('SELECT relname FROM pg_stat_user_tables ORDER BY relname;');
+        // Get the etypes.
+        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));
         }
         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", 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) {
+                let currentEntityExport = [];
+                currentEntityExport.push(`{${guid}}<${etype}>[${tags}]`);
+                currentEntityExport.push(`\tcdate=${JSON.stringify(cdate)}`);
+                currentEntityExport.push(`\tmdate=${JSON.stringify(mdate)}`);
+                if (datum.value.name != null) {
+                    // This do will keep going and adding the data until the
+                    // next entity is reached. $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) {
         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 sTable = `s${tableSuffix}`;
         const sort = options.sort ?? 'cdate';
-        const queryParts = this.iterateSelectorsForQuery(formattedSelectors, (key, value, typeIsOr, typeIsNot) => {
+        const queryParts = this.iterateSelectorsForQuery(formattedSelectors, ({ key, value, typeIsOr, typeIsNot }) => {
             const clauseNot = key.startsWith('!');
             let curQuery = '';
             for (const curValue of value) {
@@ -501,7 +592,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 +608,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"';
@@ -532,12 +623,12 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const name = `param${++count.i}`;
                             curQuery +=
-                                ieTable +
-                                    '."guid" ' +
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                    '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 +
                                     ')';
                             params[name] = curVar;
@@ -551,7 +642,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             if (curVar === 'cdate') {
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                         '(' +
                                         ieTable +
                                         '."cdate" NOT NULL)';
@@ -559,7 +650,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             else if (curVar === 'mdate') {
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                         '(' +
                                         ieTable +
                                         '."mdate" NOT NULL)';
@@ -568,11 +659,12 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             else {
                                 const name = `param${++count.i}`;
                                 curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                    (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                        'EXISTS (SELECT "guid" FROM ' +
+                                        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;
@@ -587,7 +679,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate"=@' +
                                     cdate;
@@ -602,7 +694,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate"=@' +
                                     mdate;
@@ -618,11 +710,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 +730,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,17 +760,18 @@ 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':
@@ -685,9 +782,9 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '."cdate"=' +
+                                    '."cdate"=@' +
                                     cdate;
                             params[cdate] = isNaN(Number(curValue[1]))
                                 ? null
@@ -700,9 +797,9 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
-                                    '."mdate"=' +
+                                    '."mdate"=@' +
                                     mdate;
                             params[mdate] = isNaN(Number(curValue[1]))
                                 ? null
@@ -714,55 +811,32 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                                 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]}`;
-                            }
-                            const name = `param${++count.i}`;
-                            const value = `param${++count.i}`;
-                            if (typeof curValue[1] === 'string') {
-                                const stringParam = `param${++count.i}`;
-                                curQuery +=
-                                    ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                        '(' +
-                                        ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
-                                        ' WHERE "name"=@' +
-                                        name +
-                                        ' AND position(@' +
-                                        value +
-                                        ' IN "value")>0) OR ' +
-                                        ieTable +
-                                        '."guid" IN (SELECT "guid" FROM ' +
-                                        PostgreSQLDriver.escape(this.prefix + 'comparisons_' + etype) +
-                                        ' WHERE "name"=@' +
-                                        name +
-                                        ' AND "string"=@' +
-                                        stringParam +
-                                        '))';
-                                params[stringParam] = stringValue;
                             }
                             else {
-                                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)';
+                                svalue = JSON.stringify([curValue[1]]);
                             }
+                            const name = `param${++count.i}`;
+                            const value = `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] = svalue;
+                            params[value] = PostgreSQLDriver.escapeNullSequences(svalue);
                         }
                         break;
                     case 'match':
@@ -773,7 +847,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" ~ @' +
@@ -788,7 +862,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" ~ @' +
@@ -804,17 +878,18 @@ 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':
@@ -825,7 +900,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" ~* @' +
@@ -840,7 +915,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" ~* @' +
@@ -856,17 +931,18 @@ 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':
@@ -877,7 +953,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" LIKE @' +
@@ -892,7 +968,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" LIKE @' +
@@ -908,17 +984,18 @@ 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':
@@ -929,7 +1006,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."cdate" ILIKE @' +
@@ -944,7 +1021,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     '(' +
                                     ieTable +
                                     '."mdate" ILIKE @' +
@@ -960,17 +1037,18 @@ 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" ILIKE @' +
                                     value +
                                     ')';
                             params[name] = curValue[0];
-                            params[value] = curValue[1];
+                            params[value] = PostgreSQLDriver.escapeNulls(curValue[1]);
                         }
                         break;
                     case 'gt':
@@ -981,7 +1059,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate">@' +
                                     cdate;
@@ -996,7 +1074,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate">@' +
                                     mdate;
@@ -1012,11 +1090,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 +
@@ -1035,7 +1114,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate">=@' +
                                     cdate;
@@ -1050,7 +1129,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate">=@' +
                                     mdate;
@@ -1066,11 +1145,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 +
@@ -1089,7 +1169,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate"<@' +
                                     cdate;
@@ -1104,7 +1184,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate"<@' +
                                     mdate;
@@ -1120,11 +1200,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 +
@@ -1143,7 +1224,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const cdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."cdate"<=@' +
                                     cdate;
@@ -1158,7 +1239,7 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             }
                             const mdate = `param${++count.i}`;
                             curQuery +=
-                                ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                     ieTable +
                                     '."mdate"<=@' +
                                     mdate;
@@ -1174,11 +1255,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 +
@@ -1207,11 +1289,12 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         const name = `param${++count.i}`;
                         const guid = `param${++count.i}`;
                         curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                ieTable +
-                                '."guid" IN (SELECT "guid" FROM ' +
+                            (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                'EXISTS (SELECT "guid" FROM ' +
                                 PostgreSQLDriver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE "name"=@' +
+                                ' WHERE "guid"=' +
+                                ieTable +
+                                '."guid" AND "name"=@' +
                                 name +
                                 ' AND "reference"=decode(@' +
                                 guid +
@@ -1226,29 +1309,37 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
                         curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                            (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                 '(' +
                                 subquery.query +
                                 ')';
                         break;
                     case 'qref':
                     case '!qref':
+                        const referenceTableSuffix = makeTableSuffix();
                         const [qrefOptions, ...qrefSelectors] = curValue[1];
                         const QrefEntityClass = qrefOptions.class;
                         etypes.push(QrefEntityClass.ETYPE);
-                        const qrefQuery = this.makeEntityQuery({ ...qrefOptions, return: 'guid', class: QrefEntityClass }, qrefSelectors, QrefEntityClass.ETYPE, count, params, false, (0, guid_1.makeTableSuffix)(), etypes);
+                        const qrefQuery = this.makeEntityQuery({ ...qrefOptions, return: 'guid', class: QrefEntityClass }, qrefSelectors, QrefEntityClass.ETYPE, count, params, false, makeTableSuffix(), etypes, 'r' + referenceTableSuffix + '."reference"');
                         if (curQuery) {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
                         const qrefName = `param${++count.i}`;
                         curQuery +=
-                            ((0, nymph_1.xor)(typeIsNot, clauseNot) ? 'NOT ' : '') +
-                                ieTable +
-                                '."guid" IN (SELECT "guid" FROM ' +
+                            (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
+                                'EXISTS (SELECT "guid" FROM ' +
                                 PostgreSQLDriver.escape(this.prefix + 'references_' + etype) +
-                                ' WHERE "name"=@' +
+                                ' r' +
+                                referenceTableSuffix +
+                                ' WHERE r' +
+                                referenceTableSuffix +
+                                '."guid"=' +
+                                ieTable +
+                                '."guid" AND r' +
+                                referenceTableSuffix +
+                                '."name"=@' +
                                 qrefName +
-                                ' AND "reference" IN (' +
+                                ' AND EXISTS (' +
                                 qrefQuery.query +
                                 '))';
                         params[qrefName] = curValue[0];
@@ -1258,18 +1349,38 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
             return curQuery;
         });
         let sortBy;
+        let sortByInner;
+        let sortJoin = '';
+        let sortJoinInner = '';
+        const order = options.reverse ? ' DESC' : '';
         switch (sort) {
             case 'mdate':
-                sortBy = '"mdate"';
+                sortBy = `${eTable}."mdate"${order}`;
+                sortByInner = `${ieTable}."mdate"${order}`;
                 break;
             case 'cdate':
+                sortBy = `${eTable}."cdate"${order}`;
+                sortByInner = `${ieTable}."cdate"${order}`;
+                break;
             default:
-                sortBy = '"cdate"';
+                const name = `param${++count.i}`;
+                sortJoin = `LEFT JOIN (
+            SELECT "guid", "string", "number"
+            FROM ${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 = `${sTable}."number"${order}, ${sTable}."string"${order}`;
+                sortByInner = sortBy;
+                params[name] = sort;
                 break;
         }
-        if (options.reverse) {
-            sortBy += ' DESC';
-        }
         let query;
         if (queryParts.length) {
             if (subquery) {
@@ -1285,18 +1396,21 @@ 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 = 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 +1419,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})
+            ORDER BY ${sortByInner}, ${ieTable}."guid"${limit}${offset}`;
                 }
                 else {
                     query = `SELECT
@@ -1316,18 +1431,20 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
               ${eTable}."mdate",
               ${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})
+              ORDER BY ${sortByInner}${limit}${offset}
             ) ${fTable} ON ${eTable}."guid"=${fTable}."guid"
-            ORDER BY ${eTable}.${sortBy}`;
+            ORDER BY ${sortBy}, ${eTable}."guid"`;
                 }
             }
         }
@@ -1344,16 +1461,19 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                 if ('offset' in options) {
                     offset = ` OFFSET ${Math.floor(isNaN(Number(options.offset)) ? 0 : Number(options.offset))}`;
                 }
+                const guidClause = 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 +1482,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}
+            ORDER BY ${sortByInner}, ${ieTable}."guid"${limit}${offset}`;
                 }
                 else {
                     if (limit || offset) {
@@ -1373,17 +1495,20 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                 ${eTable}."mdate",
                 ${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}
+                ORDER BY ${sortByInner}${limit}${offset}
               ) ${fTable} ON ${eTable}."guid"=${fTable}."guid"
-              ORDER BY ${eTable}.${sortBy}`;
+              ORDER BY ${sortBy}, ${eTable}."guid"`;
                     }
                     else {
                         query = `SELECT
@@ -1393,12 +1518,14 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                 ${eTable}."mdate",
                 ${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}
+              ${guidSelector ? `WHERE ${eTable}."guid"=${guidSelector}` : ''}
+              ORDER BY ${sortBy}, ${eTable}."guid"`;
                     }
                 }
             }
@@ -1414,24 +1541,19 @@ 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,
+            tags: row.tags.filter((tag) => tag),
             cdate: isNaN(Number(row.cdate)) ? null : Number(row.cdate),
             mdate: isNaN(Number(row.mdate)) ? null : Number(row.mdate),
         }), (row) => ({
@@ -1439,8 +1561,10 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
             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 +1573,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,129 +1584,143 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
         });
         return result?.cur_uid == null ? null : Number(result.cur_uid);
     }
-    async import(filename) {
+    async importEntity({ guid, cdate, mdate, tags, sdata, etype, }) {
         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');`, {
-                    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);`, {
+            let promises = [];
+            promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+                etypes: [etype],
+                params: {
+                    guid,
+                },
+            }));
+            promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}data_${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');`, {
+                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);
+            promises = [];
+            await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @tags, @cdate, @mdate);`, {
+                etypes: [etype],
+                params: {
+                    guid,
+                    tags,
+                    cdate: isNaN(cdate) ? null : cdate,
+                    mdate: isNaN(mdate) ? null : mdate,
+                },
+            });
+            for (const name in sdata) {
+                const value = sdata[name];
+                const uvalue = JSON.parse(value);
+                if (value === undefined) {
+                    continue;
+                }
+                const storageValue = typeof uvalue === 'number'
+                    ? 'N'
+                    : typeof uvalue === 'string'
+                        ? 'S'
+                        : '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,
-                        tags,
-                        cdate: isNaN(Number(JSON.parse(sdata.cdate)))
-                            ? null
-                            : Number(JSON.parse(sdata.cdate)),
-                        mdate: isNaN(Number(JSON.parse(sdata.mdate)))
+                        name,
+                        storageValue,
+                        jsonValue,
+                        string: storageValue === 'J'
                             ? 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');`, {
-                    etypes: [etype],
-                    params: {
-                        guid,
-                    },
-                }));
-                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}comparisons_${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');`, {
-                    etypes: [etype],
-                    params: {
-                        guid,
+                            : PostgreSQLDriver.escapeNulls(`${uvalue}`),
+                        number: isNaN(Number(uvalue)) ? null : Number(uvalue),
+                        truthy: !!uvalue,
                     },
                 }));
-                await Promise.all(promises);
-                delete sdata.cdate;
-                delete sdata.mdate;
-                for (const name in sdata) {
-                    const value = sdata[name];
-                    const uvalue = JSON.parse(value);
-                    if (value === undefined) {
-                        continue;
-                    }
-                    const storageValue = typeof uvalue === 'number'
-                        ? 'N'
-                        : typeof uvalue === 'string'
-                            ? 'S'
-                            : value;
-                    const promises = [];
-                    promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} ("guid", "name", "value") VALUES (decode(@guid, 'hex'), @name, @storageValue);`, {
-                        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);`, {
+                const references = this.findReferences(value);
+                for (const reference of references) {
+                    promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} ("guid", "name", "reference") VALUES (decode(@guid, 'hex'), @name, decode(@reference, 'hex'));`, {
                         etypes: [etype],
                         params: {
                             guid,
                             name,
-                            truthy: !!uvalue,
-                            string: `${uvalue}`,
-                            number: isNaN(Number(uvalue)) ? null : Number(uvalue),
+                            reference,
                         },
                     }));
-                    const references = this.findReferences(value);
-                    for (const reference of references) {
-                        promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}references_${etype}`)} ("guid", "name", "reference") VALUES (decode(@guid, 'hex'), @name, decode(@reference, 'hex'));`, {
-                            etypes: [etype],
-                            params: {
-                                guid,
-                                name,
-                                reference,
-                            },
-                        }));
-                    }
                 }
-                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);`, {
+            }
+            const uniques = await this.nymph
+                .getEntityClassByEtype(etype)
+                .getUniques({ guid, cdate, mdate, tags, data: {}, sdata });
+            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: {
-                        name,
-                        curUid,
+                        guid,
+                        unique,
                     },
-                });
-            }, async () => {
-                await this.internalTransaction('nymph-import');
-            }, async () => {
-                await this.commit('nymph-import');
+                }).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 +1739,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 +1762,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 +1779,7 @@ 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 runInsertQuery = async (name, value, svalue) => {
                 if (value === undefined) {
                     return;
@@ -1671,24 +1788,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);
@@ -1704,6 +1820,23 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                 }
                 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,8 +1844,13 @@ 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) => {
+            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;
+                }
                 await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @tags, @cdate, @cdate);`, {
                     etypes: [etype],
                     params: {
@@ -1721,9 +1859,13 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
                         cdate,
                     },
                 });
-                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;
+                }
                 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,13 +1879,13 @@ 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}uniques_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
                     etypes: [etype],
                     params: {
                         guid,
@@ -1768,44 +1910,51 @@ 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}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 +1970,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 +1996,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 +2005,23 @@ class PostgreSQLDriver extends nymph_1.NymphDriver {
         nymph.driver.transaction = transaction;
         return nymph;
     }
+    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,
+                },
+            });
+            return !result?.exists;
+        }
+        return false;
+    }
 }
-exports.default = PostgreSQLDriver;
 //# sourceMappingURL=PostgreSQLDriver.js.map