taon-typeorm 18.0.18 → 18.0.20

package/lib/typeorm/driver/aurora-postgres/AuroraPostgresQueryRunner.js

@@ -1,30 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuroraPostgresQueryRunner = void 0;
-var tslib_1 = require("tslib");
-var QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
-var TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
-var PostgresQueryRunner_1 = require("../postgres/PostgresQueryRunner");
-var QueryResult_1 = require("../../query-runner/QueryResult");
-var PostgresQueryRunnerWrapper = /** @class */ (function (_super) {
-    tslib_1.__extends(PostgresQueryRunnerWrapper, _super);
-    function PostgresQueryRunnerWrapper(driver, mode) {
-        return _super.call(this, driver, mode) || this;
+const QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
+const TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
+const PostgresQueryRunner_1 = require("../postgres/PostgresQueryRunner");
+const QueryResult_1 = require("../../query-runner/QueryResult");
+class PostgresQueryRunnerWrapper extends PostgresQueryRunner_1.PostgresQueryRunner {
+    constructor(driver, mode) {
+        super(driver, mode);
     }
-    return PostgresQueryRunnerWrapper;
-}(PostgresQueryRunner_1.PostgresQueryRunner));
+}
 /**
  * Runs queries on a single postgres database connection.
  */
-var AuroraPostgresQueryRunner = /** @class */ (function (_super) {
-    tslib_1.__extends(AuroraPostgresQueryRunner, _super);
+class AuroraPostgresQueryRunner extends PostgresQueryRunnerWrapper {
+    client;
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function AuroraPostgresQueryRunner(driver, client, mode) {
-        var _this = _super.call(this, driver, mode) || this;
-        _this.client = client;
-        return _this;
+    constructor(driver, client, mode) {
+        super(driver, mode);
+        this.client = client;
     }
     // -------------------------------------------------------------------------
     // Public Methods
@@ -33,8 +29,7 @@ var AuroraPostgresQueryRunner = /** @class */ (function (_super) {
      * Creates/uses database connection from the connection pool to perform further operations.
      * Returns obtained database connection.
      */
-    AuroraPostgresQueryRunner.prototype.connect = function () {
-        var _this = this;
+    connect() {
         if (this.databaseConnection)
             return Promise.resolve(this.databaseConnection);
         if (this.databaseConnectionPromise)
@@ -42,169 +37,103 @@ var AuroraPostgresQueryRunner = /** @class */ (function (_super) {
         if (this.mode === "slave" && this.driver.isReplicated) {
             this.databaseConnectionPromise = this.driver
                 .obtainSlaveConnection()
-                .then(function (_a) {
-                var _b = tslib_1.__read(_a, 2), connection = _b[0], release = _b[1];
-                _this.driver.connectedQueryRunners.push(_this);
-                _this.databaseConnection = connection;
-                _this.releaseCallback = release;
-                return _this.databaseConnection;
+                .then(([connection, release]) => {
+                this.driver.connectedQueryRunners.push(this);
+                this.databaseConnection = connection;
+                this.releaseCallback = release;
+                return this.databaseConnection;
             });
         }
         else {
             // master
             this.databaseConnectionPromise = this.driver
                 .obtainMasterConnection()
-                .then(function (_a) {
-                var _b = tslib_1.__read(_a, 2), connection = _b[0], release = _b[1];
-                _this.driver.connectedQueryRunners.push(_this);
-                _this.databaseConnection = connection;
-                _this.releaseCallback = release;
-                return _this.databaseConnection;
+                .then(([connection, release]) => {
+                this.driver.connectedQueryRunners.push(this);
+                this.databaseConnection = connection;
+                this.releaseCallback = release;
+                return this.databaseConnection;
             });
         }
         return this.databaseConnectionPromise;
-    };
+    }
     /**
      * Starts transaction on the current connection.
      */
-    AuroraPostgresQueryRunner.prototype.startTransaction = function (isolationLevel) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var err_1;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.isTransactionActive = true;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.broadcaster.broadcast("BeforeTransactionStart")];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        err_1 = _a.sent();
-                        this.isTransactionActive = false;
-                        throw err_1;
-                    case 4:
-                        if (!(this.transactionDepth === 0)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.client.startTransaction()];
-                    case 5:
-                        _a.sent();
-                        return [3 /*break*/, 8];
-                    case 6: return [4 /*yield*/, this.query("SAVEPOINT typeorm_".concat(this.transactionDepth))];
-                    case 7:
-                        _a.sent();
-                        _a.label = 8;
-                    case 8:
-                        this.transactionDepth += 1;
-                        return [4 /*yield*/, this.broadcaster.broadcast("AfterTransactionStart")];
-                    case 9:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async startTransaction(isolationLevel) {
+        this.isTransactionActive = true;
+        try {
+            await this.broadcaster.broadcast("BeforeTransactionStart");
+        }
+        catch (err) {
+            this.isTransactionActive = false;
+            throw err;
+        }
+        if (this.transactionDepth === 0) {
+            await this.client.startTransaction();
+        }
+        else {
+            await this.query(`SAVEPOINT typeorm_${this.transactionDepth}`);
+        }
+        this.transactionDepth += 1;
+        await this.broadcaster.broadcast("AfterTransactionStart");
+    }
     /**
      * Commits transaction.
      * Error will be thrown if transaction was not started.
      */
-    AuroraPostgresQueryRunner.prototype.commitTransaction = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.isTransactionActive)
-                            throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                        return [4 /*yield*/, this.broadcaster.broadcast("BeforeTransactionCommit")];
-                    case 1:
-                        _a.sent();
-                        if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.client.commitTransaction()];
-                    case 4:
-                        _a.sent();
-                        this.isTransactionActive = false;
-                        _a.label = 5;
-                    case 5:
-                        this.transactionDepth -= 1;
-                        return [4 /*yield*/, this.broadcaster.broadcast("AfterTransactionCommit")];
-                    case 6:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async commitTransaction() {
+        if (!this.isTransactionActive)
+            throw new TransactionNotStartedError_1.TransactionNotStartedError();
+        await this.broadcaster.broadcast("BeforeTransactionCommit");
+        if (this.transactionDepth > 1) {
+            await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
+        }
+        else {
+            await this.client.commitTransaction();
+            this.isTransactionActive = false;
+        }
+        this.transactionDepth -= 1;
+        await this.broadcaster.broadcast("AfterTransactionCommit");
+    }
     /**
      * Rollbacks transaction.
      * Error will be thrown if transaction was not started.
      */
-    AuroraPostgresQueryRunner.prototype.rollbackTransaction = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.isTransactionActive)
-                            throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                        return [4 /*yield*/, this.broadcaster.broadcast("BeforeTransactionRollback")];
-                    case 1:
-                        _a.sent();
-                        if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.client.rollbackTransaction()];
-                    case 4:
-                        _a.sent();
-                        this.isTransactionActive = false;
-                        _a.label = 5;
-                    case 5:
-                        this.transactionDepth -= 1;
-                        return [4 /*yield*/, this.broadcaster.broadcast("AfterTransactionRollback")];
-                    case 6:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async rollbackTransaction() {
+        if (!this.isTransactionActive)
+            throw new TransactionNotStartedError_1.TransactionNotStartedError();
+        await this.broadcaster.broadcast("BeforeTransactionRollback");
+        if (this.transactionDepth > 1) {
+            await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
+        }
+        else {
+            await this.client.rollbackTransaction();
+            this.isTransactionActive = false;
+        }
+        this.transactionDepth -= 1;
+        await this.broadcaster.broadcast("AfterTransactionRollback");
+    }
     /**
      * Executes a given SQL query.
      */
-    AuroraPostgresQueryRunner.prototype.query = function (query_1, parameters_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function (query, parameters, useStructuredResult) {
-            var raw, result;
-            if (useStructuredResult === void 0) { useStructuredResult = false; }
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (this.isReleased)
-                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-                        return [4 /*yield*/, this.client.query(query, parameters)];
-                    case 1:
-                        raw = _a.sent();
-                        result = new QueryResult_1.QueryResult();
-                        result.raw = raw;
-                        if ((raw === null || raw === void 0 ? void 0 : raw.hasOwnProperty("records")) && Array.isArray(raw.records)) {
-                            result.records = raw.records;
-                        }
-                        if (raw === null || raw === void 0 ? void 0 : raw.hasOwnProperty("numberOfRecordsUpdated")) {
-                            result.affected = raw.numberOfRecordsUpdated;
-                        }
-                        if (!useStructuredResult) {
-                            return [2 /*return*/, result.raw];
-                        }
-                        return [2 /*return*/, result];
-                }
-            });
-        });
-    };
-    return AuroraPostgresQueryRunner;
-}(PostgresQueryRunnerWrapper));
+    async query(query, parameters, useStructuredResult = false) {
+        if (this.isReleased)
+            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+        const raw = await this.client.query(query, parameters);
+        const result = new QueryResult_1.QueryResult();
+        result.raw = raw;
+        if (raw?.hasOwnProperty("records") && Array.isArray(raw.records)) {
+            result.records = raw.records;
+        }
+        if (raw?.hasOwnProperty("numberOfRecordsUpdated")) {
+            result.affected = raw.numberOfRecordsUpdated;
+        }
+        if (!useStructuredResult) {
+            return result.raw;
+        }
+        return result;
+    }
+}
 exports.AuroraPostgresQueryRunner = AuroraPostgresQueryRunner;
 //# sourceMappingURL=AuroraPostgresQueryRunner.js.map

package/lib/typeorm/driver/aurora-postgres/AuroraPostgresQueryRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuroraPostgresQueryRunner.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"AuroraPostgresQueryRunner.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/driver/aurora-postgres/AuroraPostgresQueryRunner.ts"],"names":[],"mappings":"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"}

