typeorm 0.3.22-dev.206af0a → 0.3.22-dev.3d79786

package/driver/postgres/PostgresQueryRunner.js

@@ -16,12 +16,12 @@ 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 BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 const InstanceChecker_1 = require("../../util/InstanceChecker");
 const OrmUtils_1 = require("../../util/OrmUtils");
-const VersionUtils_1 = require("../../util/VersionUtils");
+const DriverUtils_1 = require("../DriverUtils");
 const Query_1 = require("../Query");
 const MetadataTableType_1 = require("../types/MetadataTableType");
-const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -119,16 +119,15 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw err;
         }
         if (this.transactionDepth === 0) {
-            this.transactionDepth += 1;
             await this.query("START TRANSACTION");
             if (isolationLevel) {
                 await this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
             }
         }
         else {
-            this.transactionDepth += 1;
-            await this.query(`SAVEPOINT typeorm_${this.transactionDepth - 1}`);
+            await this.query(`SAVEPOINT typeorm_${this.transactionDepth}`);
         }
+        this.transactionDepth += 1;
         await this.broadcaster.broadcast("AfterTransactionStart");
     }
     /**
@@ -140,14 +139,13 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionCommit");
         if (this.transactionDepth > 1) {
-            this.transactionDepth -= 1;
-            await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth}`);
+            await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
         }
         else {
-            this.transactionDepth -= 1;
             await this.query("COMMIT");
             this.isTransactionActive = false;
         }
+        this.transactionDepth -= 1;
         await this.broadcaster.broadcast("AfterTransactionCommit");
     }
     /**
@@ -159,14 +157,13 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionRollback");
         if (this.transactionDepth > 1) {
-            this.transactionDepth -= 1;
-            await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth}`);
+            await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
         }
         else {
-            this.transactionDepth -= 1;
             await this.query("ROLLBACK");
             this.isTransactionActive = false;
         }
+        this.transactionDepth -= 1;
         await this.broadcaster.broadcast("AfterTransactionRollback");
     }
     /**
@@ -598,7 +595,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // rename ENUM types
         const enumColumns = newTable.columns.filter((column) => column.type === "enum" || column.type === "simple-enum");
-        for (let column of enumColumns) {
+        for (const column of enumColumns) {
             // skip renaming for user-defined enum name
             if (column.enumName)
                 continue;
@@ -1609,7 +1606,6 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (!isAnotherTransactionActive)
             await this.startTransaction();
         try {
-            const version = await this.getVersion();
             // drop views
             const selectViewDropsQuery = `SELECT 'DROP VIEW IF EXISTS "' || schemaname || '"."' || viewname || '" CASCADE;' as "query" ` +
                 `FROM "pg_views" WHERE "schemaname" IN (${schemaNamesString}) AND "viewname" NOT IN ('geography_columns', 'geometry_columns', 'raster_columns', 'raster_overviews')`;
@@ -1617,7 +1613,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             await Promise.all(dropViewQueries.map((q) => this.query(q["query"])));
             // drop materialized views
             // Note: materialized views introduced in Postgres 9.3
-            if (VersionUtils_1.VersionUtils.isGreaterOrEqual(version, "9.3")) {
+            if (DriverUtils_1.DriverUtils.isReleaseVersionOrGreater(this.driver, "9.3")) {
                 const selectMatViewDropsQuery = `SELECT 'DROP MATERIALIZED VIEW IF EXISTS "' || schemaname || '"."' || matviewname || '" CASCADE;' as "query" ` +
                     `FROM "pg_matviews" WHERE "schemaname" IN (${schemaNamesString})`;
                 const dropMatViewQueries = await this.query(selectMatViewDropsQuery);
@@ -1642,7 +1638,9 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     await this.rollbackTransaction();
                 }
             }
-            catch (rollbackError) { }
+            catch {
+                // no-op
+            }
             throw error;
         }
     }
@@ -2299,7 +2297,10 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
      */
     async getVersion() {
         const result = await this.query(`SELECT version()`);
-        return result[0]["version"].replace(/^PostgreSQL ([\d.]+) .*$/, "$1");
+        // Examples:
+        // Postgres: "PostgreSQL 14.10 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-20), 64-bit"
+        // Yugabyte: "PostgreSQL 11.2-YB-2.18.1.0-b0 on x86_64-pc-linux-gnu, compiled by clang version 15.0.3 (https://github.com/yugabyte/llvm-project.git 0b8d1183745fd3998d8beffeec8cbe99c1b20529), 64-bit"
+        return result[0].version.replace(/^PostgreSQL ([\d.]+).*$/, "$1");
     }
     /**
      * Builds drop table sql.
@@ -2392,7 +2393,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (!enumName)
             enumName = this.buildEnumName(table, column);
         const enumValues = column
-            .enum.map((value) => `'${value.replace("'", "''")}'`)
+            .enum.map((value) => `'${value.replaceAll("'", "''")}'`)
             .join(", ");
         return new Query_1.Query(`CREATE TYPE ${enumName} AS ENUM(${enumValues})`);
     }