typeorm 0.3.0-rc.8 → 0.3.1-dev.941b584

package/browser/driver/postgres/PostgresDriver.js

@@ -1,21 +1,23 @@
-import * as tslib_1 from "tslib";
 import { ConnectionIsNotSetError } from "../../error/ConnectionIsNotSetError";
 import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError";
-import { DriverUtils } from "../DriverUtils";
-import { PostgresQueryRunner } from "./PostgresQueryRunner";
-import { DateUtils } from "../../util/DateUtils";
 import { PlatformTools } from "../../platform/PlatformTools";
 import { RdbmsSchemaBuilder } from "../../schema-builder/RdbmsSchemaBuilder";
-import { OrmUtils } from "../../util/OrmUtils";
 import { ApplyValueTransformers } from "../../util/ApplyValueTransformers";
+import { DateUtils } from "../../util/DateUtils";
+import { OrmUtils } from "../../util/OrmUtils";
+import { VersionUtils } from "../../util/VersionUtils";
+import { PostgresQueryRunner } from "./PostgresQueryRunner";
+import { DriverUtils } from "../DriverUtils";
+import { TypeORMError } from "../../error";
+import { InstanceChecker } from "../../util/InstanceChecker";
 /**
  * Organizes communication with PostgreSQL DBMS.
  */
