@nymphjs/driver-mysql 1.0.0-beta.4 → 1.0.0-beta.41

package/CHANGELOG.md

@@ -3,6 +3,170 @@
 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.41](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.40...v1.0.0-beta.41) (2023-07-12)
+
+### Features
+
+- remove synchronous database queries ([b579fb2](https://github.com/sciactive/nymphjs/commit/b579fb2eacd96cdd1b386a62c5c00cdbb2438f6e))
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [1.0.0-beta.29](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.28...v1.0.0-beta.29) (2023-05-08)
+
+### Bug Fixes
+
+- use 4 byte utf8 encoding in mysql ([c335b6e](https://github.com/sciactive/nymphjs/commit/c335b6e8416f935c9116e7f54de753d4b2255a73))
+
+# [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-mysql
+
+# [1.0.0-beta.27](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.26...v1.0.0-beta.27) (2023-05-04)
+
+### Bug Fixes
+
+- properly escape mysql ids with dots ([64bfaa5](https://github.com/sciactive/nymphjs/commit/64bfaa5d606f97a753ca7e6c5d2d86f7c0f7729a))
+
+# [1.0.0-beta.26](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.25...v1.0.0-beta.26) (2023-05-04)
+
+### Features
+
+- update packages and migrate to mysql2 ([72ad611](https://github.com/sciactive/nymphjs/commit/72ad611bd2bf7bf85c3ba8a3486503d9b50c49d6))
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [1.0.0-beta.20](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.19...v1.0.0-beta.20) (2023-04-30)
+
+**Note:** Version bump only for package @nymphjs/driver-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [1.0.0-beta.17](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.16...v1.0.0-beta.17) (2023-04-24)
+
+### Features
+
+- use a long lived worker thread for synchronous mysql and postgres queries ([7e2bf84](https://github.com/sciactive/nymphjs/commit/7e2bf84a2d584d6906c31f44147025b793a05026))
+
+# [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-mysql
+
+# [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)
+
+**Note:** Version bump only for package @nymphjs/driver-mysql
+
+# [1.0.0-beta.13](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.12...v1.0.0-beta.13) (2023-03-16)
+
+**Note:** Version bump only for package @nymphjs/driver-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [1.0.0-beta.10](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.9...v1.0.0-beta.10) (2023-01-19)
+
+**Note:** Version bump only for package @nymphjs/driver-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
+# [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-mysql
+
 # [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-mysql

package/dist/MySQLDriver.d.ts

@@ -1,8 +1,8 @@
-import { default as MySQLType } from '@types/mysql';
+import { Pool, PoolConnection } from 'mysql2';
 import { NymphDriver, EntityConstructor, EntityInterface, FormattedSelector, Options, Selector } from '@nymphjs/nymph';
 import { MySQLDriverConfig } from './conf';
 type MySQLDriverTransaction = {
-    connection: MySQLType.PoolConnection | null;
+    connection: PoolConnection | null;
     count: number;
 };
 export default class MySQLDriver extends NymphDriver {
@@ -10,11 +10,12 @@ export default class MySQLDriver extends NymphDriver {
     private mysqlConfig;
     protected prefix: string;
     protected connected: boolean;
-    protected link: MySQLType.Pool;
+    protected link: Pool;
     protected transaction: MySQLDriverTransaction | null;
     static escape(input: string): string;
     static escapeValue(input: string): string;
-    constructor(config: Partial<MySQLDriverConfig>, link?: MySQLType.Pool, transaction?: MySQLDriverTransaction);
+    constructor(config: Partial<MySQLDriverConfig>, link?: Pool, transaction?: MySQLDriverTransaction);
+    clone(): MySQLDriver;
     private getConnection;
     connect(): Promise<true>;
     disconnect(): Promise<false>;
@@ -23,12 +24,9 @@ export default class MySQLDriver extends NymphDriver {
     private createTables;
     private translateQuery;
     private query;
-    private querySync;
     private queryIter;
-    private queryIterSync;
     private queryGet;
     private queryRun;
-    private queryRunSync;
     commit(name: string): Promise<boolean>;
     deleteEntityByID(guid: string, className?: EntityConstructor | string | null): Promise<boolean>;
     deleteUID(name: string): Promise<boolean>;
@@ -37,9 +35,6 @@ export default class MySQLDriver extends NymphDriver {
     protected performQuery(options: Options, formattedSelectors: FormattedSelector[], etype: string): {
         result: any;
     };
-    protected performQuerySync(options: Options, formattedSelectors: FormattedSelector[], etype: string): {
-        result: any;
-    };
     getEntities<T extends EntityConstructor = EntityConstructor>(options: Options<T> & {
         return: 'count';
     }, ...selectors: Selector[]): Promise<number>;
@@ -47,13 +42,6 @@ export default class MySQLDriver extends NymphDriver {
         return: 'guid';
     }, ...selectors: Selector[]): Promise<string[]>;
     getEntities<T extends EntityConstructor = EntityConstructor>(options?: Options<T>, ...selectors: Selector[]): Promise<ReturnType<T['factorySync']>[]>;
-    protected getEntitiesSync<T extends EntityConstructor = EntityConstructor>(options: Options<T> & {
-        return: 'count';
-    }, ...selectors: Selector[]): number;
-    protected getEntitiesSync<T extends EntityConstructor = EntityConstructor>(options: Options<T> & {
-        return: 'guid';
-    }, ...selectors: Selector[]): string[];
-    protected getEntitiesSync<T extends EntityConstructor = EntityConstructor>(options?: Options<T>, ...selectors: Selector[]): ReturnType<T['factorySync']>[];
     getUID(name: string): Promise<number | null>;
     import(filename: string): Promise<boolean>;
     newUID(name: string): Promise<number | null>;

package/dist/MySQLDriver.js

@@ -3,18 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = __importDefault(require("child_process"));
-const mysql_1 = __importDefault(require("@vlasky/mysql"));
+const mysql2_1 = __importDefault(require("mysql2"));
+const sqlstring_1 = __importDefault(require("sqlstring"));
 const nymph_1 = require("@nymphjs/nymph");
 const guid_1 = require("@nymphjs/guid");
 const conf_1 = require("./conf");
-const mysql = mysql_1.default;
 class MySQLDriver extends nymph_1.NymphDriver {
     static escape(input) {
-        return mysql.escapeId(input);
+        return sqlstring_1.default.escapeId(input, true);
     }
     static escapeValue(input) {
-        return mysql.escape(input);
+        return mysql2_1.default.escape(input);
     }
     constructor(config, link, transaction) {
         super();
@@ -41,6 +40,9 @@ class MySQLDriver extends nymph_1.NymphDriver {
             this.connect();
         }
     }
+    clone() {
+        return new MySQLDriver(this.config, this.link, this.transaction ?? undefined);
+    }
     getConnection() {
         if (this.transaction != null && this.transaction.connection != null) {
             return Promise.resolve(this.transaction.connection);
@@ -51,9 +53,6 @@ class MySQLDriver extends nymph_1.NymphDriver {
         try {
             if (this.connected) {
                 const connection = await new Promise((resolve, reject) => this.link.getConnection((err, con) => err ? reject(err) : resolve(con)));
-                await new Promise((resolve) => connection.ping(() => {
-                    resolve(0);
-                }));
                 connection.release();
             }
         }
@@ -62,7 +61,10 @@ class MySQLDriver extends nymph_1.NymphDriver {
         }
         if (!this.connected) {
             try {
-                this.link = mysql.createPool(this.mysqlConfig);
+                this.link = mysql2_1.default.createPool({
+                    ...this.mysqlConfig,
+                    charset: 'utf8mb4_bin',
+                });
                 this.connected = true;
             }
             catch (e) {
@@ -92,8 +94,8 @@ class MySQLDriver extends nymph_1.NymphDriver {
     isConnected() {
         return this.connected;
     }
-    createTables(etype = null) {
-        this.queryRunSync('SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";');
+    async createTables(etype = null) {
+        await this.queryRun('SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";');
         let foreignKeyDataTableGuid = '';
         let foreignKeyDataComparisonsTableGuid = '';
         let foreignKeyReferencesTableGuid = '';
@@ -103,7 +105,7 @@ class MySQLDriver extends nymph_1.NymphDriver {
             foreignKeyReferencesTableGuid = ` REFERENCES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)}(\`guid\`) ON DELETE CASCADE`;
         }
         if (etype != null) {
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (
+            await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (
           \`guid\` BINARY(12) NOT NULL,
           \`tags\` LONGTEXT,
           \`cdate\` DOUBLE PRECISION NOT NULL,
@@ -113,8 +115,8 @@ class MySQLDriver extends nymph_1.NymphDriver {
           INDEX \`id_mdate\` USING BTREE (\`mdate\`),
           FULLTEXT \`id_tags\` (\`tags\`)
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+            await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} (
           \`guid\` BINARY(12) NOT NULL${foreignKeyDataTableGuid},
           \`name\` TEXT NOT NULL,
           \`value\` LONGTEXT NOT NULL,
@@ -122,8 +124,8 @@ class MySQLDriver extends nymph_1.NymphDriver {
           INDEX \`id_name\` USING HASH (\`name\`(255)),
           INDEX \`id_name_value\` USING BTREE (\`name\`(255), \`value\`(512))
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} (
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+            await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} (
           \`guid\` BINARY(12) NOT NULL${foreignKeyDataComparisonsTableGuid},
           \`name\` TEXT NOT NULL,
           \`truthy\` BOOLEAN,
@@ -132,23 +134,23 @@ class MySQLDriver extends nymph_1.NymphDriver {
           PRIMARY KEY (\`guid\`, \`name\`(255)),
           INDEX \`id_name\` USING HASH (\`name\`(255))
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} (
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
+            await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} (
           \`guid\` BINARY(12) NOT NULL${foreignKeyReferencesTableGuid},
           \`name\` TEXT NOT NULL,
           \`reference\` BINARY(12) NOT NULL,
           PRIMARY KEY (\`guid\`, \`name\`(255), \`reference\`),
           INDEX \`id_name_reference\` USING BTREE (\`name\`(255), \`reference\`)
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
         }
         else {
-            this.queryRunSync(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}uids`)} (
+            await this.queryRun(`CREATE TABLE IF NOT EXISTS ${MySQLDriver.escape(`${this.prefix}uids`)} (
           \`name\` TEXT NOT NULL,
           \`cur_uid\` BIGINT(20) UNSIGNED NOT NULL,
           PRIMARY KEY (\`name\`(100))
         ) ENGINE ${this.config.engine}
-        CHARACTER SET utf8 COLLATE utf8_bin;`);
+        CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
         }
         return true;
     }
@@ -170,9 +172,9 @@ class MySQLDriver extends nymph_1.NymphDriver {
         }
         catch (e) {
             const errorCode = e?.errno;
-            if (errorCode === 1146 && this.createTables()) {
+            if (errorCode === 1146 && (await this.createTables())) {
                 for (let etype of etypes) {
-                    this.createTables(etype);
+                    await this.createTables(etype);
                 }
                 try {
                     return await runQuery();
@@ -197,39 +199,6 @@ class MySQLDriver extends nymph_1.NymphDriver {
             }
         }
     }
-    querySync(runQuery, query, etypes = []) {
-        try {
-            return runQuery();
-        }
-        catch (e) {
-            const errorCode = e?.errno;
-            if (errorCode === 1146 && this.createTables()) {
-                for (let etype of etypes) {
-                    this.createTables(etype);
-                }
-                try {
-                    return runQuery();
-                }
-                catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query);
-                }
-            }
-            else if (errorCode === 2006) {
-                if (!this.connect()) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e?.errno + ' - ' + e?.message, query);
-                }
-                try {
-                    return runQuery();
-                }
-                catch (e2) {
-                    throw new nymph_1.QueryFailedError('Query failed: ' + e2?.errno + ' - ' + e2?.message, query);
-                }
-            }
-            else {
-                throw e;
-            }
-        }
-    }
     queryIter(query, { etypes = [], params = {}, } = {}) {
         const { query: newQuery, params: newParams } = this.translateQuery(query, params);
         return this.query(async () => {
@@ -249,36 +218,6 @@ class MySQLDriver extends nymph_1.NymphDriver {
             return results;
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
-    queryIterSync(query, { etypes = [], params = {}, } = {}) {
-        const { query: newQuery, params: newParams } = this.translateQuery(query, params);
-        return this.querySync(() => {
-            const output = child_process_1.default.spawnSync(process.argv0, [__dirname + '/runMysqlSync.js'], {
-                input: JSON.stringify({
-                    mysqlConfig: this.mysqlConfig,
-                    query: newQuery,
-                    params: newParams,
-                }),
-                timeout: 30000,
-                maxBuffer: 100 * 1024 * 1024,
-                encoding: 'utf8',
-                windowsHide: true,
-            });
-            try {
-                const { results } = JSON.parse(output.stdout);
-                return results;
-            }
-            catch (e) {
-            }
-            if (output.status === 0) {
-                throw new Error('Unknown parse error.');
-            }
-            const err = JSON.parse(output.stderr);
-            const e = new Error(err.name);
-            for (const name in err) {
-                e[name] = err[name];
-            }
-        }, `${query} -- ${JSON.stringify(params)}`, etypes);
-    }
     queryGet(query, { etypes = [], params = {}, } = {}) {
         const { query: newQuery, params: newParams } = this.translateQuery(query, params);
         return this.query(async () => {
@@ -317,36 +256,6 @@ class MySQLDriver extends nymph_1.NymphDriver {
             return { changes: results.changedRows ?? 0 };
         }, `${query} -- ${JSON.stringify(params)}`, etypes);
     }
-    queryRunSync(query, { etypes = [], params = {}, } = {}) {
-        const { query: newQuery, params: newParams } = this.translateQuery(query, params);
-        return this.querySync(() => {
-            const output = child_process_1.default.spawnSync(process.argv0, [__dirname + '/runMysqlSync.js'], {
-                input: JSON.stringify({
-                    mysqlConfig: this.mysqlConfig,
-                    query: newQuery,
-                    params: newParams,
-                }),
-                timeout: 30000,
-                maxBuffer: 100 * 1024 * 1024,
-                encoding: 'utf8',
-                windowsHide: true,
-            });
-            try {
-                const { results } = JSON.parse(output.stdout);
-                return { changes: results.changedRows ?? 0 };
-            }
-            catch (e) {
-            }
-            if (output.status === 0) {
-                throw new Error('Unknown parse error.');
-            }
-            const err = JSON.parse(output.stderr);
-            const e = new Error(err.name);
-            for (const name in err) {
-                e[name] = err[name];
-            }
-        }, `${query} -- ${JSON.stringify(params)}`, etypes);
-    }
     async commit(name) {
         if (name == null || typeof name !== 'string' || name.length === 0) {
             throw new nymph_1.InvalidParametersError('Transaction commit attempted without a name.');
@@ -496,6 +405,7 @@ class MySQLDriver extends nymph_1.NymphDriver {
         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 clauseNot = key.startsWith('!');
@@ -1289,18 +1199,38 @@ class MySQLDriver 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 ${MySQLDriver.escape(this.prefix + 'comparisons_' + etype)}
+            WHERE \`name\`=@${name}
+            ORDER BY \`number\`${order}, \`string\`${order}
+          ) ${sTable} ON ${eTable}.\`guid\`=${sTable}.\`guid\``;
+                sortJoinInner = `LEFT JOIN (
+            SELECT \`guid\`, \`string\`, \`number\`
+            FROM ${MySQLDriver.escape(this.prefix + 'comparisons_' + 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) {
@@ -1336,8 +1266,9 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         : `${ieTable}.\`guid\``;
                     query = `SELECT ${guidColumn} AS \`guid\`
             FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
+            ${sortJoinInner}
             WHERE (${whereClause})
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ORDER BY ${sortByInner}, ${ieTable}.\`guid\`${limit}${offset}`;
                 }
                 else {
                     query = `SELECT
@@ -1352,13 +1283,15 @@ class MySQLDriver extends nymph_1.NymphDriver {
             FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
             LEFT JOIN ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}.\`guid\`=${dTable}.\`guid\`
             INNER JOIN ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}.\`guid\`=${cTable}.\`guid\` AND ${dTable}.\`name\`=${cTable}.\`name\`
+            ${sortJoin}
             INNER JOIN (
               SELECT ${ieTable}.\`guid\`
               FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
+              ${sortJoinInner}
               WHERE (${whereClause})
-              ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+              ORDER BY ${sortByInner}${limit}${offset}
             ) ${fTable} ON ${eTable}.\`guid\`=${fTable}.\`guid\`
-            ORDER BY ${eTable}.${sortBy}`;
+            ORDER BY ${sortBy}, ${eTable}.\`guid\``;
                 }
             }
         }
@@ -1393,7 +1326,8 @@ class MySQLDriver extends nymph_1.NymphDriver {
                         : `${ieTable}.\`guid\``;
                     query = `SELECT ${guidColumn} AS \`guid\`
             FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-            ORDER BY ${ieTable}.${sortBy}${limit}${offset}`;
+            ${sortJoinInner}
+            ORDER BY ${sortByInner}, ${ieTable}.\`guid\`${limit}${offset}`;
                 }
                 else {
                     if (limit || offset) {
@@ -1409,12 +1343,14 @@ class MySQLDriver extends nymph_1.NymphDriver {
               FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
               LEFT JOIN ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}.\`guid\`=${dTable}.\`guid\`
               INNER JOIN ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}.\`guid\`=${cTable}.\`guid\` AND ${dTable}.\`name\`=${cTable}.\`name\`
+              ${sortJoin}
               INNER JOIN (
                 SELECT ${ieTable}.\`guid\`
                 FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${ieTable}
-                ORDER BY ${ieTable}.${sortBy}${limit}${offset}
+                ${sortJoinInner}
+                ORDER BY ${sortByInner}${limit}${offset}
               ) ${fTable} ON ${eTable}.\`guid\`=${fTable}.\`guid\`
-              ORDER BY ${eTable}.${sortBy}`;
+              ORDER BY ${sortBy}, ${eTable}.\`guid\``;
                     }
                     else {
                         query = `SELECT
@@ -1429,7 +1365,8 @@ class MySQLDriver extends nymph_1.NymphDriver {
               FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ${eTable}
               LEFT JOIN ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} ${dTable} ON ${eTable}.\`guid\`=${dTable}.\`guid\`
               INNER JOIN ${MySQLDriver.escape(`${this.prefix}comparisons_${etype}`)} ${cTable} ON ${dTable}.\`guid\`=${cTable}.\`guid\` AND ${dTable}.\`name\`=${cTable}.\`name\`
-              ORDER BY ${eTable}.${sortBy}`;
+              ${sortJoin}
+              ORDER BY ${sortBy}, ${eTable}.\`guid\``;
                     }
                 }
             }
@@ -1450,13 +1387,6 @@ class MySQLDriver extends nymph_1.NymphDriver {
             result,
         };
     }
-    performQuerySync(options, formattedSelectors, etype) {
-        const { query, params, etypes } = this.makeEntityQuery(options, formattedSelectors, etype);
-        const result = (this.queryIterSync(query, { etypes, params }) || [])[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 next = result.next();
@@ -1480,28 +1410,6 @@ class MySQLDriver extends nymph_1.NymphDriver {
         }
         return value;
     }
-    getEntitiesSync(options = {}, ...selectors) {
-        const { result, process } = this.getEntitesRowLike(options, selectors, (options, formattedSelectors, etype) => this.performQuerySync(options, formattedSelectors, etype), () => {
-            const next = result.next();
-            return next.done ? null : next.value;
-        }, () => undefined, (row) => Number(row.count), (row) => row.guid, (row) => ({
-            tags: row.tags.length > 2 ? row.tags.slice(1, -1).split(',') : [],
-            cdate: isNaN(Number(row.cdate)) ? null : Number(row.cdate),
-            mdate: isNaN(Number(row.mdate)) ? null : Number(row.mdate),
-        }), (row) => ({
-            name: row.name,
-            svalue: row.value === 'N'
-                ? JSON.stringify(row.number)
-                : row.value === 'S'
-                    ? JSON.stringify(row.string)
-                    : row.value,
-        }));
-        const value = process();
-        if (value instanceof Error) {
-            throw value;
-        }
-        return value;
-    }
     async getUID(name) {
         if (name == null) {
             throw new nymph_1.InvalidParametersError('Name not given for UID.');
@@ -1731,6 +1639,10 @@ class MySQLDriver extends nymph_1.NymphDriver {
         };
         try {
             const result = await this.saveEntityRowLike(entity, async (_entity, guid, tags, data, sdata, cdate, etype) => {
+                if (Object.keys(data).length === 0 &&
+                    Object.keys(sdata).length === 0) {
+                    return false;
+                }
                 await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`) VALUES (UNHEX(@guid), @tags, @cdate, @cdate);`, {
                     etypes: [etype],
                     params: {
@@ -1742,6 +1654,10 @@ class MySQLDriver extends nymph_1.NymphDriver {
                 await 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;
+                }
                 if (this.config.rowLocking) {
                     const promises = [];
                     promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
@@ -1867,8 +1783,7 @@ class MySQLDriver extends nymph_1.NymphDriver {
             this.transaction = null;
         }
         const nymph = this.nymph.clone();
-        nymph.driver = new MySQLDriver(this.config, this.link, transaction);
-        nymph.driver.init(nymph);
+        nymph.driver.transaction = transaction;
         return nymph;
     }
 }