typeorm 0.2.38-dev.e9366b3 → 0.2.39-dev.1197f88

package/driver/postgres/PostgresConnectionOptions.d.ts

@@ -12,6 +12,16 @@ export interface PostgresConnectionOptions extends BaseConnectionOptions, Postgr
      * Schema name.
      */
     readonly schema?: string;
+    /**
+     * The driver object
+     * This defaults to `require("pg")`.
+     */
+    readonly driver?: any;
+    /**
+     * The driver object
+     * This defaults to `require("pg-native")`.
+     */
+    readonly nativeDriver?: any;
     /**
     * A boolean determining whether to pass time values in UTC or local time. (default: true).
     */

package/driver/postgres/PostgresConnectionOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/driver/postgres/PostgresConnectionOptions.ts"],"names":[],"mappings":"","file":"PostgresConnectionOptions.js","sourcesContent":["import {BaseConnectionOptions} from \"../../connection/BaseConnectionOptions\";\nimport {PostgresConnectionCredentialsOptions} from \"./PostgresConnectionCredentialsOptions\";\n\n/**\n * Postgres-specific connection options.\n */\nexport interface PostgresConnectionOptions extends BaseConnectionOptions, PostgresConnectionCredentialsOptions {\n\n    /**\n     * Database type.\n     */\n    readonly type: \"postgres\";\n\n    /**\n     * Schema name.\n     */\n    readonly schema?: string;\n\n    /**\n    * A boolean determining whether to pass time values in UTC or local time. (default: true).\n    */\n    readonly useUTC?: boolean;\n\n    /**\n     * Replication setup.\n     */\n    readonly replication?: {\n\n        /**\n         * Master server used by orm to perform writes.\n         */\n        readonly master: PostgresConnectionCredentialsOptions;\n\n        /**\n         * List of read-from severs (slaves).\n         */\n        readonly slaves: PostgresConnectionCredentialsOptions[];\n\n    };\n\n    /**\n     * The milliseconds before a timeout occurs during the initial connection to the postgres\n     * server. If undefined, or set to 0, there is no timeout. Defaults to undefined.\n     */\n    readonly connectTimeoutMS?: number;\n\n    /**\n     * The Postgres extension to use to generate UUID columns. Defaults to uuid-ossp.\n     * If pgcrypto is selected, TypeORM will use the gen_random_uuid() function from this extension.\n     * If uuid-ossp is selected, TypeORM will use the uuid_generate_v4() function from this extension.\n     */\n    readonly uuidExtension?: \"pgcrypto\" | \"uuid-ossp\";\n\n\n    /*\n    * Function handling errors thrown by drivers pool.\n    * Defaults to logging error with `warn` level.\n     */\n    readonly poolErrorHandler?: (err: any) => any;\n\n    /**\n     * Include notification messages from Postgres server in client logs\n     */\n    readonly logNotifications?: boolean;\n\n    /**\n     * Automatically install postgres extensions\n     */\n     readonly installExtensions?: boolean;\n\n    /**\n     * sets the application_name var to help db administrators identify\n     * the service using this connection. Defaults to 'undefined'\n     */\n    readonly applicationName?: string;\n}\n"],"sourceRoot":"../.."}
+{"version":3,"sources":["../../src/driver/postgres/PostgresConnectionOptions.ts"],"names":[],"mappings":"","file":"PostgresConnectionOptions.js","sourcesContent":["import {BaseConnectionOptions} from \"../../connection/BaseConnectionOptions\";\nimport {PostgresConnectionCredentialsOptions} from \"./PostgresConnectionCredentialsOptions\";\n\n/**\n * Postgres-specific connection options.\n */\nexport interface PostgresConnectionOptions extends BaseConnectionOptions, PostgresConnectionCredentialsOptions {\n\n    /**\n     * Database type.\n     */\n    readonly type: \"postgres\";\n\n    /**\n     * Schema name.\n     */\n    readonly schema?: string;\n\n    /**\n     * The driver object\n     * This defaults to `require(\"pg\")`.\n     */\n    readonly driver?: any;\n\n    /**\n     * The driver object\n     * This defaults to `require(\"pg-native\")`.\n     */\n    readonly nativeDriver?: any;\n\n    /**\n    * A boolean determining whether to pass time values in UTC or local time. (default: true).\n    */\n    readonly useUTC?: boolean;\n\n    /**\n     * Replication setup.\n     */\n    readonly replication?: {\n\n        /**\n         * Master server used by orm to perform writes.\n         */\n        readonly master: PostgresConnectionCredentialsOptions;\n\n        /**\n         * List of read-from severs (slaves).\n         */\n        readonly slaves: PostgresConnectionCredentialsOptions[];\n\n    };\n\n    /**\n     * The milliseconds before a timeout occurs during the initial connection to the postgres\n     * server. If undefined, or set to 0, there is no timeout. Defaults to undefined.\n     */\n    readonly connectTimeoutMS?: number;\n\n    /**\n     * The Postgres extension to use to generate UUID columns. Defaults to uuid-ossp.\n     * If pgcrypto is selected, TypeORM will use the gen_random_uuid() function from this extension.\n     * If uuid-ossp is selected, TypeORM will use the uuid_generate_v4() function from this extension.\n     */\n    readonly uuidExtension?: \"pgcrypto\" | \"uuid-ossp\";\n\n\n    /*\n    * Function handling errors thrown by drivers pool.\n    * Defaults to logging error with `warn` level.\n     */\n    readonly poolErrorHandler?: (err: any) => any;\n\n    /**\n     * Include notification messages from Postgres server in client logs\n     */\n    readonly logNotifications?: boolean;\n\n    /**\n     * Automatically install postgres extensions\n     */\n    readonly installExtensions?: boolean;\n\n    /**\n     * sets the application_name var to help db administrators identify\n     * the service using this connection. Defaults to 'undefined'\n     */\n    readonly applicationName?: string;\n\n}\n"],"sourceRoot":"../.."}