-var PostgresDriver = /** @class */ (function () {
+export class PostgresDriver {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function PostgresDriver(connection) {
+    constructor(connection) {
         /**
          * Pool for slave databases.
          * Used in replication.
@@ -33,6 +35,10 @@ var PostgresDriver = /** @class */ (function () {
          * Indicates if tree tables are supported by this driver.
          */
         this.treeSupport = true;
+        /**
+         * Represent transaction support by this driver
+         */
+        this.transactionSupport = "nested";
         /**
          * Gets list of supported column data types by a driver.
          *
@@ -103,15 +109,17 @@ var PostgresDriver = /** @class */ (function () {
             "daterange",
             "geometry",
             "geography",
-            "cube"
+            "cube",
+            "ltree",
         ];
+        /**
+         * Returns type of upsert supported by driver if any
+         */
+        this.supportedUpsertType = "on-conflict-do-update";
         /**
          * Gets list of spatial column data types.
          */
-        this.spatialTypes = [
-            "geometry",
-            "geography"
-        ];
+        this.spatialTypes = ["geometry", "geography"];
         /**
          * Gets list of column data types that support length by a driver.
          */
@@ -122,7 +130,7 @@ var PostgresDriver = /** @class */ (function () {
             "char",
             "bit",
             "varbit",
-            "bit varying"
+            "bit varying",
         ];
         /**
          * Gets list of column data types that support precision by a driver.
@@ -134,15 +142,12 @@ var PostgresDriver = /** @class */ (function () {
             "time without time zone",
             "time with time zone",
             "timestamp without time zone",
-            "timestamp with time zone"
+            "timestamp with time zone",
         ];
         /**
          * Gets list of column data types that support scale by a driver.
          */
-        this.withScaleColumnTypes = [
-            "numeric",
-            "decimal"
-        ];
+        this.withScaleColumnTypes = ["numeric", "decimal"];
         /**
          * Orm has special columns and we need to know what database column types should be for those types.
          * Column types are driver dependant.
@@ -152,6 +157,8 @@ var PostgresDriver = /** @class */ (function () {
             createDateDefault: "now()",
             updateDate: "timestamp",
             updateDateDefault: "now()",
+            deleteDate: "timestamp",
+            deleteDateNullable: true,
             version: "int4",
             treeLevel: "int4",
             migrationId: "int4",
@@ -175,9 +182,9 @@ var PostgresDriver = /** @class */ (function () {
          * Used in the cases when length/precision/scale is not specified by user.
          */
         this.dataTypeDefaults = {
-            "character": { length: 1 },
-            "bit": { length: 1 },
-            "interval": { precision: 6 },
+            character: { length: 1 },
+            bit: { length: 1 },
+            interval: { precision: 6 },
             "time without time zone": { precision: 6 },
             "time with time zone": { precision: 6 },
             "timestamp without time zone": { precision: 6 },
@@ -188,11 +195,22 @@ var PostgresDriver = /** @class */ (function () {
          * @see https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
          */
         this.maxAliasLength = 63;
+        this.isGeneratedColumnsSupported = false;
+        if (!connection) {
+            return;
+        }
         this.connection = connection;
         this.options = connection.options;
         this.isReplicated = this.options.replication ? true : false;
+        if (this.options.useUTC) {
+            process.env.PGTZ = "UTC";
+        }
         // load postgres package
         this.loadDependencies();
+        this.database = DriverUtils.buildDriverOptions(this.options.replication
+            ? this.options.replication.master
+            : this.options).database;
+        this.schema = DriverUtils.buildDriverOptions(this.options).schema;
         // ObjectUtils.assign(this.options, DriverUtils.buildDriverOptions(connection.options)); // todo: do it better way
         // validate options to make sure everything is set
         // todo: revisit validation with replication in mind
@@ -211,214 +229,168 @@ var PostgresDriver = /** @class */ (function () {
      * Based on pooling options, it can either create connection immediately,
      * either create a pool and create connection when needed.
      */
-    PostgresDriver.prototype.connect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c;
-            var _this = this;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        if (!this.options.replication) return [3 /*break*/, 3];
-                        _a = this;
-                        return [4 /*yield*/, Promise.all(this.options.replication.slaves.map(function (slave) {
-                                return _this.createPool(_this.options, slave);
-                            }))];
-                    case 1:
-                        _a.slaves = _d.sent();
-                        _b = this;
-                        return [4 /*yield*/, this.createPool(this.options, this.options.replication.master)];
-                    case 2:
-                        _b.master = _d.sent();
-                        this.database = this.options.replication.master.database;
-                        return [3 /*break*/, 5];
-                    case 3:
-                        _c = this;
-                        return [4 /*yield*/, this.createPool(this.options, this.options)];
-                    case 4:
-                        _c.master = _d.sent();
-                        this.database = this.options.database;
-                        _d.label = 5;
-                    case 5: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async connect() {
+        if (this.options.replication) {
+            this.slaves = await Promise.all(this.options.replication.slaves.map((slave) => {
+                return this.createPool(this.options, slave);
+            }));
+            this.master = await this.createPool(this.options, this.options.replication.master);
+        }
+        else {
+            this.master = await this.createPool(this.options, this.options);
+        }
+        if (!this.database || !this.searchSchema) {
+            const queryRunner = await this.createQueryRunner("master");
+            if (!this.database) {
+                this.database = await queryRunner.getCurrentDatabase();
+            }
+            if (!this.searchSchema) {
+                this.searchSchema = await queryRunner.getCurrentSchema();
+            }
+            await queryRunner.release();
+        }
+        if (!this.schema) {
+            this.schema = this.searchSchema;
+        }
+    }
     /**
      * 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 hasUuidColumns, hasCitextColumns, hasHstoreColumns, hasCubeColumns, hasGeometryColumns, hasExclusionConstraints;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        hasUuidColumns = this.connection.entityMetadatas.some(function (metadata) {
-                            return metadata.generatedColumns.filter(function (column) { return column.generationStrategy === "uuid"; }).length > 0;
-                        });
-                        hasCitextColumns = this.connection.entityMetadatas.some(function (metadata) {
-                            return metadata.columns.filter(function (column) { return column.type === "citext"; }).length > 0;
-                        });
-                        hasHstoreColumns = this.connection.entityMetadatas.some(function (metadata) {
-                            return metadata.columns.filter(function (column) { return column.type === "hstore"; }).length > 0;
-                        });
-                        hasCubeColumns = this.connection.entityMetadatas.some(function (metadata) {
-                            return metadata.columns.filter(function (column) { return column.type === "cube"; }).length > 0;
-                        });
-                        hasGeometryColumns = this.connection.entityMetadatas.some(function (metadata) {
-                            return metadata.columns.filter(function (column) { return _this.spatialTypes.indexOf(column.type) >= 0; }).length > 0;
-                        });
-                        hasExclusionConstraints = this.connection.entityMetadatas.some(function (metadata) {
-                            return metadata.exclusions.length > 0;
-                        });
-                        if (!(hasUuidColumns || hasCitextColumns || hasHstoreColumns || hasGeometryColumns || hasCubeColumns || hasExclusionConstraints)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, Promise.all(tslib_1.__spread([this.master], this.slaves).map(function (pool) {
-                                return new Promise(function (ok, fail) {
-                                    pool.connect(function (err, connection, release) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                        var logger, _1, _2, _3, _4, _5, _6;
-                                        return tslib_1.__generator(this, function (_a) {
-                                            switch (_a.label) {
-                                                case 0:
-                                                    logger = this.connection.logger;
-                                                    if (err)
-                                                        return [2 /*return*/, fail(err)];
-                                                    if (!hasUuidColumns) return [3 /*break*/, 4];
-                                                    _a.label = 1;
-                                                case 1:
-                                                    _a.trys.push([1, 3, , 4]);
-                                                    return [4 /*yield*/, this.executeQuery(connection, "CREATE EXTENSION IF NOT EXISTS \"" + (this.options.uuidExtension || "uuid-ossp") + "\"")];
-                                                case 2:
-                                                    _a.sent();
-                                                    return [3 /*break*/, 4];
-                                                case 3:
-                                                    _1 = _a.sent();
-                                                    logger.log("warn", "At least one of the entities has uuid column, but the '" + (this.options.uuidExtension || "uuid-ossp") + "' extension cannot be installed automatically. Please install it manually using superuser rights, or select another uuid extension.");
-                                                    return [3 /*break*/, 4];
-                                                case 4:
-                                                    if (!hasCitextColumns) return [3 /*break*/, 8];
-                                                    _a.label = 5;
-                                                case 5:
-                                                    _a.trys.push([5, 7, , 8]);
-                                                    return [4 /*yield*/, this.executeQuery(connection, "CREATE EXTENSION IF NOT EXISTS \"citext\"")];
-                                                case 6:
-                                                    _a.sent();
-                                                    return [3 /*break*/, 8];
-                                                case 7:
-                                                    _2 = _a.sent();
-                                                    logger.log("warn", "At least one of the entities has citext column, but the 'citext' extension cannot be installed automatically. Please install it manually using superuser rights");
-                                                    return [3 /*break*/, 8];
-                                                case 8:
-                                                    if (!hasHstoreColumns) return [3 /*break*/, 12];
-                                                    _a.label = 9;
-                                                case 9:
-                                                    _a.trys.push([9, 11, , 12]);
-                                                    return [4 /*yield*/, this.executeQuery(connection, "CREATE EXTENSION IF NOT EXISTS \"hstore\"")];
-                                                case 10:
-                                                    _a.sent();
-                                                    return [3 /*break*/, 12];
-                                                case 11:
-                                                    _3 = _a.sent();
-                                                    logger.log("warn", "At least one of the entities has hstore column, but the 'hstore' extension cannot be installed automatically. Please install it manually using superuser rights");
-                                                    return [3 /*break*/, 12];
-                                                case 12:
-                                                    if (!hasGeometryColumns) return [3 /*break*/, 16];
-                                                    _a.label = 13;
-                                                case 13:
-                                                    _a.trys.push([13, 15, , 16]);
-                                                    return [4 /*yield*/, this.executeQuery(connection, "CREATE EXTENSION IF NOT EXISTS \"postgis\"")];
-                                                case 14:
-                                                    _a.sent();
-                                                    return [3 /*break*/, 16];
-                                                case 15:
-                                                    _4 = _a.sent();
-                                                    logger.log("warn", "At least one of the entities has a geometry column, but the 'postgis' extension cannot be installed automatically. Please install it manually using superuser rights");
-                                                    return [3 /*break*/, 16];
-                                                case 16:
-                                                    if (!hasCubeColumns) return [3 /*break*/, 20];
-                                                    _a.label = 17;
-                                                case 17:
-                                                    _a.trys.push([17, 19, , 20]);
-                                                    return [4 /*yield*/, this.executeQuery(connection, "CREATE EXTENSION IF NOT EXISTS \"cube\"")];
-                                                case 18:
-                                                    _a.sent();
-                                                    return [3 /*break*/, 20];
-                                                case 19:
-                                                    _5 = _a.sent();
-                                                    logger.log("warn", "At least one of the entities has a cube column, but the 'cube' extension cannot be installed automatically. Please install it manually using superuser rights");
-                                                    return [3 /*break*/, 20];
-                                                case 20:
-                                                    if (!hasExclusionConstraints) return [3 /*break*/, 24];
-                                                    _a.label = 21;
-                                                case 21:
-                                                    _a.trys.push([21, 23, , 24]);
-                                                    // The btree_gist extension provides operator support in PostgreSQL exclusion constraints
-                                                    return [4 /*yield*/, this.executeQuery(connection, "CREATE EXTENSION IF NOT EXISTS \"btree_gist\"")];
-                                                case 22:
-                                                    // The btree_gist extension provides operator support in PostgreSQL exclusion constraints
-                                                    _a.sent();
-                                                    return [3 /*break*/, 24];
-                                                case 23:
-                                                    _6 = _a.sent();
-                                                    logger.log("warn", "At least one of the entities has an exclusion constraint, but the 'btree_gist' extension cannot be installed automatically. Please install it manually using superuser rights");
-                                                    return [3 /*break*/, 24];
-                                                case 24:
-                                                    release();
-                                                    ok();
-                                                    return [2 /*return*/];
-                                            }
-                                        });
-                                    }); });
-                                });
-                            }))];
-                    case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, Promise.resolve()];
-                }
-            });
+    async afterConnect() {
+        const extensionsMetadata = await this.checkMetadataForExtensions();
+        const [connection, release] = await this.obtainMasterConnection();
+        const installExtensions = this.options.installExtensions === undefined ||
+            this.options.installExtensions;
+        if (installExtensions && extensionsMetadata.hasExtensions) {
+            await this.enableExtensions(extensionsMetadata, connection);
+        }
+        const results = (await this.executeQuery(connection, "SHOW server_version;"));
+        const versionString = results.rows[0].server_version;
+        this.isGeneratedColumnsSupported = VersionUtils.isGreaterOrEqual(versionString, "12.0");
+        await release();
+    }
+    async enableExtensions(extensionsMetadata, connection) {
+        const { logger } = this.connection;
+        const { hasUuidColumns, hasCitextColumns, hasHstoreColumns, hasCubeColumns, hasGeometryColumns, hasLtreeColumns, hasExclusionConstraints, } = extensionsMetadata;
+        if (hasUuidColumns)
+            try {
+                await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "${this.options.uuidExtension || "uuid-ossp"}"`);
+            }
+            catch (_) {
+                logger.log("warn", `At least one of the entities has uuid column, but the '${this.options.uuidExtension || "uuid-ossp"}' extension cannot be installed automatically. Please install it manually using superuser rights, or select another uuid extension.`);
+            }
+        if (hasCitextColumns)
+            try {
+                await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "citext"`);
+            }
+            catch (_) {
+                logger.log("warn", "At least one of the entities has citext column, but the 'citext' extension cannot be installed automatically. Please install it manually using superuser rights");
+            }
+        if (hasHstoreColumns)
+            try {
+                await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "hstore"`);
+            }
+            catch (_) {
+                logger.log("warn", "At least one of the entities has hstore column, but the 'hstore' extension cannot be installed automatically. Please install it manually using superuser rights");
+            }
+        if (hasGeometryColumns)
+            try {
+                await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "postgis"`);
+            }
+            catch (_) {
+                logger.log("warn", "At least one of the entities has a geometry column, but the 'postgis' extension cannot be installed automatically. Please install it manually using superuser rights");
+            }
+        if (hasCubeColumns)
+            try {
+                await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "cube"`);
+            }
+            catch (_) {
+                logger.log("warn", "At least one of the entities has a cube column, but the 'cube' extension cannot be installed automatically. Please install it manually using superuser rights");
+            }
+        if (hasLtreeColumns)
+            try {
+                await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "ltree"`);
+            }
+            catch (_) {
+                logger.log("warn", "At least one of the entities has a cube column, but the 'ltree' extension cannot be installed automatically. Please install it manually using superuser rights");
+            }
+        if (hasExclusionConstraints)
+            try {
+                // The btree_gist extension provides operator support in PostgreSQL exclusion constraints
+                await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "btree_gist"`);
+            }
+            catch (_) {
+                logger.log("warn", "At least one of the entities has an exclusion constraint, but the 'btree_gist' extension cannot be installed automatically. Please install it manually using superuser rights");
+            }
+    }
+    async checkMetadataForExtensions() {
+        const hasUuidColumns = this.connection.entityMetadatas.some((metadata) => {
+            return (metadata.generatedColumns.filter((column) => column.generationStrategy === "uuid").length > 0);
+        });
+        const hasCitextColumns = this.connection.entityMetadatas.some((metadata) => {
+            return (metadata.columns.filter((column) => column.type === "citext").length > 0);
+        });
+        const hasHstoreColumns = this.connection.entityMetadatas.some((metadata) => {
+            return (metadata.columns.filter((column) => column.type === "hstore").length > 0);
+        });
+        const hasCubeColumns = this.connection.entityMetadatas.some((metadata) => {
+            return (metadata.columns.filter((column) => column.type === "cube")
+                .length > 0);
         });
-    };
+        const hasGeometryColumns = this.connection.entityMetadatas.some((metadata) => {
+            return (metadata.columns.filter((column) => this.spatialTypes.indexOf(column.type) >= 0).length > 0);
+        });
+        const hasLtreeColumns = this.connection.entityMetadatas.some((metadata) => {
+            return (metadata.columns.filter((column) => column.type === "ltree")
+                .length > 0);
+        });
+        const hasExclusionConstraints = this.connection.entityMetadatas.some((metadata) => {
+            return metadata.exclusions.length > 0;
+        });
+        return {
+            hasUuidColumns,
+            hasCitextColumns,
+            hasHstoreColumns,
+            hasCubeColumns,
+            hasGeometryColumns,
+            hasLtreeColumns,
+            hasExclusionConstraints,
+            hasExtensions: hasUuidColumns ||
+                hasCitextColumns ||
+                hasHstoreColumns ||
+                hasGeometryColumns ||
+                hasCubeColumns ||
+                hasLtreeColumns ||
+                hasExclusionConstraints,
+        };
+    }
     /**
      * Closes connection with database.
      */
-    PostgresDriver.prototype.disconnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.master)
-                            return [2 /*return*/, Promise.reject(new ConnectionIsNotSetError("postgres"))];
-                        return [4 /*yield*/, this.closePool(this.master)];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, Promise.all(this.slaves.map(function (slave) { return _this.closePool(slave); }))];
-                    case 2:
-                        _a.sent();
-                        this.master = undefined;
-                        this.slaves = [];
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async disconnect() {
+        if (!this.master)
+            return Promise.reject(new ConnectionIsNotSetError("postgres"));
+        await this.closePool(this.master);
+        await Promise.all(this.slaves.map((slave) => this.closePool(slave)));
+        this.master = undefined;
+        this.slaves = [];
+    }
     /**
      * Creates a schema builder used to build and sync a schema.
      */
-    PostgresDriver.prototype.createSchemaBuilder = function () {
+    createSchemaBuilder() {
         return new RdbmsSchemaBuilder(this.connection);
-    };
+    }
     /**
      * Creates a query runner used to execute database queries.
      */
-    PostgresDriver.prototype.createQueryRunner = function (mode) {
-        if (mode === void 0) { mode = "master"; }
+    createQueryRunner(mode) {
         return new PostgresQueryRunner(this, mode);
-    };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type and metadata.
      */
-    PostgresDriver.prototype.preparePersistentValue = function (value, columnMetadata) {
+    preparePersistentValue(value, columnMetadata) {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);
         if (value === null || value === undefined)
@@ -432,14 +404,14 @@ var PostgresDriver = /** @class */ (function () {
         else if (columnMetadata.type === "time") {
             return DateUtils.mixedDateToTimeString(value);
         }
-        else if (columnMetadata.type === "datetime"
-            || columnMetadata.type === Date
-            || columnMetadata.type === "timestamp"
-            || columnMetadata.type === "timestamp with time zone"
-            || columnMetadata.type === "timestamp without time zone") {
+        else if (columnMetadata.type === "datetime" ||
+            columnMetadata.type === Date ||
+            columnMetadata.type === "timestamp" ||
+            columnMetadata.type === "timestamp with time zone" ||
+            columnMetadata.type === "timestamp without time zone") {
             return DateUtils.mixedDateToDate(value);
         }
-        else if (tslib_1.__spread(["json", "jsonb"], this.spatialTypes).indexOf(columnMetadata.type) >= 0) {
+        else if (["json", "jsonb", ...this.spatialTypes].indexOf(columnMetadata.type) >= 0) {
             return JSON.stringify(value);
         }
         else if (columnMetadata.type === "hstore") {
@@ -448,7 +420,7 @@ var PostgresDriver = /** @class */ (function () {
             }
             else {
                 // https://www.postgresql.org/docs/9.0/hstore.html
-                var quoteString_1 = function (value) {
+                const quoteString = (value) => {
                     // If a string to be quoted is `null` or `undefined`, we return a literal unquoted NULL.
                     // This way, NULL values can be stored in the hstore object.
                     if (value === null || typeof value === "undefined") {
@@ -456,9 +428,11 @@ var PostgresDriver = /** @class */ (function () {
                     }
                     // Convert non-null values to string since HStore only stores strings anyway.
                     // To include a double quote or a backslash in a key or value, escape it with a backslash.
-                    return "\"" + ("" + value).replace(/(?=["\\])/g, "\\") + "\"";
+                    return `"${`${value}`.replace(/(?=["\\])/g, "\\")}"`;
                 };
