@nymphjs/driver-sqlite3 1.0.0-beta.4 → 1.0.0-beta.40

package/CHANGELOG.md

@@ -3,6 +3,164 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.40](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.39...v1.0.0-beta.40) (2023-07-10)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.39](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.38...v1.0.0-beta.39) (2023-07-09)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.38](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.37...v1.0.0-beta.38) (2023-07-09)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.37](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.36...v1.0.0-beta.37) (2023-07-09)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.36](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.35...v1.0.0-beta.36) (2023-07-09)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.35](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.34...v1.0.0-beta.35) (2023-06-14)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.34](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.33...v1.0.0-beta.34) (2023-05-13)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.33](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.32...v1.0.0-beta.33) (2023-05-13)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.32](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.31...v1.0.0-beta.32) (2023-05-13)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.31](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.30...v1.0.0-beta.31) (2023-05-12)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.30](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.29...v1.0.0-beta.30) (2023-05-12)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.29](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.28...v1.0.0-beta.29) (2023-05-08)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.28](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.27...v1.0.0-beta.28) (2023-05-05)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.27](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.26...v1.0.0-beta.27) (2023-05-04)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.26](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.25...v1.0.0-beta.26) (2023-05-04)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.25](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.24...v1.0.0-beta.25) (2023-05-04)
+
+### Bug Fixes
+
+- don't create empty entities ([1d4d2e9](https://github.com/sciactive/nymphjs/commit/1d4d2e99af2e9cdc647bcf58ac34572836f41176))
+
+# [1.0.0-beta.24](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.23...v1.0.0-beta.24) (2023-05-02)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.23](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.22...v1.0.0-beta.23) (2023-05-02)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.22](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.21...v1.0.0-beta.22) (2023-05-01)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.21](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.20...v1.0.0-beta.21) (2023-05-01)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.20](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.19...v1.0.0-beta.20) (2023-04-30)
+
+### Features
+
+- let the user revoke all current auth tokens ([63af3b9](https://github.com/sciactive/nymphjs/commit/63af3b9a31c6c221ab40c2c8a69231675f4634a2))
+
+# [1.0.0-beta.19](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.18...v1.0.0-beta.19) (2023-04-29)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.18](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.17...v1.0.0-beta.18) (2023-04-27)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.17](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.16...v1.0.0-beta.17) (2023-04-24)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.16](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.15...v1.0.0-beta.16) (2023-03-31)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.15](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.14...v1.0.0-beta.15) (2023-03-23)
+
+### Features
+
+- add option to sort results by a property ([16384e7](https://github.com/sciactive/nymphjs/commit/16384e7bdab88abb55ccccabb06ac09f92fa8a03))
+
+# [1.0.0-beta.14](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.13...v1.0.0-beta.14) (2023-03-17)
+
+### Bug Fixes
+
+- run pragma and function on write link on new sqlite3 db ([6c28ba1](https://github.com/sciactive/nymphjs/commit/6c28ba1a396f7cec098d4e550c7b82c93979eaec))
+
+# [1.0.0-beta.13](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.12...v1.0.0-beta.13) (2023-03-16)
+
+### Features
+
+- open sqlite in readonly unless actively writing to db ([0443b91](https://github.com/sciactive/nymphjs/commit/0443b9188df3ebd557b96baf873abc4e4ddd9137))
+
+# [1.0.0-beta.12](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.11...v1.0.0-beta.12) (2023-03-04)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.11](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.10...v1.0.0-beta.11) (2023-02-27)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.10](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.9...v1.0.0-beta.10) (2023-01-19)
+
+### Features
+
+- add wal mode setting to sqlite driver ([0071d66](https://github.com/sciactive/nymphjs/commit/0071d6628534b8b35d49c0238a99fe143fd03207))
+
+# [1.0.0-beta.9](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.8...v1.0.0-beta.9) (2023-01-09)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.8](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.7...v1.0.0-beta.8) (2023-01-09)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.7](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2023-01-05)
+
+### Bug Fixes
+
+- sqlite transaction returns wrong instance of nymph if it has been cloned ([b278c76](https://github.com/sciactive/nymphjs/commit/b278c7633722cb1cca7a941187ae2f1ff8ebdc7b))
+
+# [1.0.0-beta.6](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.5...v1.0.0-beta.6) (2023-01-05)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
+# [1.0.0-beta.5](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.4...v1.0.0-beta.5) (2022-11-24)
+
+**Note:** Version bump only for package @nymphjs/driver-sqlite3
+
 # [1.0.0-beta.4](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2022-11-23)
 
 **Note:** Version bump only for package @nymphjs/driver-sqlite3

package/dist/SQLite3Driver.d.ts

@@ -1,19 +1,25 @@
 import SQLite3 from 'better-sqlite3';
 import { NymphDriver, EntityConstructor, EntityInterface, FormattedSelector, Options, Selector } from '@nymphjs/nymph';
 import { SQLite3DriverConfig } from './conf';
+declare class InternalStore {
+    link: SQLite3.Database;
+    linkWrite?: SQLite3.Database;
+    connected: boolean;
+    transactionsStarted: number;
+    constructor(link: SQLite3.Database);
+}
 export default class SQLite3Driver extends NymphDriver {
     config: SQLite3DriverConfig;
     protected prefix: string;
-    protected connected: boolean;
-    protected link: SQLite3.Database;
-    protected transactionsStarted: number;
+    protected store: InternalStore;
     static escape(input: string): string;
-    constructor(config: Partial<SQLite3DriverConfig>);
-    connect(): Promise<true>;
+    constructor(config: Partial<SQLite3DriverConfig>, store?: InternalStore);
+    clone(): SQLite3Driver;
+    connect(): Promise<boolean>;
+    private _connect;
     disconnect(): Promise<false>;
     inTransaction(): Promise<boolean>;
     isConnected(): boolean;
-    private checkReadOnlyMode;
     private createTables;
     private query;
     private queryIter;
@@ -50,3 +56,4 @@ export default class SQLite3Driver extends NymphDriver {
     setUID(name: string, curUid: number): Promise<boolean>;
     startTransaction(name: string): Promise<import("@nymphjs/nymph").Nymph>;
 }
+export {};

package/dist/SQLite3Driver.js

@@ -7,6 +7,13 @@ const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
 const nymph_1 = require("@nymphjs/nymph");
 const guid_1 = require("@nymphjs/guid");
 const conf_1 = require("./conf");
+class InternalStore {
+    constructor(link) {
+        this.connected = false;
+        this.transactionsStarted = 0;
+        this.link = link;
+    }
+}
 class SQLite3Driver extends nymph_1.NymphDriver {
     static escape(input) {
         if (input.indexOf('\x00') !== -1) {
@@ -14,63 +21,126 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         }
         return '"' + input.replace(/"/g, () => '""') + '"';
     }
-    constructor(config) {
+    constructor(config, store) {
         super();
-        this.connected = false;
-        this.transactionsStarted = 0;
         this.config = { ...conf_1.SQLite3DriverConfigDefaults, ...config };
+        if (this.config.filename === ':memory:') {
+            this.config.explicitWrite = true;
+        }
         this.prefix = this.config.prefix;
-        this.connect();
+        if (store) {
+            this.store = store;
+        }
+        else {
+            this.connect();
+        }
     }
-    async connect() {
-        const { filename, fileMustExist, timeout, readonly, verbose } = this.config;
-        if (!this.connected) {
+    clone() {
+        return new SQLite3Driver(this.config, this.store);
+    }
+    connect() {
+        if (this.store && this.store.connected) {
+            return Promise.resolve(true);
+        }
+        this._connect(false);
+        return Promise.resolve(this.store.connected);
+    }
+    _connect(write) {
+        const { filename, fileMustExist, timeout, explicitWrite, wal, verbose } = this.config;
+        try {
+            const setOptions = (link) => {
+                if (wal) {
+                    link.pragma('journal_mode = WAL;');
+                }
+                link.pragma('encoding = "UTF-8";');
+                link.pragma('foreign_keys = 1;');
+                link.pragma('case_sensitive_like = 1;');
+                link.function('regexp', { deterministic: true }, ((pattern, subject) => (this.posixRegexMatch(pattern, subject) ? 1 : 0)));
+            };
+            let link;
             try {
-                this.link = new better_sqlite3_1.default(filename, {
-                    readonly,
+                link = new better_sqlite3_1.default(filename, {
+                    readonly: !explicitWrite && !write,
                     fileMustExist,
                     timeout,
                     verbose,
                 });
-                this.connected = true;
-                this.link.pragma('encoding = "UTF-8";');
-                this.link.pragma('foreign_keys = 1;');
-                this.link.pragma('case_sensitive_like = 1;');
-                this.link.function('regexp', { deterministic: true }, (pattern, subject) => this.posixRegexMatch(pattern, subject) ? 1 : 0);
             }
             catch (e) {
-                this.connected = false;
-                if (filename === ':memory:') {
-                    throw new nymph_1.NotConfiguredError("It seems the config hasn't been set up correctly.");
+                if (e.code === 'SQLITE_CANTOPEN' &&
+                    !explicitWrite &&
+                    !write &&
+                    !this.config.fileMustExist) {
+                    const writeLink = new better_sqlite3_1.default(filename, {
+                        readonly: false,
+                        fileMustExist,
+                        timeout,
+                        verbose,
+                    });
+                    setOptions(writeLink);
+                    writeLink.close();
+                    link = new better_sqlite3_1.default(filename, {
+                        readonly: true,
+                        fileMustExist,
+                        timeout,
+                        verbose,
+                    });
                 }
                 else {
-                    throw new nymph_1.UnableToConnectError('Could not connect: ' + e?.message);
+                    throw e;
+                }
+            }
+            if (!this.store) {
+                if (write) {
+                    throw new Error('Tried to open in write without opening in read first.');
                 }
+                this.store = new InternalStore(link);
+            }
+            else if (write) {
+                this.store.linkWrite = link;
+            }
+            else {
+                this.store.link = link;
+            }
+            this.store.connected = true;
+            setOptions(link);
+        }
+        catch (e) {
+            if (this.store) {
+                this.store.connected = false;
+            }
+            if (filename === ':memory:') {
+                throw new nymph_1.NotConfiguredError("It seems the config hasn't been set up correctly. Could not connect: " +
+                    e?.message);
+            }
+            else {
+                throw new nymph_1.UnableToConnectError('Could not connect: ' + e?.message);
             }
         }
-        return this.connected;
     }
     async disconnect() {
-        if (this.connected) {
-            this.link.exec('PRAGMA optimize;');
-            this.link.close();
-            this.connected = false;
+        if (this.store.connected) {
+            if (this.store.linkWrite && !this.config.explicitWrite) {
+                this.store.linkWrite.exec('PRAGMA optimize;');
+                this.store.linkWrite.close();
+                this.store.linkWrite = undefined;
+            }
+            if (this.config.explicitWrite) {
+                this.store.link.exec('PRAGMA optimize;');
+            }
+            this.store.link.close();
+            this.store.transactionsStarted = 0;
+            this.store.connected = false;
         }
-        return this.connected;
+        return this.store.connected;
     }
     async inTransaction() {
-        return this.transactionsStarted > 0;
+        return this.store.transactionsStarted > 0;
     }
     isConnected() {
-        return this.connected;
-    }
-    checkReadOnlyMode() {
-        if (this.config.readonly) {
-            throw new nymph_1.InvalidParametersError('Attempt to write to SQLite3 DB in read only mode.');
-        }
+        return this.store.connected;
     }
     createTables(etype = null) {
-        this.checkReadOnlyMode();
         this.startTransaction('nymph-tablecreation');
         try {
             if (etype != null) {
@@ -130,23 +200,32 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         }
     }
     queryIter(query, { etypes = [], params = {}, } = {}) {
-        return this.query(() => this.link.prepare(query).iterate(params), `${query} -- ${JSON.stringify(params)}`, etypes);
+        return this.query(() => (this.store.linkWrite || this.store.link)
+            .prepare(query)
+            .iterate(params), `${query} -- ${JSON.stringify(params)}`, etypes);
     }
     queryGet(query, { etypes = [], params = {}, } = {}) {
-        return this.query(() => this.link.prepare(query).get(params), `${query} -- ${JSON.stringify(params)}`, etypes);
+        return this.query(() => (this.store.linkWrite || this.store.link).prepare(query).get(params), `${query} -- ${JSON.stringify(params)}`, etypes);
     }
     queryRun(query, { etypes = [], params = {}, } = {}) {
-        return this.query(() => this.link.prepare(query).run(params), `${query} -- ${JSON.stringify(params)}`, etypes);
+        return this.query(() => (this.store.linkWrite || this.store.link).prepare(query).run(params), `${query} -- ${JSON.stringify(params)}`, etypes);
     }
     async commit(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
             throw new nymph_1.InvalidParametersError('Transaction commit attempted without a name.');
         }
-        if (this.transactionsStarted === 0) {
+        if (this.store.transactionsStarted === 0) {
             return true;
         }
         this.queryRun(`RELEASE SAVEPOINT ${SQLite3Driver.escape(name)};`);
-        this.transactionsStarted--;
+        this.store.transactionsStarted--;
+        if (this.store.transactionsStarted === 0 &&
+            this.store.linkWrite &&
+            !this.config.explicitWrite) {
+            this.store.linkWrite.exec('PRAGMA optimize;');
+            this.store.linkWrite.close();
+            this.store.linkWrite = undefined;
+        }
         return true;
     }
     async deleteEntityByID(guid, className) {
@@ -159,7 +238,6 @@ class SQLite3Driver extends nymph_1.NymphDriver {
             EntityClass = className;
         }
         const etype = EntityClass.ETYPE;
-        this.checkReadOnlyMode();
         await this.startTransaction('nymph-delete');
         try {
             this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=@guid;`, {
@@ -201,12 +279,13 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         if (!name) {
             throw new nymph_1.InvalidParametersError('Name not given for UID');
         }
-        this.checkReadOnlyMode();
+        await this.startTransaction('nymph-delete-uid');
         this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
             params: {
                 name,
             },
         });
+        await this.commit('nymph-delete-uid');
         return true;
     }
     async exportEntities(writeLine) {
@@ -274,6 +353,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         const cTable = `c${tableSuffix}`;
         const fTable = `f${tableSuffix}`;
         const ieTable = `ie${tableSuffix}`;
+        const sTable = `s${tableSuffix}`;
         const sort = options.sort ?? 'cdate';
         const queryParts = this.iterateSelectorsForQuery(formattedSelectors, (key, value, typeIsOr, typeIsNot) => {
             const clauseNot = key.startsWith('!');
@@ -1019,18 +1099,31 @@ class SQLite3Driver extends nymph_1.NymphDriver {
             return curQuery;
         });
         let sortBy;
+        let sortByInner;
+        let sortJoin = '';
+        const order = options.reverse ? ' DESC' : '';
         switch (sort) {
             case 'mdate':
-                sortBy = '"mdate"';
+                sortBy = `${eTable}."mdate"${order}`;
+                sortByInner = `${ieTable}."mdate"${order}`;
                 break;
             case 'cdate':
+                sortBy = `${eTable}."cdate"${order}`;
+                sortByInner = `${ieTable}."cdate"${order}`;
+                break;
             default:
-                sortBy = '"cdate"';
+                const name = `param${++count.i}`;
+                sortJoin = `LEFT JOIN (
+            SELECT "guid", "string", "number"
+            FROM ${SQLite3Driver.escape(this.prefix + 'comparisons_' + etype)}
+            WHERE "name"=@${name}
+            ORDER BY "number"${order}, "string"${order}
+          ) ${sTable} USING ("guid")`;
+                sortBy = `${sTable}."number"${order}, ${sTable}."string"${order}`;
+                sortByInner = sortBy;
+                params[name] = sort;
                 break;
         }
-        if (options.reverse) {
-            sortBy += ' DESC';
-        }
         let query;
         if (queryParts.length) {
             if (subquery) {
@@ -1063,8 +1156,9 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 else if (options.return === 'guid') {
                     query = `SELECT "guid"
             FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
+            ${sortJoin}
             WHERE (${whereClause})
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ORDER BY ${sortByInner}, "guid"${limit}${offset}`;
                 }
                 else {
                     query = `SELECT
@@ -1079,13 +1173,15 @@ class SQLite3Driver extends nymph_1.NymphDriver {
             FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${eTable}
             LEFT JOIN ${SQLite3Driver.escape(this.prefix + 'data_' + etype)} ${dTable} USING ("guid")
             INNER JOIN ${SQLite3Driver.escape(this.prefix + 'comparisons_' + etype)} ${cTable} USING ("guid", "name")
+            ${sortJoin}
             INNER JOIN (
               SELECT "guid"
               FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
+              ${sortJoin}
               WHERE (${whereClause})
-              ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+              ORDER BY ${sortByInner}${limit}${offset}
             ) ${fTable} USING ("guid")
-            ORDER BY ${eTable}.${sortBy}`;
+            ORDER BY ${sortBy}, ${eTable}."guid"`;
                 }
             }
         }
@@ -1117,7 +1213,8 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 else if (options.return === 'guid') {
                     query = `SELECT "guid"
             FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoin}
+            ORDER BY ${sortByInner}, "guid"${limit}${offset}`;
                 }
                 else {
                     if (limit || offset) {
@@ -1133,12 +1230,14 @@ class SQLite3Driver extends nymph_1.NymphDriver {
               FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${eTable}
               LEFT JOIN ${SQLite3Driver.escape(this.prefix + 'data_' + etype)} ${dTable} USING ("guid")
               INNER JOIN ${SQLite3Driver.escape(this.prefix + 'comparisons_' + etype)} c USING ("guid", "name")
+              ${sortJoin}
               INNER JOIN (
                 SELECT "guid"
                 FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${ieTable}
-                ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+                ${sortJoin}
+                ORDER BY ${sortByInner}${limit}${offset}
               ) ${fTable} USING ("guid")
-              ORDER BY ${eTable}.${sortBy}`;
+              ORDER BY ${sortBy}, ${eTable}."guid"`;
                     }
                     else {
                         query = `SELECT
@@ -1153,7 +1252,8 @@ class SQLite3Driver extends nymph_1.NymphDriver {
               FROM ${SQLite3Driver.escape(this.prefix + 'entities_' + etype)} ${eTable}
               LEFT JOIN ${SQLite3Driver.escape(this.prefix + 'data_' + etype)} ${dTable} USING ("guid")
               INNER JOIN ${SQLite3Driver.escape(this.prefix + 'comparisons_' + etype)} ${cTable} USING ("guid", "name")
-              ORDER BY ${eTable}.${sortBy}`;
+              ${sortJoin}
+              ORDER BY ${sortBy}, ${eTable}."guid"`;
                     }
                 }
             }
@@ -1211,7 +1311,6 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         return result?.cur_uid ?? null;
     }
     async import(filename) {
-        this.checkReadOnlyMode();
         try {
             return this.importFromFile(filename, async (guid, tags, sdata, etype) => {
                 this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=@guid;`, {
@@ -1317,7 +1416,6 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         if (name == null) {
             throw new nymph_1.InvalidParametersError('Name not given for UID.');
         }
-        this.checkReadOnlyMode();
         await this.startTransaction('nymph-newuid');
         try {
             let curUid = this.queryGet(`SELECT "cur_uid" FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
@@ -1355,28 +1453,35 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         if (oldName == null || newName == null) {
             throw new nymph_1.InvalidParametersError('Name not given for UID.');
         }
-        this.checkReadOnlyMode();
+        await this.startTransaction('nymph-rename-uid');
         this.queryRun(`UPDATE ${SQLite3Driver.escape(`${this.prefix}uids`)} SET "name"=@newName WHERE "name"=@oldName;`, {
             params: {
                 newName,
                 oldName,
             },
         });
+        await this.commit('nymph-rename-uid');
         return true;
     }
     async rollback(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
             throw new nymph_1.InvalidParametersError('Transaction rollback attempted without a name.');
         }
-        if (this.transactionsStarted === 0) {
+        if (this.store.transactionsStarted === 0) {
             return true;
         }
         this.queryRun(`ROLLBACK TO SAVEPOINT ${SQLite3Driver.escape(name)};`);
-        this.transactionsStarted--;
+        this.store.transactionsStarted--;
+        if (this.store.transactionsStarted === 0 &&
+            this.store.linkWrite &&
+            !this.config.explicitWrite) {
+            this.store.linkWrite.exec('PRAGMA optimize;');
+            this.store.linkWrite.close();
+            this.store.linkWrite = undefined;
+        }
         return true;
     }
     async saveEntity(entity) {
-        this.checkReadOnlyMode();
         const insertData = (guid, data, sdata, etype) => {
             const runInsertQuery = (name, value, svalue) => {
                 if (value === undefined) {
@@ -1426,6 +1531,10 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         };
         try {
             return this.saveEntityRowLike(entity, async (_entity, guid, tags, data, sdata, cdate, etype) => {
+                if (Object.keys(data).length === 0 &&
+                    Object.keys(sdata).length === 0) {
+                    return false;
+                }
                 this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (@guid, @tags, @cdate, @cdate);`, {
                     etypes: [etype],
                     params: {
@@ -1437,6 +1546,10 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 insertData(guid, data, sdata, etype);
                 return true;
             }, async (entity, guid, tags, data, sdata, mdate, etype) => {
+                if (Object.keys(data).length === 0 &&
+                    Object.keys(sdata).length === 0) {
+                    return false;
+                }
                 const info = this.queryRun(`UPDATE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate WHERE "guid"=@guid AND "mdate" <= @emdate;`, {
                     etypes: [etype],
                     params: {
@@ -1491,7 +1604,7 @@ class SQLite3Driver extends nymph_1.NymphDriver {
         if (name == null) {
             throw new nymph_1.InvalidParametersError('Name not given for UID.');
         }
-        this.checkReadOnlyMode();
+        await this.startTransaction('nymph-set-uid');
         this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uids`)} WHERE "name"=@name;`, {
             params: {
                 name,
@@ -1503,14 +1616,18 @@ class SQLite3Driver extends nymph_1.NymphDriver {
                 curUid,
             },
         });
+        await this.commit('nymph-set-uid');
         return true;
     }
     async startTransaction(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
             throw new nymph_1.InvalidParametersError('Transaction start attempted without a name.');
         }
+        if (!this.config.explicitWrite && !this.store.linkWrite) {
+            this._connect(true);
+        }
         this.queryRun(`SAVEPOINT ${SQLite3Driver.escape(name)};`);
-        this.transactionsStarted++;
+        this.store.transactionsStarted++;
         return this.nymph;
     }
 }