package/lib/typeorm/driver/better-sqlite3/BetterSqlite3ConnectionOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"BetterSqlite3ConnectionOptions.js","sourceRoot":"","sources":[""],"names":[],"mappings":""}
+{"version":3,"file":"BetterSqlite3ConnectionOptions.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/driver/better-sqlite3/BetterSqlite3ConnectionOptions.ts"],"names":[],"mappings":""}

package/lib/typeorm/driver/better-sqlite3/BetterSqlite3Driver.js

@@ -1,35 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BetterSqlite3Driver = void 0;
-var tslib_1 = require("tslib");
 //#region @backend
-var mkdirp = require("mkdirp");
-var path = require("path");
-var error_1 = require("../../error");
-var error_2 = require("../../error");
-var PlatformTools_1 = require("../../platform/PlatformTools");
-var AbstractSqliteDriver_1 = require("../sqlite-abstract/AbstractSqliteDriver");
-var BetterSqlite3QueryRunner_1 = require("./BetterSqlite3QueryRunner");
-var PathUtils_1 = require("../../util/PathUtils");
+const mkdirp = require("mkdirp");
+const path = require("path");
+const error_1 = require("../../error");
+const error_2 = require("../../error");
+const PlatformTools_1 = require("../../platform/PlatformTools");
+const AbstractSqliteDriver_1 = require("../sqlite-abstract/AbstractSqliteDriver");
+const BetterSqlite3QueryRunner_1 = require("./BetterSqlite3QueryRunner");
+const PathUtils_1 = require("../../util/PathUtils");
 /**
  * Organizes communication with sqlite DBMS.
  */