-                return Object.keys(value).map(function (key) { return quoteString_1(key) + "=>" + quoteString_1(value[key]); }).join(",");
+                return Object.keys(value)
+                    .map((key) => quoteString(key) + "=>" + quoteString(value[key]))
+                    .join(",");
             }
         }
         else if (columnMetadata.type === "simple-array") {
@@ -469,31 +443,42 @@ var PostgresDriver = /** @class */ (function () {
         }
         else if (columnMetadata.type === "cube") {
             if (columnMetadata.isArray) {
-                return "{" + value.map(function (cube) { return "\"(" + cube.join(",") + ")\""; }).join(",") + "}";
+                return `{${value
+                    .map((cube) => `"(${cube.join(",")})"`)
+                    .join(",")}}`;
             }
-            return "(" + value.join(",") + ")";
+            return `(${value.join(",")})`;
+        }
+        else if (columnMetadata.type === "ltree") {
+            return value
+                .split(".")
+                .filter(Boolean)
+                .join(".")
+                .replace(/[\s]+/g, "_");
         }
-        else if ((columnMetadata.type === "enum"
-            || columnMetadata.type === "simple-enum")
-            && !columnMetadata.isArray) {
+        else if ((columnMetadata.type === "enum" ||
+            columnMetadata.type === "simple-enum") &&
+            !columnMetadata.isArray) {
             return "" + value;
         }
         return value;
-    };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type or metadata.
      */
-    PostgresDriver.prototype.prepareHydratedValue = function (value, columnMetadata) {
+    prepareHydratedValue(value, columnMetadata) {
         if (value === null || value === undefined)
-            return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;
+            return columnMetadata.transformer
+                ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value)
+                : value;
         if (columnMetadata.type === Boolean) {
             value = value ? true : false;
         }
-        else if (columnMetadata.type === "datetime"
-            || columnMetadata.type === Date
-            || columnMetadata.type === "timestamp"
-            || columnMetadata.type === "timestamp with time zone"
-            || columnMetadata.type === "timestamp without time zone") {
+        else if (columnMetadata.type === "datetime" ||
+            columnMetadata.type === Date ||
+            columnMetadata.type === "timestamp" ||
+            columnMetadata.type === "timestamp with time zone" ||
+            columnMetadata.type === "timestamp without time zone") {
             value = DateUtils.normalizeHydratedDate(value);
         }
         else if (columnMetadata.type === "date") {
@@ -504,14 +489,16 @@ var PostgresDriver = /** @class */ (function () {
         }
         else if (columnMetadata.type === "hstore") {
             if (columnMetadata.hstoreType === "object") {
-                var unescapeString_1 = function (str) { return str.replace(/\\./g, function (m) { return m[1]; }); };
-                var regexp = /"([^"\\]*(?:\\.[^"\\]*)*)"=>(?:(NULL)|"([^"\\]*(?:\\.[^"\\]*)*)")(?:,|$)/g;
-                var object_1 = {};
-                ("" + value).replace(regexp, function (_, key, nullValue, stringValue) {
-                    object_1[unescapeString_1(key)] = nullValue ? null : unescapeString_1(stringValue);
+                const unescapeString = (str) => str.replace(/\\./g, (m) => m[1]);
+                const regexp = /"([^"\\]*(?:\\.[^"\\]*)*)"=>(?:(NULL)|"([^"\\]*(?:\\.[^"\\]*)*)")(?:,|$)/g;
+                const object = {};
+                `${value}`.replace(regexp, (_, key, nullValue, stringValue) => {
+                    object[unescapeString(key)] = nullValue
+                        ? null
+                        : unescapeString(stringValue);
                     return "";
                 });
-                return object_1;
+                return object;
             }
             else {
                 return value;
@@ -532,10 +519,10 @@ var PostgresDriver = /** @class */ (function () {
                  * 2. ["", undefined]         <- cube of arity 0
                  * 3. [undefined, "NULL"]     <- NULL
                  */
-                var regexp = /(?:\"((?:[\d\s\.,])*)\")|(?:(NULL))/g;
-                var unparsedArrayString = value;
+                const regexp = /(?:\"((?:[\d\s\.,])*)\")|(?:(NULL))/g;
+                const unparsedArrayString = value;
                 value = [];
-                var cube = null;
+                let cube = null;
                 // Iterate through all regexp matches for cubes/null in array
                 while ((cube = regexp.exec(unparsedArrayString)) !== null) {
                     if (cube[1] !== undefined) {
@@ -550,77 +537,137 @@ var PostgresDriver = /** @class */ (function () {
                 value = value.split(",").filter(Boolean).map(Number);
             }
         }
-        else if (columnMetadata.type === "enum" || columnMetadata.type === "simple-enum") {
+        else if (columnMetadata.type === "enum" ||
+            columnMetadata.type === "simple-enum") {
             if (columnMetadata.isArray) {
+                if (value === "{}")
+                    return [];
                 // manually convert enum array to array of values (pg does not support, see https://github.com/brianc/node-pg-types/issues/56)
-                value = value !== "{}" ? value.substr(1, value.length - 2).split(",") : [];
-                // convert to number if that exists in poosible enum options
-                value = value.map(function (val) {
-                    return !isNaN(+val) && columnMetadata.enum.indexOf(parseInt(val)) >= 0 ? parseInt(val) : val;
+                value = value
+                    .substr(1, value.length - 2)
+                    .split(",")
+                    .map((val) => {
+                    // replace double quotes from the beginning and from the end
+                    if (val.startsWith(`"`) && val.endsWith(`"`))
+                        val = val.slice(1, -1);
+                    // replace double escaped backslash to single escaped e.g. \\\\ -> \\
+                    val = val.replace(/(\\\\)/g, "\\");
+                    // replace escaped double quotes to non-escaped e.g. \"asd\" -> "asd"
+                    return val.replace(/(\\")/g, '"');
+                });
+                // convert to number if that exists in possible enum options
+                value = value.map((val) => {
+                    return !isNaN(+val) &&
+                        columnMetadata.enum.indexOf(parseInt(val)) >= 0
+                        ? parseInt(val)
+                        : val;
                 });
             }
             else {
-                // convert to number if that exists in poosible enum options
-                value = !isNaN(+value) && columnMetadata.enum.indexOf(parseInt(value)) >= 0 ? parseInt(value) : value;
+                // convert to number if that exists in possible enum options
+                value =
+                    !isNaN(+value) &&
+                        columnMetadata.enum.indexOf(parseInt(value)) >= 0
+                        ? parseInt(value)
+                        : value;
             }
         }
         if (columnMetadata.transformer)
             value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);
         return value;
-    };
+    }
     /**
      * Replaces parameters in the given sql with special escaping character
      * and an array of parameter names to be passed to a query.
      */
-    PostgresDriver.prototype.escapeQueryWithParameters = function (sql, parameters, nativeParameters) {
-        var builtParameters = Object.keys(nativeParameters).map(function (key) { return nativeParameters[key]; });
+    escapeQueryWithParameters(sql, parameters, nativeParameters) {
+        const escapedParameters = Object.keys(nativeParameters).map((key) => nativeParameters[key]);
         if (!parameters || !Object.keys(parameters).length)
-            return [sql, builtParameters];
-        var keys = Object.keys(parameters).map(function (parameter) { return "(:(\\.\\.\\.)?" + parameter + "\\b)"; }).join("|");
-        sql = sql.replace(new RegExp(keys, "g"), function (key) {
-            var value;
-            var isArray = false;
-            if (key.substr(0, 4) === ":...") {
-                isArray = true;
-                value = parameters[key.substr(4)];
-            }
-            else {
-                value = parameters[key.substr(1)];
+            return [sql, escapedParameters];
+        sql = sql.replace(/:(\.\.\.)?([A-Za-z0-9_.]+)/g, (full, isArray, key) => {
+            if (!parameters.hasOwnProperty(key)) {
+                return full;
             }
+            let value = parameters[key];
             if (isArray) {
-                return value.map(function (v) {
-                    builtParameters.push(v);
-                    return "$" + builtParameters.length;
-                }).join(", ");
+                return value
+                    .map((v) => {
+                    escapedParameters.push(v);
+                    return this.createParameter(key, escapedParameters.length - 1);
+                })
+                    .join(", ");
             }
-            else if (value instanceof Function) {
+            if (typeof value === "function") {
                 return value();
             }
-            else {
-                builtParameters.push(value);
-                return "$" + builtParameters.length;
-            }
+            escapedParameters.push(value);
+            return this.createParameter(key, escapedParameters.length - 1);
         }); // todo: make replace only in value statements, otherwise problems
-        return [sql, builtParameters];
-    };
+        return [sql, escapedParameters];
+    }
     /**
      * Escapes a column name.
      */
-    PostgresDriver.prototype.escape = function (columnName) {
-        return "\"" + columnName + "\"";
-    };
+    escape(columnName) {
+        return '"' + columnName + '"';
+    }
     /**
      * Build full table name with schema name and table name.
-     * E.g. "mySchema"."myTable"
+     * E.g. myDB.mySchema.myTable
      */
-    PostgresDriver.prototype.buildTableName = function (tableName, schema) {
-        return schema ? schema + "." + tableName : tableName;
-    };
+    buildTableName(tableName, schema) {
+        let tablePath = [tableName];
+        if (schema) {
+            tablePath.unshift(schema);
+        }
+        return tablePath.join(".");
+    }
+    /**
+     * Parse a target table name or other types and return a normalized table definition.
+     */
+    parseTableName(target) {
+        const driverDatabase = this.database;
+        const driverSchema = this.schema;
+        if (InstanceChecker.isTable(target) || InstanceChecker.isView(target)) {
+            const parsed = this.parseTableName(target.name);
+            return {
+                database: target.database || parsed.database || driverDatabase,
+                schema: target.schema || parsed.schema || driverSchema,
+                tableName: parsed.tableName,
+            };
+        }
+        if (InstanceChecker.isTableForeignKey(target)) {
+            const parsed = this.parseTableName(target.referencedTableName);
+            return {
+                database: target.referencedDatabase ||
+                    parsed.database ||
+                    driverDatabase,
+                schema: target.referencedSchema || parsed.schema || driverSchema,
+                tableName: parsed.tableName,
+            };
+        }
+        if (InstanceChecker.isEntityMetadata(target)) {
+            // EntityMetadata tableName is never a path
+            return {
+                database: target.database || driverDatabase,
+                schema: target.schema || driverSchema,
+                tableName: target.tableName,
+            };
+        }
+        const parts = target.split(".");
+        return {
+            database: driverDatabase,
+            schema: (parts.length > 1 ? parts[0] : undefined) || driverSchema,
+            tableName: parts.length > 1 ? parts[1] : parts[0],
+        };
+    }
     /**
      * Creates a database type from a given column metadata.
      */
-    PostgresDriver.prototype.normalizeType = function (column) {
-        if (column.type === Number || column.type === "int" || column.type === "int4") {
+    normalizeType(column) {
+        if (column.type === Number ||
+            column.type === "int" ||
+            column.type === "int4") {
             return "integer";
         }
         else if (column.type === String || column.type === "varchar") {
@@ -674,86 +721,123 @@ var PostgresDriver = /** @class */ (function () {
         else {
             return column.type || "";
         }
-    };
+    }
     /**
      * Normalizes "default" value of the column.
      */
-    PostgresDriver.prototype.normalizeDefault = function (columnMetadata) {
-        var defaultValue = columnMetadata.default;
-        var arrayCast = columnMetadata.isArray ? "::" + columnMetadata.type + "[]" : "";
-        if ((columnMetadata.type === "enum"
-            || columnMetadata.type === "simple-enum") && defaultValue !== undefined) {
-            if (columnMetadata.isArray && Array.isArray(defaultValue)) {
-                return "'{" + defaultValue.map(function (val) { return "" + val; }).join(",") + "}'";
-            }
-            return "'" + defaultValue + "'";
+    normalizeDefault(columnMetadata) {
+        const defaultValue = columnMetadata.default;
+        if (defaultValue === null) {
+            return undefined;
         }
-        if (typeof defaultValue === "number") {
-            return "" + defaultValue;
+        if (columnMetadata.isArray && Array.isArray(defaultValue)) {
+            return `'{${defaultValue
+                .map((val) => `${val}`)
+                .join(",")}}'`;
         }
-        else if (typeof defaultValue === "boolean") {
-            return defaultValue === true ? "true" : "false";
+        if ((columnMetadata.type === "enum" ||
+            columnMetadata.type === "simple-enum" ||
+            typeof defaultValue === "number" ||
+            typeof defaultValue === "string") &&
+            defaultValue !== undefined) {
+            return `'${defaultValue}'`;
         }
-        else if (typeof defaultValue === "function") {
-            return defaultValue();
+        if (typeof defaultValue === "boolean") {
+            return defaultValue ? "true" : "false";
         }
-        else if (typeof defaultValue === "string") {
-            return "'" + defaultValue + "'" + arrayCast;
+        if (typeof defaultValue === "function") {
+            const value = defaultValue();
+            return this.normalizeDatetimeFunction(value);
         }
-        else if (defaultValue === null) {
-            return "null";
+        if (typeof defaultValue === "object") {
+            return `'${JSON.stringify(defaultValue)}'`;
         }
-        else if (typeof defaultValue === "object") {
-            return "'" + JSON.stringify(defaultValue) + "'";
+        if (defaultValue === undefined) {
+            return undefined;
         }
-        else {
-            return defaultValue;
+        return `${defaultValue}`;
+    }
+    /**
+     * Compares "default" value of the column.
+     * Postgres sorts json values before it is saved, so in that case a deep comparison has to be performed to see if has changed.
+     */
+    defaultEqual(columnMetadata, tableColumn) {
+        if (["json", "jsonb"].includes(columnMetadata.type) &&
+            !["function", "undefined"].includes(typeof columnMetadata.default)) {
+            const tableColumnDefault = typeof tableColumn.default === "string"
+                ? JSON.parse(tableColumn.default.substring(1, tableColumn.default.length - 1))
+                : tableColumn.default;
+            return OrmUtils.deepCompare(columnMetadata.default, tableColumnDefault);
         }
-    };
+        const columnDefault = this.lowerDefaultValueIfNecessary(this.normalizeDefault(columnMetadata));
+        return columnDefault === tableColumn.default;
+    }
     /**
      * Normalizes "isUnique" value of the column.
      */
-    PostgresDriver.prototype.normalizeIsUnique = function (column) {
-        return column.entityMetadata.uniques.some(function (uq) { return uq.columns.length === 1 && uq.columns[0] === column; });
-    };
+    normalizeIsUnique(column) {
+        return column.entityMetadata.uniques.some((uq) => uq.columns.length === 1 && uq.columns[0] === column);
+    }
     /**
      * Returns default column lengths, which is required on column creation.
      */
-    PostgresDriver.prototype.getColumnLength = function (column) {
+    getColumnLength(column) {
         return column.length ? column.length.toString() : "";
-    };
+    }
     /**
      * Creates column type definition including length, precision and scale
      */
-    PostgresDriver.prototype.createFullType = function (column) {
-        var type = column.type;
+    createFullType(column) {
+        let type = column.type;
         if (column.length) {
             type += "(" + column.length + ")";
         }
-        else if (column.precision !== null && column.precision !== undefined && column.scale !== null && column.scale !== undefined) {
+        else if (column.precision !== null &&
+            column.precision !== undefined &&
+            column.scale !== null &&
+            column.scale !== undefined) {
             type += "(" + column.precision + "," + column.scale + ")";
         }
-        else if (column.precision !== null && column.precision !== undefined) {
+        else if (column.precision !== null &&
+            column.precision !== undefined) {
             type += "(" + column.precision + ")";
         }
         if (column.type === "time without time zone") {
-            type = "TIME" + (column.precision !== null && column.precision !== undefined ? "(" + column.precision + ")" : "");
+            type =
+                "TIME" +
+                    (column.precision !== null && column.precision !== undefined
+                        ? "(" + column.precision + ")"
+                        : "");
         }
         else if (column.type === "time with time zone") {
-            type = "TIME" + (column.precision !== null && column.precision !== undefined ? "(" + column.precision + ")" : "") + " WITH TIME ZONE";
+            type =
+                "TIME" +
+                    (column.precision !== null && column.precision !== undefined
+                        ? "(" + column.precision + ")"
+                        : "") +
+                    " WITH TIME ZONE";
         }
         else if (column.type === "timestamp without time zone") {
-            type = "TIMESTAMP" + (column.precision !== null && column.precision !== undefined ? "(" + column.precision + ")" : "");
+            type =
+                "TIMESTAMP" +
+                    (column.precision !== null && column.precision !== undefined
+                        ? "(" + column.precision + ")"
+                        : "");
         }
         else if (column.type === "timestamp with time zone") {
-            type = "TIMESTAMP" + (column.precision !== null && column.precision !== undefined ? "(" + column.precision + ")" : "") + " WITH TIME ZONE";
+            type =
+                "TIMESTAMP" +
+                    (column.precision !== null && column.precision !== undefined
+                        ? "(" + column.precision + ")"
+                        : "") +
+                    " WITH TIME ZONE";
         }
         else if (this.spatialTypes.indexOf(column.type) >= 0) {
             if (column.spatialFeatureType != null && column.srid != null) {
-                type = column.type + "(" + column.spatialFeatureType + "," + column.srid + ")";
+                type = `${column.type}(${column.spatialFeatureType},${column.srid})`;
             }
             else if (column.spatialFeatureType != null) {
-                type = column.type + "(" + column.spatialFeatureType + ")";
+                type = `${column.type}(${column.spatialFeatureType})`;
             }
             else {
                 type = column.type;
@@ -762,213 +846,308 @@ var PostgresDriver = /** @class */ (function () {
         if (column.isArray)
             type += " array";
         return type;
-    };
+    }
     /**
      * Obtains a new database connection to a master server.
      * Used for replication.
      * 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) {
-            _this.master.connect(function (err, connection, release) {
+    async obtainMasterConnection() {
+        if (!this.master) {
+            throw new TypeORMError("Driver not Connected");
+        }
+        return new Promise((ok, fail) => {
+            this.master.connect((err, connection, release) => {
                 err ? fail(err) : ok([connection, release]);
             });
         });
-    };
+    }
     /**
      * 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.
      */
-    PostgresDriver.prototype.obtainSlaveConnection = function () {
-        var _this = this;
-        if (!this.slaves.length)
+    async obtainSlaveConnection() {
+        if (!this.slaves.length) {
             return this.obtainMasterConnection();
-        return new Promise(function (ok, fail) {
-            var random = Math.floor(Math.random() * _this.slaves.length);
-            _this.slaves[random].connect(function (err, connection, release) {
+        }
+        const random = Math.floor(Math.random() * this.slaves.length);
+        return new Promise((ok, fail) => {
+            this.slaves[random].connect((err, connection, release) => {
                 err ? fail(err) : ok([connection, release]);
             });
         });
-    };
+    }
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      *
      * todo: slow. optimize Object.keys(), OrmUtils.mergeDeep and column.createValueMap parts
      */
-    PostgresDriver.prototype.createGeneratedMap = function (metadata, insertResult) {
+    createGeneratedMap(metadata, insertResult) {
         if (!insertResult)
             return undefined;
-        return Object.keys(insertResult).reduce(function (map, key) {
-            var column = metadata.findColumnWithDatabaseName(key);
+        return Object.keys(insertResult).reduce((map, key) => {
+            const column = metadata.findColumnWithDatabaseName(key);
             if (column) {
                 OrmUtils.mergeDeep(map, column.createValueMap(insertResult[key]));
                 // OrmUtils.mergeDeep(map, column.createValueMap(this.prepareHydratedValue(insertResult[key], column))); // TODO: probably should be like there, but fails on enums, fix later
             }
             return map;
         }, {});
-    };
+    }
     /**
      * Differentiate columns of this table and columns from the given column metadatas columns
      * and returns only changed.
      */
-    PostgresDriver.prototype.findChangedColumns = function (tableColumns, columnMetadatas) {
-        var _this = this;
-        return columnMetadatas.filter(function (columnMetadata) {
-            var tableColumn = tableColumns.find(function (c) { return c.name === columnMetadata.databaseName; });
+    findChangedColumns(tableColumns, columnMetadatas) {
+        return columnMetadatas.filter((columnMetadata) => {
+            const tableColumn = tableColumns.find((c) => c.name === columnMetadata.databaseName);
             if (!tableColumn)
                 return false; // we don't need new columns, we only need exist and changed
-            return tableColumn.name !== columnMetadata.databaseName
-                || tableColumn.type !== _this.normalizeType(columnMetadata)
-                || tableColumn.length !== columnMetadata.length
-                || tableColumn.precision !== columnMetadata.precision
-                || tableColumn.scale !== columnMetadata.scale
-                // || tableColumn.comment !== columnMetadata.comment // todo
-                || (!tableColumn.isGenerated && _this.lowerDefaultValueIfNecessary(_this.normalizeDefault(columnMetadata)) !== tableColumn.default) // we included check for generated here, because generated columns already can have default values
-                || tableColumn.isPrimary !== columnMetadata.isPrimary
-                || tableColumn.isNullable !== columnMetadata.isNullable
-                || tableColumn.isUnique !== _this.normalizeIsUnique(columnMetadata)
-                || (tableColumn.enum && columnMetadata.enum && !OrmUtils.isArraysEqual(tableColumn.enum, columnMetadata.enum.map(function (val) { return val + ""; }))) // enums in postgres are always strings
-                || tableColumn.isGenerated !== columnMetadata.isGenerated
-                || (tableColumn.spatialFeatureType || "").toLowerCase() !== (columnMetadata.spatialFeatureType || "").toLowerCase()
-                || tableColumn.srid !== columnMetadata.srid;
+            const isColumnChanged = tableColumn.name !== columnMetadata.databaseName ||
+                tableColumn.type !== this.normalizeType(columnMetadata) ||
+                tableColumn.length !== columnMetadata.length ||
+                tableColumn.isArray !== columnMetadata.isArray ||
+                tableColumn.precision !== columnMetadata.precision ||
+                (columnMetadata.scale !== undefined &&
+                    tableColumn.scale !== columnMetadata.scale) ||
+                tableColumn.comment !==
+                    this.escapeComment(columnMetadata.comment) ||
+                (!tableColumn.isGenerated &&
+                    !this.defaultEqual(columnMetadata, tableColumn)) || // we included check for generated here, because generated columns already can have default values
+                tableColumn.isPrimary !== columnMetadata.isPrimary ||
+                tableColumn.isNullable !== columnMetadata.isNullable ||
+                tableColumn.isUnique !==
+                    this.normalizeIsUnique(columnMetadata) ||
+                tableColumn.enumName !== columnMetadata.enumName ||
+                (tableColumn.enum &&
+                    columnMetadata.enum &&
+                    !OrmUtils.isArraysEqual(tableColumn.enum, columnMetadata.enum.map((val) => val + ""))) || // enums in postgres are always strings
+                tableColumn.isGenerated !== columnMetadata.isGenerated ||
+                (tableColumn.spatialFeatureType || "").toLowerCase() !==
+                    (columnMetadata.spatialFeatureType || "").toLowerCase() ||
+                tableColumn.srid !== columnMetadata.srid ||
+                tableColumn.generatedType !== columnMetadata.generatedType ||
+                (tableColumn.asExpression || "").trim() !==
+                    (columnMetadata.asExpression || "").trim();
+            // DEBUG SECTION
+            // if (isColumnChanged) {
+            //     console.log("table:", columnMetadata.entityMetadata.tableName);
+            //     console.log("name:", tableColumn.name, columnMetadata.databaseName);
+            //     console.log("type:", tableColumn.type, this.normalizeType(columnMetadata));
+            //     console.log("length:", tableColumn.length, columnMetadata.length);
+            //     console.log("isArray:", tableColumn.isArray, columnMetadata.isArray);
+            //     console.log("precision:", tableColumn.precision, columnMetadata.precision);
+            //     console.log("scale:", tableColumn.scale, columnMetadata.scale);
+            //     console.log("comment:", tableColumn.comment, this.escapeComment(columnMetadata.comment));
+            //     console.log("enumName:", tableColumn.enumName, columnMetadata.enumName);
+            //     console.log("enum:", tableColumn.enum && columnMetadata.enum && !OrmUtils.isArraysEqual(tableColumn.enum, columnMetadata.enum.map(val => val + "")));
+            //     console.log("isPrimary:", tableColumn.isPrimary, columnMetadata.isPrimary);
+            //     console.log("isNullable:", tableColumn.isNullable, columnMetadata.isNullable);
+            //     console.log("isUnique:", tableColumn.isUnique, this.normalizeIsUnique(columnMetadata));
+            //     console.log("isGenerated:", tableColumn.isGenerated, columnMetadata.isGenerated);
+            //     console.log("isGenerated 2:", !tableColumn.isGenerated && this.lowerDefaultValueIfNecessary(this.normalizeDefault(columnMetadata)) !== tableColumn.default);
+            //     console.log("spatialFeatureType:", (tableColumn.spatialFeatureType || "").toLowerCase(), (columnMetadata.spatialFeatureType || "").toLowerCase());
+            //     console.log("srid", tableColumn.srid, columnMetadata.srid);
+            //     console.log("==========================================");
+            // }
+            return isColumnChanged;
         });
-    };
-    PostgresDriver.prototype.lowerDefaultValueIfNecessary = function (value) {
+    }
+    lowerDefaultValueIfNecessary(value) {
         // Postgres saves function calls in default value as lowercase #2733
         if (!value) {
             return value;
         }
-        return value.split("'").map(function (v, i) {
+        return value
+            .split(`'`)
+            .map((v, i) => {
             return i % 2 === 1 ? v : v.toLowerCase();
-        }).join("'");
-    };
+        })
+            .join(`'`);
+    }
     /**
      * Returns true if driver supports RETURNING / OUTPUT statement.
      */
-    PostgresDriver.prototype.isReturningSqlSupported = function () {
+    isReturningSqlSupported() {
         return true;
-    };
+    }
     /**
      * Returns true if driver supports uuid values generation on its own.
      */
-    PostgresDriver.prototype.isUUIDGenerationSupported = function () {
+    isUUIDGenerationSupported() {
         return true;
-    };
-    Object.defineProperty(PostgresDriver.prototype, "uuidGenerator", {
-        get: function () {
-            return this.options.uuidExtension === "pgcrypto" ? "gen_random_uuid()" : "uuid_generate_v4()";
-        },
-        enumerable: true,
-        configurable: true
-    });
+    }
+    /**
+     * Returns true if driver supports fulltext indices.
+     */
+    isFullTextColumnTypeSupported() {
+        return false;
+    }
+    get uuidGenerator() {
+        return this.options.uuidExtension === "pgcrypto"
+            ? "gen_random_uuid()"
+            : "uuid_generate_v4()";
+    }
     /**
      * Creates an escaped parameter.
      */
-    PostgresDriver.prototype.createParameter = function (parameterName, index) {
+    createParameter(parameterName, index) {
         return "$" + (index + 1);
-    };
+    }
     // -------------------------------------------------------------------------
     // Public Methods
     // -------------------------------------------------------------------------
     /**
      * Loads postgres query stream package.
      */
-    PostgresDriver.prototype.loadStreamDependency = function () {
+    loadStreamDependency() {
         try {
             return PlatformTools.load("pg-query-stream");
         }
-        catch (e) { // todo: better error for browser env
-            throw new Error("To use streams you should install pg-query-stream package. Please run npm i pg-query-stream --save command.");
+        catch (e) {
+            // todo: better error for browser env
+            throw new TypeORMError(`To use streams you should install pg-query-stream package. Please run npm i pg-query-stream --save command.`);
         }
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * If driver dependency is not given explicitly, then try to load it via "require".
      */
-    PostgresDriver.prototype.loadDependencies = function () {
+    loadDependencies() {
         try {
-            this.postgres = PlatformTools.load("pg");
+            const postgres = this.options.driver || PlatformTools.load("pg");
+            this.postgres = postgres;
             try {
-                var pgNative = PlatformTools.load("pg-native");
+                const pgNative = this.options.nativeDriver || PlatformTools.load("pg-native");
                 if (pgNative && this.postgres.native)
                     this.postgres = this.postgres.native;
             }
             catch (e) { }
         }
-        catch (e) { // todo: better error for browser env
+        catch (e) {
+            // todo: better error for browser env
             throw new DriverPackageNotInstalledError("Postgres", "pg");
         }
-    };
+    }
     /**
      * 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 () {
-            var connectionOptions, pool, logger, poolErrorHandler;
-            return tslib_1.__generator(this, function (_a) {
-                credentials = Object.assign({}, credentials, DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
-                connectionOptions = Object.assign({}, {
-                    host: credentials.host,
-                    user: credentials.username,
-                    password: credentials.password,
-                    database: credentials.database,
-                    port: credentials.port,
-                    ssl: credentials.ssl
-                }, options.extra || {});
-                pool = new this.postgres.Pool(connectionOptions);
-                logger = this.connection.logger;
-                poolErrorHandler = options.poolErrorHandler || (function (error) { return logger.log("warn", "Postgres pool raised an error. " + error); });
-                /*
-                  Attaching an error handler to pool errors is essential, as, otherwise, errors raised will go unhandled and
-                  cause the hosting app to crash.
-                 */
-                pool.on("error", poolErrorHandler);
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        pool.connect(function (err, connection, release) {
-                            if (err)
-                                return fail(err);
-                            release();
-                            ok(pool);
-                        });
-                    })];
+    async createPool(options, credentials) {
+        credentials = Object.assign({}, credentials);
+        // build connection options for the driver
+        // See: https://github.com/brianc/node-postgres/tree/master/packages/pg-pool#create
+        const connectionOptions = Object.assign({}, {
+            connectionString: credentials.url,
+            host: credentials.host,
+            user: credentials.username,
+            password: credentials.password,
+            database: credentials.database,
+            port: credentials.port,
+            ssl: credentials.ssl,
+            connectionTimeoutMillis: options.connectTimeoutMS,
+            application_name: options.applicationName,
+        }, options.extra || {});
+        // create a connection pool
+        const pool = new this.postgres.Pool(connectionOptions);
+        const { logger } = this.connection;
+        const poolErrorHandler = options.poolErrorHandler ||
+            ((error) => logger.log("warn", `Postgres pool raised an error. ${error}`));
+        /*
+          Attaching an error handler to pool errors is essential, as, otherwise, errors raised will go unhandled and
+          cause the hosting app to crash.
+         */
+        pool.on("error", poolErrorHandler);
+        return new Promise((ok, fail) => {
+            pool.connect((err, connection, release) => {
+                if (err)
+                    return fail(err);
+                if (options.logNotifications) {
+                    connection.on("notice", (msg) => {
+                        msg && this.connection.logger.log("info", msg.message);
+                    });
+                    connection.on("notification", (msg) => {
+                        msg &&
+                            this.connection.logger.log("info", `Received NOTIFY on channel ${msg.channel}: ${msg.payload}.`);
+                    });
+                }
+                release();
+                ok(pool);
             });
         });
-    };
+    }
     /**
      * 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) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.all(this.connectedQueryRunners.map(function (queryRunner) { return queryRunner.release(); }))];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, new Promise(function (ok, fail) {
-                                pool.end(function (err) { return err ? fail(err) : ok(); });
-                            })];
-                }
-            });
+    async closePool(pool) {
+        while (this.connectedQueryRunners.length) {
+            await this.connectedQueryRunners[0].release();
+        }
+        return new Promise((ok, fail) => {
+            pool.end((err) => (err ? fail(err) : ok()));
         });
-    };
+    }
     /**
      * Executes given query.
      */
-    PostgresDriver.prototype.executeQuery = function (connection, query) {
-        return new Promise(function (ok, fail) {
-            connection.query(query, function (err, result) {
-                if (err)
-                    return fail(err);
-                ok(result);
-            });
+    executeQuery(connection, query) {
+        this.connection.logger.logQuery(query);
+        return new Promise((ok, fail) => {
+            connection.query(query, (err, result) => err ? fail(err) : ok(result));
         });
-    };
-    return PostgresDriver;
-}());
-export { PostgresDriver };
+    }
+    /**
+     * If parameter is a datetime function, e.g. "CURRENT_TIMESTAMP", normalizes it.
+     * Otherwise returns original input.
+     */
+    normalizeDatetimeFunction(value) {
+        // check if input is datetime function
+        const upperCaseValue = value.toUpperCase();
+        const isDatetimeFunction = upperCaseValue.indexOf("CURRENT_TIMESTAMP") !== -1 ||
+            upperCaseValue.indexOf("CURRENT_DATE") !== -1 ||
+            upperCaseValue.indexOf("CURRENT_TIME") !== -1 ||
+            upperCaseValue.indexOf("LOCALTIMESTAMP") !== -1 ||
+            upperCaseValue.indexOf("LOCALTIME") !== -1;
+        if (isDatetimeFunction) {
+            // extract precision, e.g. "(3)"
+            const precision = value.match(/\(\d+\)/);
+            if (upperCaseValue.indexOf("CURRENT_TIMESTAMP") !== -1) {
+                return precision
+                    ? `('now'::text)::timestamp${precision[0]} with time zone`
+                    : "now()";
+            }
+            else if (upperCaseValue === "CURRENT_DATE") {
+                return "('now'::text)::date";
+            }
+            else if (upperCaseValue.indexOf("CURRENT_TIME") !== -1) {
+                return precision
+                    ? `('now'::text)::time${precision[0]} with time zone`
+                    : "('now'::text)::time with time zone";
+            }
+            else if (upperCaseValue.indexOf("LOCALTIMESTAMP") !== -1) {
+                return precision
+                    ? `('now'::text)::timestamp${precision[0]} without time zone`
+                    : "('now'::text)::timestamp without time zone";
+            }
+            else if (upperCaseValue.indexOf("LOCALTIME") !== -1) {
+                return precision
+                    ? `('now'::text)::time${precision[0]} without time zone`
+                    : "('now'::text)::time without time zone";
+            }
+        }
+        return value;
+    }
+    /**
+     * Escapes a given comment.
+     */
+    escapeComment(comment) {
+        if (!comment)
+            return comment;
+        comment = comment.replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
+        return comment;
+    }
+}
 
 //# sourceMappingURL=PostgresDriver.js.map