typeorm 0.3.7 → 0.3.8-dev.03317a3

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -1,7 +1,9 @@
+import { TypeORMError } from "../../error";
 import { QueryFailedError } from "../../error/QueryFailedError";
 import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
 import { TransactionNotStartedError } from "../../error/TransactionNotStartedError";
 import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
+import { QueryResult } from "../../query-runner/QueryResult";
 import { Table } from "../../schema-builder/table/Table";
 import { TableCheck } from "../../schema-builder/table/TableCheck";
 import { TableColumn } from "../../schema-builder/table/TableColumn";
@@ -11,13 +13,11 @@ import { TableIndex } from "../../schema-builder/table/TableIndex";
 import { TableUnique } from "../../schema-builder/table/TableUnique";
 import { View } from "../../schema-builder/view/View";
 import { Broadcaster } from "../../subscriber/Broadcaster";
+import { InstanceChecker } from "../../util/InstanceChecker";
 import { OrmUtils } from "../../util/OrmUtils";
-import { Query } from "../Query";
 import { VersionUtils } from "../../util/VersionUtils";
-import { TypeORMError } from "../../error";
-import { QueryResult } from "../../query-runner/QueryResult";
+import { Query } from "../Query";
 import { MetadataTableType } from "../types/MetadataTableType";
-import { InstanceChecker } from "../../util/InstanceChecker";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -51,9 +51,9 @@ export class PostgresQueryRunner extends 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;
@@ -67,9 +67,9 @@ export class PostgresQueryRunner extends 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;
@@ -1468,7 +1468,7 @@ export class PostgresQueryRunner extends 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);
@@ -1494,6 +1494,9 @@ export class PostgresQueryRunner extends BaseQueryRunner {
             : table.indices.find((i) => i.name === indexOrName);
         if (!index)
             throw new 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);
@@ -1941,8 +1944,14 @@ export class PostgresQueryRunner extends 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) {
@@ -2189,8 +2198,8 @@ export class PostgresQueryRunner extends BaseQueryRunner {
      * Loads Postgres version.
      */
     async getVersion() {
-        const result = await this.query(`SHOW SERVER_VERSION`);
-        return result[0]["server_version"];
+        const result = await this.query(`SELECT version()`);
+        return result[0]["version"].replace(/^PostgreSQL ([\d\.]+) .*$/, "$1");
     }
     /**
      * Builds drop table sql.