-var BetterSqlite3Driver = /** @class */ (function (_super) {
-    tslib_1.__extends(BetterSqlite3Driver, _super);
+class BetterSqlite3Driver extends AbstractSqliteDriver_1.AbstractSqliteDriver {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function BetterSqlite3Driver(connection) {
-        var _this = _super.call(this, connection) || this;
-        _this.connection = connection;
-        _this.options = connection.options;
-        _this.database = _this.options.database;
+    constructor(connection) {
+        super(connection);
+        this.connection = connection;
+        this.options = connection.options;
+        this.database = this.options.database;
         // validate options to make sure everything is set
-        if (!_this.options.database)
+        if (!this.options.database)
             throw new error_2.DriverOptionNotSetError("database");
         // load sqlite package
-        _this.loadDependencies();
-        return _this;
+        this.loadDependencies();
     }
     // -------------------------------------------------------------------------
     // Public Methods
@@ -37,50 +34,41 @@ var BetterSqlite3Driver = /** @class */ (function (_super) {
     /**
      * Closes connection with database.
      */
-    BetterSqlite3Driver.prototype.disconnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                this.queryRunner = undefined;
-                this.databaseConnection.close();
-                return [2 /*return*/];
-            });
-        });
-    };
+    async disconnect() {
+        this.queryRunner = undefined;
+        this.databaseConnection.close();
+    }
     /**
      * Creates a query runner used to execute database queries.
      */
-    BetterSqlite3Driver.prototype.createQueryRunner = function (mode) {
+    createQueryRunner(mode) {
         if (!this.queryRunner)
             this.queryRunner = new BetterSqlite3QueryRunner_1.BetterSqlite3QueryRunner(this);
         return this.queryRunner;
-    };
-    BetterSqlite3Driver.prototype.normalizeType = function (column) {
+    }
+    normalizeType(column) {
         if (column.type === Buffer) {
             return "blob";
         }
-        return _super.prototype.normalizeType.call(this, column);
-    };
-    BetterSqlite3Driver.prototype.afterConnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.attachDatabases()];
-            });
-        });
-    };
+        return super.normalizeType(column);
+    }
+    async afterConnect() {
+        return this.attachDatabases();
+    }
     /**
      * For SQLite, the database may be added in the decorator metadata. It will be a filepath to a database file.
      */
