typeorm 0.3.8-dev.bb33cd0 → 0.3.8-dev.dadb658

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 { PostgresDriver } from "./PostgresDriver";
 import { ReplicationMode } from "../types/ReplicationMode";
+import { PostgresDriver } from "./PostgresDriver";
 /**
  * Runs queries on a single postgres database connection.
  */

package/driver/postgres/PostgresQueryRunner.js

@@ -1,10 +1,12 @@
 "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");
@@ -14,13 +16,11 @@ 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 Query_1 = require("../Query");
 const VersionUtils_1 = require("../../util/VersionUtils");
-const error_1 = require("../../error");
-const QueryResult_1 = require("../../query-runner/QueryResult");
+const Query_1 = require("../Query");
 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 = () => {
+                this.releaseCallback = (err) => {
                     this.databaseConnection.removeListener("error", onErrorCallback);
-                    release();
+                    release(err);
                 };
                 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 = () => {
+                this.releaseCallback = (err) => {
                     this.databaseConnection.removeListener("error", onErrorCallback);
-                    release();
+                    release(err);
                 };
                 this.databaseConnection.on("error", onErrorCallback);
                 return this.databaseConnection;
@@ -1471,7 +1471,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : await this.getCachedTable(tableOrName);
         // new index may be passed without name. In this case we generate index name manually.
         if (!index.name)
-            index.name = this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
+            index.name = this.generateIndexName(table, index);
         const up = this.createIndexSql(table, index);
         const down = this.dropIndexSql(table, index);
         await this.executeQueries(up, down);
@@ -1497,6 +1497,9 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : table.indices.find((i) => i.name === indexOrName);
         if (!index)
             throw new error_1.TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        // old index may be passed without name. In this case we generate index name manually.
+        if (!index.name)
+            index.name = this.generateIndexName(table, index);
         const up = this.dropIndexSql(table, index);
         const down = this.createIndexSql(table, index);
         await this.executeQueries(up, down);
@@ -1944,8 +1947,14 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     else if (dbColumn["column_default"] ===
                         "gen_random_uuid()" ||
                         /^uuid_generate_v\d\(\)/.test(dbColumn["column_default"])) {
-                        tableColumn.isGenerated = true;
-                        tableColumn.generationStrategy = "uuid";
+                        if (tableColumn.type === "uuid") {
+                            tableColumn.isGenerated = true;
+                            tableColumn.generationStrategy = "uuid";
+                        }
+                        else {
+                            tableColumn.default =
+                                dbColumn["column_default"];
+                        }
                     }
                     else if (dbColumn["column_default"] === "now()" ||
                         dbColumn["column_default"].indexOf("'now'::text") !== -1) {