typeorm 0.3.8-dev.7198a7a → 0.3.8-dev.8dcd61e

package/driver/postgres/PostgresQueryRunner.d.ts

@@ -12,8 +12,8 @@ import { TableUnique } from "../../schema-builder/table/TableUnique";
 import { View } from "../../schema-builder/view/View";
 import { Query } from "../Query";
 import { IsolationLevel } from "../types/IsolationLevel";
-import { ReplicationMode } from "../types/ReplicationMode";
 import { PostgresDriver } from "./PostgresDriver";
+import { ReplicationMode } from "../types/ReplicationMode";
 /**
  * Runs queries on a single postgres database connection.
  */

package/driver/postgres/PostgresQueryRunner.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresQueryRunner = void 0;
-const error_1 = require("../../error");
 const QueryFailedError_1 = require("../../error/QueryFailedError");
 const QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
 const TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
 const BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
-const QueryResult_1 = require("../../query-runner/QueryResult");
 const Table_1 = require("../../schema-builder/table/Table");
 const TableCheck_1 = require("../../schema-builder/table/TableCheck");
 const TableColumn_1 = require("../../schema-builder/table/TableColumn");
@@ -16,11 +14,13 @@ const TableIndex_1 = require("../../schema-builder/table/TableIndex");
 const TableUnique_1 = require("../../schema-builder/table/TableUnique");
 const View_1 = require("../../schema-builder/view/View");
 const Broadcaster_1 = require("../../subscriber/Broadcaster");
-const InstanceChecker_1 = require("../../util/InstanceChecker");
 const OrmUtils_1 = require("../../util/OrmUtils");
-const VersionUtils_1 = require("../../util/VersionUtils");
 const Query_1 = require("../Query");
+const VersionUtils_1 = require("../../util/VersionUtils");
+const error_1 = require("../../error");
+const QueryResult_1 = require("../../query-runner/QueryResult");
 const MetadataTableType_1 = require("../types/MetadataTableType");
+const InstanceChecker_1 = require("../../util/InstanceChecker");
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -54,9 +54,9 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 this.driver.connectedQueryRunners.push(this);
                 this.databaseConnection = connection;
                 const onErrorCallback = (err) => this.releasePostgresConnection(err);
-                this.releaseCallback = (err) => {
+                this.releaseCallback = () => {
                     this.databaseConnection.removeListener("error", onErrorCallback);
-                    release(err);
+                    release();
                 };
                 this.databaseConnection.on("error", onErrorCallback);
                 return this.databaseConnection;
@@ -70,9 +70,9 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 this.driver.connectedQueryRunners.push(this);
                 this.databaseConnection = connection;
                 const onErrorCallback = (err) => this.releasePostgresConnection(err);
-                this.releaseCallback = (err) => {
+                this.releaseCallback = () => {
                     this.databaseConnection.removeListener("error", onErrorCallback);
-                    release(err);
+                    release();
                 };
                 this.databaseConnection.on("error", onErrorCallback);
                 return this.databaseConnection;
@@ -1947,14 +1947,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     else if (dbColumn["column_default"] ===
                         "gen_random_uuid()" ||
                         /^uuid_generate_v\d\(\)/.test(dbColumn["column_default"])) {
-                        if (tableColumn.type === "uuid") {
-                            tableColumn.isGenerated = true;
-                            tableColumn.generationStrategy = "uuid";
-                        }
-                        else {
-                            tableColumn.default =
-                                dbColumn["column_default"];
-                        }
+                        tableColumn.isGenerated = true;
+                        tableColumn.generationStrategy = "uuid";
                     }
                     else if (dbColumn["column_default"] === "now()" ||
                         dbColumn["column_default"].indexOf("'now'::text") !== -1) {