-    BetterSqlite3Driver.prototype.buildTableName = function (tableName, _schema, database) {
+    buildTableName(tableName, _schema, database) {
         if (!database)
             return tableName;
         if (this.getAttachedDatabaseHandleByRelativePath(database))
-            return "".concat(this.getAttachedDatabaseHandleByRelativePath(database), ".").concat(tableName);
+            return `${this.getAttachedDatabaseHandleByRelativePath(database)}.${tableName}`;
         if (database === this.options.database)
             return tableName;
         // we use the decorated name as supplied when deriving attach handle (ideally without non-portable absolute path)
-        var identifierHash = (0, PathUtils_1.filepathToName)(database);
+        const identifierHash = (0, PathUtils_1.filepathToName)(database);
         // decorated name will be assumed relative to main database file when non absolute. Paths supplied as absolute won't be portable
-        var absFilepath = (0, PathUtils_1.isAbsolute)(database)
+        const absFilepath = (0, PathUtils_1.isAbsolute)(database)
             ? database
             : path.join(this.getMainDatabasePath(), database);
         this.attachedDatabases[database] = {
@@ -88,142 +76,80 @@ var BetterSqlite3Driver = /** @class */ (function (_super) {
             attachFilepathRelative: database,
             attachHandle: identifierHash,
         };
-        return "".concat(identifierHash, ".").concat(tableName);
-    };
+        return `${identifierHash}.${tableName}`;
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * Creates connection with the database.
      */
-    BetterSqlite3Driver.prototype.createDatabaseConnection = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, database, _b, readonly, _c, fileMustExist, _d, timeout, _e, verbose, _f, nativeBinding, prepareDatabase, databaseConnection;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0:
-                        if (!(this.options.database !== ":memory:")) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.createDatabaseDirectory(path.dirname(this.options.database))];
-                    case 1:
-                        _g.sent();
-                        _g.label = 2;
-                    case 2:
-                        _a = this.options, database = _a.database, _b = _a.readonly, readonly = _b === void 0 ? false : _b, _c = _a.fileMustExist, fileMustExist = _c === void 0 ? false : _c, _d = _a.timeout, timeout = _d === void 0 ? 5000 : _d, _e = _a.verbose, verbose = _e === void 0 ? null : _e, _f = _a.nativeBinding, nativeBinding = _f === void 0 ? null : _f, prepareDatabase = _a.prepareDatabase;
-                        databaseConnection = this.sqlite(database, {
-                            readonly: readonly,
-                            fileMustExist: fileMustExist,
-                            timeout: timeout,
-                            verbose: verbose,
-                            nativeBinding: nativeBinding,
-                        });
-                        // in the options, if encryption key for SQLCipher is setted.
-                        // Must invoke key pragma before trying to do any other interaction with the database.
-                        if (this.options.key) {
-                            databaseConnection.exec("PRAGMA key = ".concat(JSON.stringify(this.options.key)));
-                        }
-                        // function to run before a database is used in typeorm.
-                        if (typeof prepareDatabase === "function") {
-                            prepareDatabase(databaseConnection);
-                        }
-                        // we need to enable foreign keys in sqlite to make sure all foreign key related features
-                        // working properly. this also makes onDelete to work with sqlite.
-                        databaseConnection.exec("PRAGMA foreign_keys = ON");
-                        // turn on WAL mode to enhance performance
-                        databaseConnection.exec("PRAGMA journal_mode = WAL");
-                        return [2 /*return*/, databaseConnection];
-                }
-            });
+    async createDatabaseConnection() {
+        // not to create database directory if is in memory
+        if (this.options.database !== ":memory:")
+            await this.createDatabaseDirectory(path.dirname(this.options.database));
+        const { database, readonly = false, fileMustExist = false, timeout = 5000, verbose = null, nativeBinding = null, prepareDatabase, } = this.options;
+        const databaseConnection = this.sqlite(database, {
+            readonly,
+            fileMustExist,
+            timeout,
+            verbose,
+            nativeBinding,
         });
-    };
+        // in the options, if encryption key for SQLCipher is setted.
+        // Must invoke key pragma before trying to do any other interaction with the database.
+        if (this.options.key) {
+            databaseConnection.exec(`PRAGMA key = ${JSON.stringify(this.options.key)}`);
+        }
+        // function to run before a database is used in typeorm.
+        if (typeof prepareDatabase === "function") {
+            prepareDatabase(databaseConnection);
+        }
+        // we need to enable foreign keys in sqlite to make sure all foreign key related features
+        // working properly. this also makes onDelete to work with sqlite.
+        databaseConnection.exec(`PRAGMA foreign_keys = ON`);
+        // turn on WAL mode to enhance performance
+        databaseConnection.exec(`PRAGMA journal_mode = WAL`);
+        return databaseConnection;
+    }
     /**
      * If driver dependency is not given explicitly, then try to load it via "require".
      */
