typeorm 0.3.7-dev.ec05f1d → 0.3.8-dev.03317a3

package/driver/sap/SapQueryRunner.d.ts

@@ -52,6 +52,13 @@ export declare class SapQueryRunner extends BaseQueryRunner implements QueryRunn
      * Error will be thrown if transaction was not started.
      */
     rollbackTransaction(): Promise<void>;
+    /**
+     * @description Switches on/off AUTOCOMMIT mode
+     * @link https://help.sap.com/docs/HANA_SERVICE_CF/7c78579ce9b14a669c1f3295b0d8ca16/d538d11053bd4f3f847ec5ce817a3d4c.html?locale=en-US
+     */
+    setAutoCommit(options: {
+        status: "on" | "off";
+    }): Promise<void>;
     /**
      * Executes a given SQL query.
      */

package/driver/sap/SapQueryRunner.js

@@ -20,6 +20,7 @@ const QueryResult_1 = require("../../query-runner/QueryResult");
 const QueryLock_1 = require("../../query-runner/QueryLock");
 const MetadataTableType_1 = require("../types/MetadataTableType");
 const InstanceChecker_1 = require("../../util/InstanceChecker");
+const util_1 = require("util");
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -70,6 +71,11 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw new TransactionAlreadyStartedError_1.TransactionAlreadyStartedError();
         await this.broadcaster.broadcast("BeforeTransactionStart");
         this.isTransactionActive = true;
+        /**
+         * Disable AUTOCOMMIT while running transaction.
+         *  Otherwise, COMMIT/ROLLBACK doesn't work in autocommit mode.
+         */
+        await this.setAutoCommit({ status: "off" });
         if (isolationLevel) {
             await this.query(`SET TRANSACTION ISOLATION LEVEL ${isolationLevel || ""}`);
         }
@@ -87,6 +93,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         await this.broadcaster.broadcast("BeforeTransactionCommit");
         await this.query("COMMIT");
         this.isTransactionActive = false;
+        await this.setAutoCommit({ status: "on" });
         await this.broadcaster.broadcast("AfterTransactionCommit");
     }
     /**
@@ -101,8 +108,25 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         await this.broadcaster.broadcast("BeforeTransactionRollback");
         await this.query("ROLLBACK");
         this.isTransactionActive = false;
+        await this.setAutoCommit({ status: "on" });
         await this.broadcaster.broadcast("AfterTransactionRollback");
     }
+    /**
+     * @description Switches on/off AUTOCOMMIT mode
+     * @link https://help.sap.com/docs/HANA_SERVICE_CF/7c78579ce9b14a669c1f3295b0d8ca16/d538d11053bd4f3f847ec5ce817a3d4c.html?locale=en-US
+     */
+    async setAutoCommit(options) {
+        const connection = await this.connect();
+        const execute = (0, util_1.promisify)(connection.exec.bind(connection));
+        connection.setAutoCommit(options.status === "on");
+        const query = `SET TRANSACTION AUTOCOMMIT DDL ${options.status.toUpperCase()};`;
+        try {
+            await execute(query);
+        }
+        catch (error) {
+            throw new error_1.QueryFailedError(query, [], error);
+        }
+    }
     /**
      * Executes a given SQL query.
      */
@@ -114,8 +138,6 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const result = new QueryResult_1.QueryResult();
         try {
             const databaseConnection = await this.connect();
-            // we disable autocommit because ROLLBACK does not work in autocommit mode
-            databaseConnection.setAutoCommit(!this.isTransactionActive);
             this.driver.connection.logger.logQuery(query, parameters, this);
             const queryStartTime = +new Date();
             const isInsertQuery = query.substr(0, 11) === "INSERT INTO";
@@ -1274,7 +1296,7 @@ class SapQueryRunner 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);
@@ -1299,6 +1321,9 @@ class SapQueryRunner 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);