package/driver/postgres/PostgresDriver.d.ts

@@ -207,13 +207,13 @@ export declare class PostgresDriver implements Driver {
      * Used for replication.
      * If replication is not setup then returns default connection's database connection.
      */
-    obtainMasterConnection(): Promise<any>;
+    obtainMasterConnection(): Promise<[any, Function]>;
     /**
      * Obtains a new database connection to a slave server.
      * Used for replication.
      * If replication is not setup then returns master (default) connection's database connection.
      */
-    obtainSlaveConnection(): Promise<any>;
+    obtainSlaveConnection(): Promise<[any, Function]>;
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      *

package/driver/postgres/PostgresDriver.js

@@ -206,7 +206,7 @@ var PostgresDriver = /** @class */ (function () {
         this.options = connection.options;
         this.isReplicated = this.options.replication ? true : false;
         if (this.options.useUTC) {
-            process.env.PGTZ = 'UTC';
+            process.env.PGTZ = "UTC";
         }
         // load postgres package
         this.loadDependencies();
@@ -231,10 +231,10 @@ var PostgresDriver = /** @class */ (function () {
      * either create a pool and create connection when needed.
      */
     PostgresDriver.prototype.connect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var _a, _b, _c, queryRunner, _d, _e;
             var _this = this;
-            return tslib_1.__generator(this, function (_f) {
+            return (0, tslib_1.__generator)(this, function (_f) {
                 switch (_f.label) {
                     case 0:
                         if (!this.options.replication) return [3 /*break*/, 3];
@@ -290,42 +290,34 @@ var PostgresDriver = /** @class */ (function () {
      * Makes any action after connection (e.g. create extensions in Postgres driver).
      */
     PostgresDriver.prototype.afterConnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var extensionsMetadata, installExtensions;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var extensionsMetadata, installExtensions, _a, connection, release;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.checkMetadataForExtensions()];
                     case 1:
-                        extensionsMetadata = _a.sent();
+                        extensionsMetadata = _b.sent();
                         installExtensions = this.options.installExtensions === undefined || this.options.installExtensions;
-                        if (installExtensions && extensionsMetadata.hasExtensions) {
-                            return [2 /*return*/, new Promise(function (ok, fail) {
-                                    _this.master.connect(function (err, connection, release) { 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*/, this.enableExtensions(extensionsMetadata, connection)];
-                                                case 1:
-                                                    _a.sent();
-                                                    if (err)
-                                                        return [2 /*return*/, fail(err)];
-                                                    release();
-                                                    ok();
-                                                    return [2 /*return*/];
-                                            }
-                                        });
-                                    }); });
-                                })];
-                        }
-                        return [2 /*return*/, Promise.resolve()];
+                        if (!(installExtensions && extensionsMetadata.hasExtensions)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.obtainMasterConnection()];
+                    case 2:
+                        _a = tslib_1.__read.apply(void 0, [_b.sent(), 2]), connection = _a[0], release = _a[1];
+                        return [4 /*yield*/, this.enableExtensions(extensionsMetadata, connection)];
+                    case 3:
+                        _b.sent();
+                        return [4 /*yield*/, release()];
+                    case 4:
+                        _b.sent();
+                        _b.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
     };
     PostgresDriver.prototype.enableExtensions = function (extensionsMetadata, connection) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var logger, hasUuidColumns, hasCitextColumns, hasHstoreColumns, hasCubeColumns, hasGeometryColumns, hasLtreeColumns, hasExclusionConstraints, _1, _2, _3, _4, _5, _6, _7;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         logger = this.connection.logger;
@@ -428,10 +420,10 @@ var PostgresDriver = /** @class */ (function () {
         });
     };
     PostgresDriver.prototype.checkMetadataForExtensions = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var hasUuidColumns, hasCitextColumns, hasHstoreColumns, hasCubeColumns, hasGeometryColumns, hasLtreeColumns, hasExclusionConstraints;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 hasUuidColumns = this.connection.entityMetadatas.some(function (metadata) {
                     return metadata.generatedColumns.filter(function (column) { return column.generationStrategy === "uuid"; }).length > 0;
                 });
@@ -470,9 +462,9 @@ var PostgresDriver = /** @class */ (function () {
      * Closes connection with database.
      */
     PostgresDriver.prototype.disconnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.master)
@@ -526,7 +518,7 @@ var PostgresDriver = /** @class */ (function () {
             || columnMetadata.type === "timestamp without time zone") {
             return DateUtils_1.DateUtils.mixedDateToDate(value);
         }
-        else if (tslib_1.__spreadArray(["json", "jsonb"], tslib_1.__read(this.spatialTypes)).indexOf(columnMetadata.type) >= 0) {
+        else if ((0, tslib_1.__spreadArray)(["json", "jsonb"], (0, tslib_1.__read)(this.spatialTypes), false).indexOf(columnMetadata.type) >= 0) {
             return JSON.stringify(value);
         }
         else if (columnMetadata.type === "hstore") {
@@ -711,7 +703,7 @@ var PostgresDriver = /** @class */ (function () {
         if (schema) {
             tablePath.unshift(schema);
         }
-        return tablePath.join('.');
+        return tablePath.join(".");
     };
     /**
      * Parse a target table name or other types and return a normalized table definition.
@@ -916,14 +908,17 @@ var PostgresDriver = /** @class */ (function () {
      * If replication is not setup then returns default connection's database connection.
      */
     PostgresDriver.prototype.obtainMasterConnection = function () {
-        var _this = this;
-        return new Promise(function (ok, fail) {
-            if (!_this.master) {
-                fail(new error_1.TypeORMError("Driver not Connected"));
-                return;
-            }
-            _this.master.connect(function (err, connection, release) {
-                err ? fail(err) : ok([connection, release]);
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _this = this;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                if (!this.master) {
+                    throw new error_1.TypeORMError("Driver not Connected");
+                }
+                return [2 /*return*/, new Promise(function (ok, fail) {
+                        _this.master.connect(function (err, connection, release) {
+                            err ? fail(err) : ok([connection, release]);
+                        });
+                    })];
             });
         });
     };
@@ -933,14 +928,15 @@ var PostgresDriver = /** @class */ (function () {
      * If replication is not setup then returns master (default) connection's database connection.
      */
     PostgresDriver.prototype.obtainSlaveConnection = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var random;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 if (!this.slaves.length) {
                     return [2 /*return*/, this.obtainMasterConnection()];
                 }
+                random = Math.floor(Math.random() * this.slaves.length);
                 return [2 /*return*/, new Promise(function (ok, fail) {
-                        var random = Math.floor(Math.random() * _this.slaves.length);
                         _this.slaves[random].connect(function (err, connection, release) {
                             err ? fail(err) : ok([connection, release]);
                         });
@@ -1077,9 +1073,10 @@ var PostgresDriver = /** @class */ (function () {
      */
     PostgresDriver.prototype.loadDependencies = function () {
         try {
-            this.postgres = PlatformTools_1.PlatformTools.load("pg");
+            var postgres = this.options.driver || PlatformTools_1.PlatformTools.load("pg");
+            this.postgres = postgres;
             try {
-                var pgNative = PlatformTools_1.PlatformTools.load("pg-native");
+                var pgNative = this.options.nativeDriver || PlatformTools_1.PlatformTools.load("pg-native");
                 if (pgNative && this.postgres.native)
                     this.postgres = this.postgres.native;
             }
@@ -1093,10 +1090,10 @@ var PostgresDriver = /** @class */ (function () {
      * Creates a new connection pool for a given database credentials.
      */
     PostgresDriver.prototype.createPool = function (options, credentials) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var connectionOptions, pool, logger, poolErrorHandler;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 credentials = Object.assign({}, credentials);
                 connectionOptions = Object.assign({}, {
                     connectionString: credentials.url,
@@ -1140,8 +1137,8 @@ var PostgresDriver = /** @class */ (function () {
      * Closes connection pool.
      */
     PostgresDriver.prototype.closePool = function (pool) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.connectedQueryRunners.length) return [3 /*break*/, 2];
@@ -1160,14 +1157,9 @@ var PostgresDriver = /** @class */ (function () {
      * Executes given query.
      */
     PostgresDriver.prototype.executeQuery = function (connection, query) {
-        var _this = this;
+        this.connection.logger.logQuery(query);
         return new Promise(function (ok, fail) {
-            _this.connection.logger.logQuery(query);
-            connection.query(query, function (err, result) {
-                if (err)
-                    return fail(err);
-                ok(result);
-            });
+            connection.query(query, function (err, result) { return err ? fail(err) : ok(result); });
         });
     };
     /**