-    BetterSqlite3Driver.prototype.loadDependencies = function () {
+    loadDependencies() {
         try {
-            var sqlite = this.options.driver || PlatformTools_1.PlatformTools.load("better-sqlite3");
+            const sqlite = this.options.driver || PlatformTools_1.PlatformTools.load("better-sqlite3");
             this.sqlite = sqlite;
         }
         catch (e) {
             throw new error_1.DriverPackageNotInstalledError("SQLite", "better-sqlite3");
         }
-    };
+    }
     /**
      * Auto creates database directory if it does not exist.
      */
-    BetterSqlite3Driver.prototype.createDatabaseDirectory = function (dbPath) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, mkdirp(dbPath)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async createDatabaseDirectory(dbPath) {
+        await mkdirp(dbPath);
+    }
     /**
      * Performs the attaching of the database files. The attachedDatabase should have been populated during calls to #buildTableName
      * during EntityMetadata production (see EntityMetadata#buildTablePath)
      *
      * https://sqlite.org/lang_attach.html
      */
-    BetterSqlite3Driver.prototype.attachDatabases = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c, attachHandle, attachFilepathAbsolute, e_1_1;
-            var _d, e_1, _e, _f;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0:
-                        _g.trys.push([0, 7, 8, 13]);
-                        _a = true, _b = tslib_1.__asyncValues(Object.values(this.attachedDatabases));
-                        _g.label = 1;
-                    case 1: return [4 /*yield*/, _b.next()];
-                    case 2:
-                        if (!(_c = _g.sent(), _d = _c.done, !_d)) return [3 /*break*/, 6];
-                        _f = _c.value;
-                        _a = false;
-                        attachHandle = _f.attachHandle, attachFilepathAbsolute = _f.attachFilepathAbsolute;
-                        return [4 /*yield*/, this.createDatabaseDirectory(path.dirname(attachFilepathAbsolute))];
-                    case 3:
-                        _g.sent();
-                        return [4 /*yield*/, this.connection.query("ATTACH \"".concat(attachFilepathAbsolute, "\" AS \"").concat(attachHandle, "\""))];
-                    case 4:
-                        _g.sent();
-                        _g.label = 5;
-                    case 5:
-                        _a = true;
-                        return [3 /*break*/, 1];
-                    case 6: return [3 /*break*/, 13];
-                    case 7:
-                        e_1_1 = _g.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 13];
-                    case 8:
-                        _g.trys.push([8, , 11, 12]);
-                        if (!(!_a && !_d && (_e = _b.return))) return [3 /*break*/, 10];
-                        return [4 /*yield*/, _e.call(_b)];
-                    case 9:
-                        _g.sent();
-                        _g.label = 10;
-                    case 10: return [3 /*break*/, 12];
-                    case 11:
-                        if (e_1) throw e_1.error;
-                        return [7 /*endfinally*/];
-                    case 12: return [7 /*endfinally*/];
-                    case 13: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    BetterSqlite3Driver.prototype.getMainDatabasePath = function () {
-        var optionsDb = this.options.database;
+    async attachDatabases() {
+        // @todo - possibly check number of databases (but unqueriable at runtime sadly) - https://www.sqlite.org/limits.html#max_attached
+        for await (const { attachHandle, attachFilepathAbsolute, } of Object.values(this.attachedDatabases)) {
+            await this.createDatabaseDirectory(path.dirname(attachFilepathAbsolute));
+            await this.connection.query(`ATTACH "${attachFilepathAbsolute}" AS "${attachHandle}"`);
+        }
+    }
+    getMainDatabasePath() {
+        const optionsDb = this.options.database;
         return path.dirname((0, PathUtils_1.isAbsolute)(optionsDb)
             ? optionsDb
             : path.join(this.options.baseDirectory, optionsDb));
-    };
-    return BetterSqlite3Driver;
-}(AbstractSqliteDriver_1.AbstractSqliteDriver));
+    }
+}
 exports.BetterSqlite3Driver = BetterSqlite3Driver;
 //#endregion
 //# sourceMappingURL=BetterSqlite3Driver.js.map