typeorm 0.2.45-dev.96ac8f7 → 0.2.45

package/driver/sap/SapQueryRunner.js

@@ -89,7 +89,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         _a.sent();
                         this.isTransactionActive = true;
                         if (!isolationLevel) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + (isolationLevel || ""))];
+                        return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL ".concat(isolationLevel || ""))];
                     case 2:
                         _a.sent();
                         _a.label = 3;
@@ -277,7 +277,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        query = database ? "SELECT * FROM \"" + database + "\".\"SYS\".\"SCHEMAS\"" : "SELECT * FROM \"SYS\".\"SCHEMAS\"";
+                        query = database ? "SELECT * FROM \"".concat(database, "\".\"SYS\".\"SCHEMAS\"") : "SELECT * FROM \"SYS\".\"SCHEMAS\"";
                         return [4 /*yield*/, this.query(query)];
                     case 1:
                         results = _a.sent();
@@ -367,7 +367,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         _a.schema = _b.sent();
                         _b.label = 2;
                     case 2:
-                        sql = "SELECT * FROM \"SYS\".\"TABLES\" WHERE \"SCHEMA_NAME\" = '" + parsedTableName.schema + "' AND \"TABLE_NAME\" = '" + parsedTableName.tableName + "'";
+                        sql = "SELECT * FROM \"SYS\".\"TABLES\" WHERE \"SCHEMA_NAME\" = '".concat(parsedTableName.schema, "' AND \"TABLE_NAME\" = '").concat(parsedTableName.tableName, "'");
                         return [4 /*yield*/, this.query(sql)];
                     case 3:
                         result = _b.sent();
@@ -393,7 +393,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         _a.schema = _b.sent();
                         _b.label = 2;
                     case 2:
-                        sql = "SELECT * FROM \"SYS\".\"TABLE_COLUMNS\" WHERE \"SCHEMA_NAME\" = " + parsedTableName.schema + " AND \"TABLE_NAME\" = " + parsedTableName.tableName + " AND \"COLUMN_NAME\" = '" + columnName + "'";
+                        sql = "SELECT * FROM \"SYS\".\"TABLE_COLUMNS\" WHERE \"SCHEMA_NAME\" = ".concat(parsedTableName.schema, " AND \"TABLE_NAME\" = ").concat(parsedTableName.tableName, " AND \"COLUMN_NAME\" = '").concat(columnName, "'");
                         return [4 /*yield*/, this.query(sql)];
                     case 3:
                         result = _b.sent();
@@ -434,15 +434,15 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         schema = schemaPath.indexOf(".") === -1 ? schemaPath : schemaPath.split(".")[1];
                         exist = false;
                         if (!ifNotExist) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.query("SELECT * FROM \"SYS\".\"SCHEMAS\" WHERE \"SCHEMA_NAME\" = '" + schema + "'")];
+                        return [4 /*yield*/, this.query("SELECT * FROM \"SYS\".\"SCHEMAS\" WHERE \"SCHEMA_NAME\" = '".concat(schema, "'"))];
                     case 1:
                         result = _a.sent();
                         exist = !!result.length;
                         _a.label = 2;
                     case 2:
                         if (!(!ifNotExist || (ifNotExist && !exist))) return [3 /*break*/, 4];
-                        up = "CREATE SCHEMA \"" + schema + "\"";
-                        down = "DROP SCHEMA \"" + schema + "\" CASCADE";
+                        up = "CREATE SCHEMA \"".concat(schema, "\"");
+                        down = "DROP SCHEMA \"".concat(schema, "\" CASCADE");
                         return [4 /*yield*/, this.executeQueries(new Query_1.Query(up), new Query_1.Query(down))];
                     case 3:
                         _a.sent();
@@ -464,15 +464,15 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         schema = schemaPath.indexOf(".") === -1 ? schemaPath : schemaPath.split(".")[0];
                         exist = false;
                         if (!ifExist) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.query("SELECT * FROM \"SYS\".\"SCHEMAS\" WHERE \"SCHEMA_NAME\" = '" + schema + "'")];
+                        return [4 /*yield*/, this.query("SELECT * FROM \"SYS\".\"SCHEMAS\" WHERE \"SCHEMA_NAME\" = '".concat(schema, "'"))];
                     case 1:
                         result = _a.sent();
                         exist = !!result.length;
                         _a.label = 2;
                     case 2:
                         if (!(!ifExist || (ifExist && exist))) return [3 /*break*/, 4];
-                        up = "DROP SCHEMA \"" + schema + "\" " + (isCascade ? "CASCADE" : "");
-                        down = "CREATE SCHEMA \"" + schema + "\"";
+                        up = "DROP SCHEMA \"".concat(schema, "\" ").concat(isCascade ? "CASCADE" : "");
+                        down = "CREATE SCHEMA \"".concat(schema, "\"");
                         return [4 /*yield*/, this.executeQueries(new Query_1.Query(up), new Query_1.Query(down))];
                     case 3:
                         _a.sent();
@@ -667,16 +667,16 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         oldTable = _a;
                         newTable = oldTable.clone();
                         _b = this.driver.parseTableName(oldTable), schemaName = _b.schema, oldTableName = _b.tableName;
-                        newTable.name = schemaName ? schemaName + "." + newTableName : newTableName;
+                        newTable.name = schemaName ? "".concat(schemaName, ".").concat(newTableName) : newTableName;
                         // rename table
-                        upQueries.push(new Query_1.Query("RENAME TABLE " + this.escapePath(oldTable) + " TO " + this.escapePath(newTableName)));
-                        downQueries.push(new Query_1.Query("RENAME TABLE " + this.escapePath(newTable) + " TO " + this.escapePath(oldTableName)));
+                        upQueries.push(new Query_1.Query("RENAME TABLE ".concat(this.escapePath(oldTable), " TO ").concat(this.escapePath(newTableName))));
+                        downQueries.push(new Query_1.Query("RENAME TABLE ".concat(this.escapePath(newTable), " TO ").concat(this.escapePath(oldTableName))));
                         // drop old FK's. Foreign keys must be dropped before the primary keys are dropped
                         newTable.foreignKeys.forEach(function (foreignKey) {
                             upQueries.push(_this.dropForeignKeySql(newTable, foreignKey));
                             downQueries.push(_this.createForeignKeySql(newTable, foreignKey));
                         });
-                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '" + schemaName + "' AND \"REFERENCED_TABLE_NAME\" = '" + oldTableName + "'";
+                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '".concat(schemaName, "' AND \"REFERENCED_TABLE_NAME\" = '").concat(oldTableName, "'");
                         return [4 /*yield*/, this.query(referencedForeignKeySql)];
                     case 4:
                         dbForeignKeys = _c.sent();
@@ -685,7 +685,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         if (dbForeignKeys.length > 0) {
                             referencedForeignKeys = dbForeignKeys.map(function (dbForeignKey) {
                                 var foreignKeys = dbForeignKeys.filter(function (dbFk) { return dbFk["CONSTRAINT_NAME"] === dbForeignKey["CONSTRAINT_NAME"]; });
-                                referencedForeignKeyTableMapping.push({ tableName: dbForeignKey["SCHEMA_NAME"] + "." + dbForeignKey["TABLE_NAME"], fkName: dbForeignKey["CONSTRAINT_NAME"] });
+                                referencedForeignKeyTableMapping.push({ tableName: "".concat(dbForeignKey["SCHEMA_NAME"], ".").concat(dbForeignKey["TABLE_NAME"]), fkName: dbForeignKey["CONSTRAINT_NAME"] });
                                 return new TableForeignKey_1.TableForeignKey({
                                     name: dbForeignKey["CONSTRAINT_NAME"],
                                     columnNames: foreignKeys.map(function (dbFk) { return dbFk["COLUMN_NAME"]; }),
@@ -708,15 +708,15 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         // rename primary key constraint
                         if (newTable.primaryColumns.length > 0) {
                             columnNames = newTable.primaryColumns.map(function (column) { return column.name; });
-                            columnNamesString = columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
+                            columnNamesString = columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
                             oldPkName = this.connection.namingStrategy.primaryKeyName(oldTable, columnNames);
                             newPkName = this.connection.namingStrategy.primaryKeyName(newTable, columnNames);
                             // drop old PK
-                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(newTable) + " DROP CONSTRAINT \"" + oldPkName + "\""));
-                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(newTable) + " ADD CONSTRAINT \"" + oldPkName + "\" PRIMARY KEY (" + columnNamesString + ")"));
+                            upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(newTable), " DROP CONSTRAINT \"").concat(oldPkName, "\"")));
+                            downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(newTable), " ADD CONSTRAINT \"").concat(oldPkName, "\" PRIMARY KEY (").concat(columnNamesString, ")")));
                             // create new PK
-                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(newTable) + " ADD CONSTRAINT \"" + newPkName + "\" PRIMARY KEY (" + columnNamesString + ")"));
-                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(newTable) + " DROP CONSTRAINT \"" + newPkName + "\""));
+                            upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(newTable), " ADD CONSTRAINT \"").concat(newPkName, "\" PRIMARY KEY (").concat(columnNamesString, ")")));
+                            downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(newTable), " DROP CONSTRAINT \"").concat(newPkName, "\"")));
                         }
                         // recreate foreign keys with new constraint names
                         newTable.foreignKeys.forEach(function (foreignKey) {
@@ -791,7 +791,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         if (!column.isPrimary) return [3 /*break*/, 8];
                         primaryColumns = clonedTable.primaryColumns;
                         if (!(primaryColumns.length > 0)) return [3 /*break*/, 7];
-                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '" + parsedTableName.schema + "' AND \"REFERENCED_TABLE_NAME\" = '" + parsedTableName.tableName + "'";
+                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '".concat(parsedTableName.schema, "' AND \"REFERENCED_TABLE_NAME\" = '").concat(parsedTableName.tableName, "'");
                         return [4 /*yield*/, this.query(referencedForeignKeySql)];
                     case 6:
                         dbForeignKeys_1 = _c.sent();
@@ -800,7 +800,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         if (dbForeignKeys_1.length > 0) {
                             referencedForeignKeys = dbForeignKeys_1.map(function (dbForeignKey) {
                                 var foreignKeys = dbForeignKeys_1.filter(function (dbFk) { return dbFk["CONSTRAINT_NAME"] === dbForeignKey["CONSTRAINT_NAME"]; });
-                                referencedForeignKeyTableMapping_1.push({ tableName: dbForeignKey["SCHEMA_NAME"] + "." + dbForeignKey["TABLE_NAME"], fkName: dbForeignKey["CONSTRAINT_NAME"] });
+                                referencedForeignKeyTableMapping_1.push({ tableName: "".concat(dbForeignKey["SCHEMA_NAME"], ".").concat(dbForeignKey["TABLE_NAME"]), fkName: dbForeignKey["CONSTRAINT_NAME"] });
                                 return new TableForeignKey_1.TableForeignKey({
                                     name: dbForeignKey["CONSTRAINT_NAME"],
                                     columnNames: foreignKeys.map(function (dbFk) { return dbFk["COLUMN_NAME"]; }),
@@ -821,9 +821,9 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             });
                         }
                         pkName_1 = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
-                        columnNames_1 = primaryColumns.map(function (column) { return "\"" + column.name + "\""; }).join(", ");
-                        upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + pkName_1 + "\""));
-                        downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + pkName_1 + "\" PRIMARY KEY (" + columnNames_1 + ")"));
+                        columnNames_1 = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
+                        upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName_1, "\"")));
+                        downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName_1, "\" PRIMARY KEY (").concat(columnNames_1, ")")));
                         // restore referenced foreign keys
                         referencedForeignKeys.forEach(function (foreignKey) {
                             var mapping = referencedForeignKeyTableMapping_1.find(function (it) { return it.fkName === foreignKey.name; });
@@ -834,9 +834,9 @@ var SapQueryRunner = /** @class */ (function (_super) {
                     case 7:
                         primaryColumns.push(column);
                         pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
-                        columnNames = primaryColumns.map(function (column) { return "\"" + column.name + "\""; }).join(", ");
-                        upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + pkName + "\" PRIMARY KEY (" + columnNames + ")"));
-                        downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + pkName + "\""));
+                        columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
+                        upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
+                        downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
                         _c.label = 8;
                     case 8:
                         columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
@@ -927,7 +927,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         oldColumn = oldTableColumnOrName instanceof TableColumn_1.TableColumn ? oldTableColumnOrName : table.columns.find(function (c) { return c.name === oldTableColumnOrName; });
                         if (!oldColumn)
-                            throw new error_1.TypeORMError("Column \"" + oldTableColumnOrName + "\" was not found in the \"" + table.name + "\" table.");
+                            throw new error_1.TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
                         newColumn = undefined;
                         if (newTableColumnOrName instanceof TableColumn_1.TableColumn) {
                             newColumn = newTableColumnOrName;
@@ -970,7 +970,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             ? oldTableColumnOrName
                             : table.columns.find(function (column) { return column.name === oldTableColumnOrName; });
                         if (!oldColumn)
-                            throw new error_1.TypeORMError("Column \"" + oldTableColumnOrName + "\" was not found in the \"" + table.name + "\" table.");
+                            throw new error_1.TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
                         if (!((newColumn.isGenerated !== oldColumn.isGenerated && newColumn.generationStrategy !== "uuid") || newColumn.type !== oldColumn.type || newColumn.length !== oldColumn.length)) return [3 /*break*/, 6];
                         // SQL Server does not support changing of IDENTITY column, so we must drop column and recreate it again.
                         // Also, we recreate column if column type changed
@@ -988,8 +988,8 @@ var SapQueryRunner = /** @class */ (function (_super) {
                     case 6:
                         if (newColumn.name !== oldColumn.name) {
                             // rename column
-                            upQueries.push(new Query_1.Query("RENAME COLUMN " + this.escapePath(table) + ".\"" + oldColumn.name + "\" TO \"" + newColumn.name + "\""));
-                            downQueries.push(new Query_1.Query("RENAME COLUMN " + this.escapePath(table) + ".\"" + newColumn.name + "\" TO \"" + oldColumn.name + "\""));
+                            upQueries.push(new Query_1.Query("RENAME COLUMN ".concat(this.escapePath(table), ".\"").concat(oldColumn.name, "\" TO \"").concat(newColumn.name, "\"")));
+                            downQueries.push(new Query_1.Query("RENAME COLUMN ".concat(this.escapePath(table), ".\"").concat(newColumn.name, "\" TO \"").concat(oldColumn.name, "\"")));
                             if (oldColumn.isPrimary === true) {
                                 primaryColumns = clonedTable.primaryColumns;
                                 columnNames = primaryColumns.map(function (column) { return column.name; });
@@ -997,14 +997,14 @@ var SapQueryRunner = /** @class */ (function (_super) {
                                 // replace old column name with new column name
                                 columnNames.splice(columnNames.indexOf(oldColumn.name), 1);
                                 columnNames.push(newColumn.name);
-                                columnNamesString = columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
+                                columnNamesString = columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
                                 // drop old PK
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " DROP CONSTRAINT \"" + oldPkName + "\""));
-                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " ADD CONSTRAINT \"" + oldPkName + "\" PRIMARY KEY (" + columnNamesString + ")"));
+                                upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP CONSTRAINT \"").concat(oldPkName, "\"")));
+                                downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD CONSTRAINT \"").concat(oldPkName, "\" PRIMARY KEY (").concat(columnNamesString, ")")));
                                 newPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
                                 // create new PK
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " ADD CONSTRAINT \"" + newPkName + "\" PRIMARY KEY (" + columnNamesString + ")"));
-                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " DROP CONSTRAINT \"" + newPkName + "\""));
+                                upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD CONSTRAINT \"").concat(newPkName, "\" PRIMARY KEY (").concat(columnNamesString, ")")));
+                                downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP CONSTRAINT \"").concat(newPkName, "\"")));
                             }
                             // rename index constraints
                             clonedTable.findColumnIndices(oldColumn).forEach(function (index) {
@@ -1053,26 +1053,26 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             oldColumn.name = newColumn.name;
                         }
                         if (this.isColumnChanged(oldColumn, newColumn)) {
-                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER (" + this.buildCreateColumnSql(newColumn) + ")"));
-                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER (" + this.buildCreateColumnSql(oldColumn) + ")"));
+                            upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER (").concat(this.buildCreateColumnSql(newColumn), ")")));
+                            downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER (").concat(this.buildCreateColumnSql(oldColumn), ")")));
                         }
                         if (newColumn.isPrimary !== oldColumn.isPrimary) {
                             primaryColumns = clonedTable.primaryColumns;
                             // if primary column state changed, we must always drop existed constraint.
                             if (primaryColumns.length > 0) {
                                 pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
-                                columnNames = primaryColumns.map(function (column) { return "\"" + column.name + "\""; }).join(", ");
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + pkName + "\""));
-                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + pkName + "\" PRIMARY KEY (" + columnNames + ")"));
+                                columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
+                                upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
+                                downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
                             }
                             if (newColumn.isPrimary === true) {
                                 primaryColumns.push(newColumn);
                                 column = clonedTable.columns.find(function (column) { return column.name === newColumn.name; });
                                 column.isPrimary = true;
                                 pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
-                                columnNames = primaryColumns.map(function (column) { return "\"" + column.name + "\""; }).join(", ");
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + pkName + "\" PRIMARY KEY (" + columnNames + ")"));
-                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + pkName + "\""));
+                                columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
+                                upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
+                                downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
                             }
                             else {
                                 primaryColumn = primaryColumns.find(function (c) { return c.name === newColumn.name; });
@@ -1082,9 +1082,9 @@ var SapQueryRunner = /** @class */ (function (_super) {
                                 // if we have another primary keys, we must recreate constraint.
                                 if (primaryColumns.length > 0) {
                                     pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
-                                    columnNames = primaryColumns.map(function (column) { return "\"" + column.name + "\""; }).join(", ");
-                                    upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + pkName + "\" PRIMARY KEY (" + columnNames + ")"));
-                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + pkName + "\""));
+                                    columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
+                                    upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
                                 }
                             }
                         }
@@ -1116,17 +1116,17 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         }
                         if (newColumn.default !== oldColumn.default) {
                             if (newColumn.default !== null && newColumn.default !== undefined) {
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER (\"" + newColumn.name + "\" " + this.connection.driver.createFullType(newColumn) + " DEFAULT " + newColumn.default + ")"));
+                                upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER (\"").concat(newColumn.name, "\" ").concat(this.connection.driver.createFullType(newColumn), " DEFAULT ").concat(newColumn.default, ")")));
                                 if (oldColumn.default !== null && oldColumn.default !== undefined) {
-                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER (\"" + oldColumn.name + "\" " + this.connection.driver.createFullType(oldColumn) + " DEFAULT " + oldColumn.default + ")"));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER (\"").concat(oldColumn.name, "\" ").concat(this.connection.driver.createFullType(oldColumn), " DEFAULT ").concat(oldColumn.default, ")")));
                                 }
                                 else {
-                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER (\"" + oldColumn.name + "\" " + this.connection.driver.createFullType(oldColumn) + " DEFAULT NULL)"));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER (\"").concat(oldColumn.name, "\" ").concat(this.connection.driver.createFullType(oldColumn), " DEFAULT NULL)")));
                                 }
                             }
                             else if (oldColumn.default !== null && oldColumn.default !== undefined) {
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER (\"" + newColumn.name + "\" " + this.connection.driver.createFullType(newColumn) + " DEFAULT NULL)"));
-                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER (\"" + oldColumn.name + "\" " + this.connection.driver.createFullType(oldColumn) + " DEFAULT " + oldColumn.default + ")"));
+                                upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER (\"").concat(newColumn.name, "\" ").concat(this.connection.driver.createFullType(newColumn), " DEFAULT NULL)")));
+                                downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER (\"").concat(oldColumn.name, "\" ").concat(this.connection.driver.createFullType(oldColumn), " DEFAULT ").concat(oldColumn.default, ")")));
                             }
                         }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
@@ -1207,12 +1207,12 @@ var SapQueryRunner = /** @class */ (function (_super) {
                     case 5:
                         column = columnOrName instanceof TableColumn_1.TableColumn ? columnOrName : table.findColumnByName(columnOrName);
                         if (!column)
-                            throw new error_1.TypeORMError("Column \"" + columnOrName + "\" was not found in table \"" + table.name + "\"");
+                            throw new error_1.TypeORMError("Column \"".concat(columnOrName, "\" was not found in table \"").concat(table.name, "\""));
                         clonedTable = table.clone();
                         upQueries = [];
                         downQueries = [];
                         if (!column.isPrimary) return [3 /*break*/, 7];
-                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '" + parsedTableName.schema + "' AND \"REFERENCED_TABLE_NAME\" = '" + parsedTableName.tableName + "'";
+                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '".concat(parsedTableName.schema, "' AND \"REFERENCED_TABLE_NAME\" = '").concat(parsedTableName.tableName, "'");
                         return [4 /*yield*/, this.query(referencedForeignKeySql)];
                     case 6:
                         dbForeignKeys_2 = _c.sent();
@@ -1221,7 +1221,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         if (dbForeignKeys_2.length > 0) {
                             referencedForeignKeys = dbForeignKeys_2.map(function (dbForeignKey) {
                                 var foreignKeys = dbForeignKeys_2.filter(function (dbFk) { return dbFk["CONSTRAINT_NAME"] === dbForeignKey["CONSTRAINT_NAME"]; });
-                                referencedForeignKeyTableMapping_2.push({ tableName: dbForeignKey["SCHEMA_NAME"] + "." + dbForeignKey["TABLE_NAME"], fkName: dbForeignKey["CONSTRAINT_NAME"] });
+                                referencedForeignKeyTableMapping_2.push({ tableName: "".concat(dbForeignKey["SCHEMA_NAME"], ".").concat(dbForeignKey["TABLE_NAME"]), fkName: dbForeignKey["CONSTRAINT_NAME"] });
                                 return new TableForeignKey_1.TableForeignKey({
                                     name: dbForeignKey["CONSTRAINT_NAME"],
                                     columnNames: foreignKeys.map(function (dbFk) { return dbFk["COLUMN_NAME"]; }),
@@ -1242,17 +1242,17 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             });
                         }
                         pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map(function (column) { return column.name; }));
-                        columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "\"" + primaryColumn.name + "\""; }).join(", ");
-                        upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " DROP CONSTRAINT \"" + pkName + "\""));
-                        downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " ADD CONSTRAINT \"" + pkName + "\" PRIMARY KEY (" + columnNames + ")"));
+                        columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "\"".concat(primaryColumn.name, "\""); }).join(", ");
+                        upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP CONSTRAINT \"").concat(pkName, "\"")));
+                        downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
                         tableColumn = clonedTable.findColumnByName(column.name);
                         tableColumn.isPrimary = false;
                         // if primary key have multiple columns, we must recreate it without dropped column
                         if (clonedTable.primaryColumns.length > 0) {
                             pkName_2 = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map(function (column) { return column.name; }));
-                            columnNames_2 = clonedTable.primaryColumns.map(function (primaryColumn) { return "\"" + primaryColumn.name + "\""; }).join(", ");
-                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " ADD CONSTRAINT \"" + pkName_2 + "\" PRIMARY KEY (" + columnNames_2 + ")"));
-                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(clonedTable) + " DROP CONSTRAINT \"" + pkName_2 + "\""));
+                            columnNames_2 = clonedTable.primaryColumns.map(function (primaryColumn) { return "\"".concat(primaryColumn.name, "\""); }).join(", ");
+                            upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD CONSTRAINT \"").concat(pkName_2, "\" PRIMARY KEY (").concat(columnNames_2, ")")));
+                            downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP CONSTRAINT \"").concat(pkName_2, "\"")));
                         }
                         // restore referenced foreign keys
                         referencedForeignKeys.forEach(function (foreignKey) {
@@ -1274,14 +1274,14 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             if (foundUnique) {
                                 clonedTable.uniques.splice(clonedTable.uniques.indexOf(foundUnique), 1);
                                 upQueries.push(this.dropIndexSql(table, uniqueName_1));
-                                downQueries.push(new Query_1.Query("CREATE UNIQUE INDEX \"" + uniqueName_1 + "\" ON " + this.escapePath(table) + " (\"" + column.name + "\")"));
+                                downQueries.push(new Query_1.Query("CREATE UNIQUE INDEX \"".concat(uniqueName_1, "\" ON ").concat(this.escapePath(table), " (\"").concat(column.name, "\")")));
                             }
                             indexName_1 = this.connection.namingStrategy.indexName(table, [column.name]);
                             foundIndex = clonedTable.indices.find(function (index) { return index.name === indexName_1; });
                             if (foundIndex) {
                                 clonedTable.indices.splice(clonedTable.indices.indexOf(foundIndex), 1);
                                 upQueries.push(this.dropIndexSql(table, indexName_1));
-                                downQueries.push(new Query_1.Query("CREATE UNIQUE INDEX \"" + indexName_1 + "\" ON " + this.escapePath(table) + " (\"" + column.name + "\")"));
+                                downQueries.push(new Query_1.Query("CREATE UNIQUE INDEX \"".concat(indexName_1, "\" ON ").concat(this.escapePath(table), " (\"").concat(column.name, "\")")));
                             }
                         }
                         columnCheck = clonedTable.checks.find(function (check) { return !!check.columnNames && check.columnNames.length === 1 && check.columnNames[0] === column.name; });
@@ -1407,7 +1407,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         columnNames = columns.map(function (column) { return column.name; });
                         upQueries = [];
                         downQueries = [];
-                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '" + parsedTableName.schema + "' AND \"REFERENCED_TABLE_NAME\" = '" + parsedTableName.tableName + "'";
+                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '".concat(parsedTableName.schema, "' AND \"REFERENCED_TABLE_NAME\" = '").concat(parsedTableName.tableName, "'");
                         return [4 /*yield*/, this.query(referencedForeignKeySql)];
                     case 6:
                         dbForeignKeys = _c.sent();
@@ -1416,7 +1416,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         if (dbForeignKeys.length > 0) {
                             referencedForeignKeys = dbForeignKeys.map(function (dbForeignKey) {
                                 var foreignKeys = dbForeignKeys.filter(function (dbFk) { return dbFk["CONSTRAINT_NAME"] === dbForeignKey["CONSTRAINT_NAME"]; });
-                                referencedForeignKeyTableMapping.push({ tableName: dbForeignKey["SCHEMA_NAME"] + "." + dbForeignKey["TABLE_NAME"], fkName: dbForeignKey["CONSTRAINT_NAME"] });
+                                referencedForeignKeyTableMapping.push({ tableName: "".concat(dbForeignKey["SCHEMA_NAME"], ".").concat(dbForeignKey["TABLE_NAME"]), fkName: dbForeignKey["CONSTRAINT_NAME"] });
                                 return new TableForeignKey_1.TableForeignKey({
                                     name: dbForeignKey["CONSTRAINT_NAME"],
                                     columnNames: foreignKeys.map(function (dbFk) { return dbFk["COLUMN_NAME"]; }),
@@ -1439,18 +1439,18 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         primaryColumns = clonedTable.primaryColumns;
                         if (primaryColumns.length > 0) {
                             pkName_3 = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
-                            columnNamesString_1 = primaryColumns.map(function (column) { return "\"" + column.name + "\""; }).join(", ");
-                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + pkName_3 + "\""));
-                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + pkName_3 + "\" PRIMARY KEY (" + columnNamesString_1 + ")"));
+                            columnNamesString_1 = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
+                            upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName_3, "\"")));
+                            downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName_3, "\" PRIMARY KEY (").concat(columnNamesString_1, ")")));
                         }
                         // update columns in table.
                         clonedTable.columns
                             .filter(function (column) { return columnNames.indexOf(column.name) !== -1; })
                             .forEach(function (column) { return column.isPrimary = true; });
                         pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
-                        columnNamesString = columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
-                        upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + pkName + "\" PRIMARY KEY (" + columnNamesString + ")"));
-                        downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + pkName + "\""));
+                        columnNamesString = columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
+                        upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNamesString, ")")));
+                        downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
                         // restore referenced foreign keys
                         referencedForeignKeys.forEach(function (foreignKey) {
                             var mapping = referencedForeignKeyTableMapping.find(function (it) { return it.fkName === foreignKey.name; });
@@ -1495,7 +1495,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                     case 5:
                         upQueries = [];
                         downQueries = [];
-                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '" + parsedTableName.schema + "' AND \"REFERENCED_TABLE_NAME\" = '" + parsedTableName.tableName + "'";
+                        referencedForeignKeySql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE \"REFERENCED_SCHEMA_NAME\" = '".concat(parsedTableName.schema, "' AND \"REFERENCED_TABLE_NAME\" = '").concat(parsedTableName.tableName, "'");
                         return [4 /*yield*/, this.query(referencedForeignKeySql)];
                     case 6:
                         dbForeignKeys = _c.sent();
@@ -1504,7 +1504,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         if (dbForeignKeys.length > 0) {
                             referencedForeignKeys = dbForeignKeys.map(function (dbForeignKey) {
                                 var foreignKeys = dbForeignKeys.filter(function (dbFk) { return dbFk["CONSTRAINT_NAME"] === dbForeignKey["CONSTRAINT_NAME"]; });
-                                referencedForeignKeyTableMapping.push({ tableName: dbForeignKey["SCHEMA_NAME"] + "." + dbForeignKey["TABLE_NAME"], fkName: dbForeignKey["CONSTRAINT_NAME"] });
+                                referencedForeignKeyTableMapping.push({ tableName: "".concat(dbForeignKey["SCHEMA_NAME"], ".").concat(dbForeignKey["TABLE_NAME"]), fkName: dbForeignKey["CONSTRAINT_NAME"] });
                                 return new TableForeignKey_1.TableForeignKey({
                                     name: dbForeignKey["CONSTRAINT_NAME"],
                                     columnNames: foreignKeys.map(function (dbFk) { return dbFk["COLUMN_NAME"]; }),
@@ -1654,7 +1654,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         checkConstraint = checkOrName instanceof TableCheck_1.TableCheck ? checkOrName : table.checks.find(function (c) { return c.name === checkOrName; });
                         if (!checkConstraint)
-                            throw new error_1.TypeORMError("Supplied check constraint was not found in table " + table.name);
+                            throw new error_1.TypeORMError("Supplied check constraint was not found in table ".concat(table.name));
                         up = this.dropCheckConstraintSql(table, checkConstraint);
                         down = this.createCheckConstraintSql(table, checkConstraint);
                         return [4 /*yield*/, this.executeQueries(up, down)];
@@ -1796,7 +1796,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         foreignKey = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey ? foreignKeyOrName : table.foreignKeys.find(function (fk) { return fk.name === foreignKeyOrName; });
                         if (!foreignKey)
-                            throw new error_1.TypeORMError("Supplied foreign key was not found in table " + table.name);
+                            throw new error_1.TypeORMError("Supplied foreign key was not found in table ".concat(table.name));
                         up = this.dropForeignKeySql(table, foreignKey);
                         down = this.createForeignKeySql(table, foreignKey);
                         return [4 /*yield*/, this.executeQueries(up, down)];
@@ -1898,7 +1898,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         index = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
                         if (!index)
-                            throw new error_1.TypeORMError("Supplied index " + indexOrName + " was not found in table " + table.name);
+                            throw new error_1.TypeORMError("Supplied index ".concat(indexOrName, " was not found in table ").concat(table.name));
                         up = this.dropIndexSql(table, index);
                         down = this.createIndexSql(table, index);
                         return [4 /*yield*/, this.executeQueries(up, down)];
@@ -1937,7 +1937,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE " + this.escapePath(tablePath))];
+                    case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE ".concat(this.escapePath(tablePath)))];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1950,7 +1950,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
      */
     SapQueryRunner.prototype.clearDatabase = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var schemas, schemaNamesString, selectTableDropsQuery, dropTableQueries, error_2, rollbackError_1;
+            var schemas, schemaNamesString, isAnotherTransactionActive, selectTableDropsQuery, dropTableQueries, error_2, rollbackError_1;
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
@@ -1967,37 +1967,43 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         schemaNamesString = schemas.map(function (name) {
                             return name === "current_schema" ? name : "'" + name + "'";
                         }).join(", ");
+                        isAnotherTransactionActive = this.isTransactionActive;
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.startTransaction()];
                     case 1:
                         _a.sent();
                         _a.label = 2;
                     case 2:
-                        _a.trys.push([2, 6, , 11]);
-                        selectTableDropsQuery = "SELECT 'DROP TABLE \"' || schema_name || '\".\"' || table_name || '\" CASCADE;' as \"query\" FROM \"SYS\".\"TABLES\" WHERE \"SCHEMA_NAME\" IN (" + schemaNamesString + ") AND \"TABLE_NAME\" NOT IN ('SYS_AFL_GENERATOR_PARAMETERS') AND \"IS_COLUMN_TABLE\" = 'TRUE'";
+                        _a.trys.push([2, 7, , 13]);
+                        selectTableDropsQuery = "SELECT 'DROP TABLE \"' || schema_name || '\".\"' || table_name || '\" CASCADE;' as \"query\" FROM \"SYS\".\"TABLES\" WHERE \"SCHEMA_NAME\" IN (".concat(schemaNamesString, ") AND \"TABLE_NAME\" NOT IN ('SYS_AFL_GENERATOR_PARAMETERS') AND \"IS_COLUMN_TABLE\" = 'TRUE'");
                         return [4 /*yield*/, this.query(selectTableDropsQuery)];
                     case 3:
                         dropTableQueries = _a.sent();
                         return [4 /*yield*/, Promise.all(dropTableQueries.map(function (q) { return _this.query(q["query"]); }))];
                     case 4:
                         _a.sent();
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.commitTransaction()];
                     case 5:
                         _a.sent();
-                        return [3 /*break*/, 11];
-                    case 6:
-                        error_2 = _a.sent();
-                        _a.label = 7;
+                        _a.label = 6;
+                    case 6: return [3 /*break*/, 13];
                     case 7:
-                        _a.trys.push([7, 9, , 10]);
-                        return [4 /*yield*/, this.rollbackTransaction()];
+                        error_2 = _a.sent();
+                        _a.label = 8;
                     case 8:
-                        _a.sent();
-                        return [3 /*break*/, 10];
+                        _a.trys.push([8, 11, , 12]);
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 10];
+                        return [4 /*yield*/, this.rollbackTransaction()];
                     case 9:
+                        _a.sent();
+                        _a.label = 10;
+                    case 10: return [3 /*break*/, 12];
+                    case 11:
                         rollbackError_1 = _a.sent();
-                        return [3 /*break*/, 10];
-                    case 10: throw error_2;
-                    case 11: return [2 /*return*/];
+                        return [3 /*break*/, 12];
+                    case 12: throw error_2;
+                    case 13: return [2 /*return*/];
                 }
             });
         });
@@ -2031,9 +2037,9 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             if (!schema) {
                                 schema = currentSchema;
                             }
-                            return "(\"t\".\"schema\" = '" + schema + "' AND \"t\".\"name\" = '" + name + "')";
+                            return "(\"t\".\"schema\" = '".concat(schema, "' AND \"t\".\"name\" = '").concat(name, "')");
                         }).join(" OR ");
-                        query = "SELECT \"t\".* FROM " + this.escapePath(this.getTypeormMetadataTableName()) + " \"t\" WHERE \"t\".\"type\" = '" + MetadataTableType_1.MetadataTableType.VIEW + "' " + (viewsCondition ? "AND (" + viewsCondition + ")" : "");
+                        query = "SELECT \"t\".* FROM ".concat(this.escapePath(this.getTypeormMetadataTableName()), " \"t\" WHERE \"t\".\"type\" = '").concat(MetadataTableType_1.MetadataTableType.VIEW, "' ").concat(viewsCondition ? "AND (".concat(viewsCondition, ")") : "");
                         return [4 /*yield*/, this.query(query)];
                     case 4:
                         dbViews = _a.sent();
@@ -2086,7 +2092,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                                 name = schema;
                                 schema = _this.driver.options.schema || currentSchema;
                             }
-                            return "(\"SCHEMA_NAME\" = '" + schema + "' AND \"TABLE_NAME\" = '" + name + "')";
+                            return "(\"SCHEMA_NAME\" = '".concat(schema, "' AND \"TABLE_NAME\" = '").concat(name, "')");
                         }).join(" OR ");
                         tablesSql = "SELECT \"SCHEMA_NAME\", \"TABLE_NAME\" FROM \"SYS\".\"TABLES\" WHERE " + tablesCondition;
                         _f = (_e = dbTables.push).apply;
@@ -2102,26 +2108,26 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             return [2 /*return*/, []];
                         columnsCondition = dbTables.map(function (_a) {
                             var SCHEMA_NAME = _a.SCHEMA_NAME, TABLE_NAME = _a.TABLE_NAME;
-                            return "(\"SCHEMA_NAME\" = '" + SCHEMA_NAME + "' AND \"TABLE_NAME\" = '" + TABLE_NAME + "')";
+                            return "(\"SCHEMA_NAME\" = '".concat(SCHEMA_NAME, "' AND \"TABLE_NAME\" = '").concat(TABLE_NAME, "')");
                         }).join(" OR ");
                         columnsSql = "SELECT * FROM \"SYS\".\"TABLE_COLUMNS\" WHERE " + columnsCondition + " ORDER BY \"POSITION\"";
                         constraintsCondition = dbTables.map(function (_a) {
                             var SCHEMA_NAME = _a.SCHEMA_NAME, TABLE_NAME = _a.TABLE_NAME;
-                            return "(\"SCHEMA_NAME\" = '" + SCHEMA_NAME + "' AND \"TABLE_NAME\" = '" + TABLE_NAME + "')";
+                            return "(\"SCHEMA_NAME\" = '".concat(SCHEMA_NAME, "' AND \"TABLE_NAME\" = '").concat(TABLE_NAME, "')");
                         }).join(" OR ");
-                        constraintsSql = "SELECT * FROM \"SYS\".\"CONSTRAINTS\" WHERE (" + constraintsCondition + ") ORDER BY \"POSITION\"";
+                        constraintsSql = "SELECT * FROM \"SYS\".\"CONSTRAINTS\" WHERE (".concat(constraintsCondition, ") ORDER BY \"POSITION\"");
                         indicesCondition = dbTables.map(function (_a) {
                             var SCHEMA_NAME = _a.SCHEMA_NAME, TABLE_NAME = _a.TABLE_NAME;
-                            return "(\"I\".\"SCHEMA_NAME\" = '" + SCHEMA_NAME + "' AND \"I\".\"TABLE_NAME\" = '" + TABLE_NAME + "')";
+                            return "(\"I\".\"SCHEMA_NAME\" = '".concat(SCHEMA_NAME, "' AND \"I\".\"TABLE_NAME\" = '").concat(TABLE_NAME, "')");
                         }).join(" OR ");
                         indicesSql = "SELECT \"I\".\"INDEX_TYPE\", \"I\".\"SCHEMA_NAME\", \"I\".\"TABLE_NAME\", \"I\".\"INDEX_NAME\", \"IC\".\"COLUMN_NAME\", \"I\".\"CONSTRAINT\" " +
                             "FROM \"SYS\".\"INDEXES\" \"I\" INNER JOIN \"SYS\".\"INDEX_COLUMNS\" \"IC\" ON \"IC\".\"INDEX_OID\" = \"I\".\"INDEX_OID\" " +
-                            ("WHERE (" + indicesCondition + ") AND (\"I\".\"CONSTRAINT\" IS NULL OR \"I\".\"CONSTRAINT\" != 'PRIMARY KEY') AND \"I\".\"INDEX_NAME\" NOT LIKE '%_SYS_FULLTEXT_%' ORDER BY \"IC\".\"POSITION\"");
+                            "WHERE (".concat(indicesCondition, ") AND (\"I\".\"CONSTRAINT\" IS NULL OR \"I\".\"CONSTRAINT\" != 'PRIMARY KEY') AND \"I\".\"INDEX_NAME\" NOT LIKE '%_SYS_FULLTEXT_%' ORDER BY \"IC\".\"POSITION\"");
                         foreignKeysCondition = dbTables.map(function (_a) {
                             var SCHEMA_NAME = _a.SCHEMA_NAME, TABLE_NAME = _a.TABLE_NAME;
-                            return "(\"SCHEMA_NAME\" = '" + SCHEMA_NAME + "' AND \"TABLE_NAME\" = '" + TABLE_NAME + "')";
+                            return "(\"SCHEMA_NAME\" = '".concat(SCHEMA_NAME, "' AND \"TABLE_NAME\" = '").concat(TABLE_NAME, "')");
                         }).join(" OR ");
-                        foreignKeysSql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE (" + foreignKeysCondition + ") ORDER BY \"POSITION\"";
+                        foreignKeysSql = "SELECT * FROM \"SYS\".\"REFERENTIAL_CONSTRAINTS\" WHERE (".concat(foreignKeysCondition, ") ORDER BY \"POSITION\"");
                         return [4 /*yield*/, Promise.all([
                                 this.query(columnsSql),
                                 this.query(constraintsSql),
@@ -2216,7 +2222,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                                                         else {
                                                             if (tableColumn.type === "char" || tableColumn.type === "nchar" || tableColumn.type === "varchar" ||
                                                                 tableColumn.type === "nvarchar" || tableColumn.type === "alphanum" || tableColumn.type === "shorttext") {
-                                                                tableColumn.default = "'" + dbColumn["DEFAULT_VALUE"] + "'";
+                                                                tableColumn.default = "'".concat(dbColumn["DEFAULT_VALUE"], "'");
                                                             }
                                                             else if (tableColumn.type === "boolean") {
                                                                 tableColumn.default = dbColumn["DEFAULT_VALUE"] === "1" ? "true" : "false";
@@ -2297,7 +2303,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
     SapQueryRunner.prototype.createTableSql = function (table, createForeignKeys) {
         var _this = this;
         var columnDefinitions = table.columns.map(function (column) { return _this.buildCreateColumnSql(column); }).join(", ");
-        var sql = "CREATE TABLE " + this.escapePath(table) + " (" + columnDefinitions;
+        var sql = "CREATE TABLE ".concat(this.escapePath(table), " (").concat(columnDefinitions);
         // we create unique indexes instead of unique constraints, because SAP HANA does not have unique constraints.
         // if we mark column as Unique, it means that we create UNIQUE INDEX.
         table.columns
@@ -2332,38 +2338,38 @@ var SapQueryRunner = /** @class */ (function (_super) {
         if (table.checks.length > 0) {
             var checksSql = table.checks.map(function (check) {
                 var checkName = check.name ? check.name : _this.connection.namingStrategy.checkConstraintName(table, check.expression);
-                return "CONSTRAINT \"" + checkName + "\" CHECK (" + check.expression + ")";
+                return "CONSTRAINT \"".concat(checkName, "\" CHECK (").concat(check.expression, ")");
             }).join(", ");
-            sql += ", " + checksSql;
+            sql += ", ".concat(checksSql);
         }
         if (table.foreignKeys.length > 0 && createForeignKeys) {
             var foreignKeysSql = table.foreignKeys.map(function (fk) {
-                var columnNames = fk.columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
+                var columnNames = fk.columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
                 if (!fk.name)
                     fk.name = _this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, _this.getTablePath(fk), fk.referencedColumnNames);
-                var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
-                var constraint = "CONSTRAINT \"" + fk.name + "\" FOREIGN KEY (" + columnNames + ") REFERENCES " + _this.escapePath(_this.getTablePath(fk)) + " (" + referencedColumnNames + ")";
+                var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
+                var constraint = "CONSTRAINT \"".concat(fk.name, "\" FOREIGN KEY (").concat(columnNames, ") REFERENCES ").concat(_this.escapePath(_this.getTablePath(fk)), " (").concat(referencedColumnNames, ")");
                 // SAP HANA does not have "NO ACTION" option for FK's
                 if (fk.onDelete) {
                     var onDelete = fk.onDelete === "NO ACTION" ? "RESTRICT" : fk.onDelete;
-                    constraint += " ON DELETE " + onDelete;
+                    constraint += " ON DELETE ".concat(onDelete);
                 }
                 if (fk.onUpdate) {
                     var onUpdate = fk.onUpdate === "NO ACTION" ? "RESTRICT" : fk.onUpdate;
-                    constraint += " ON UPDATE " + onUpdate;
+                    constraint += " ON UPDATE ".concat(onUpdate);
                 }
                 if (fk.deferrable) {
-                    constraint += " " + fk.deferrable;
+                    constraint += " ".concat(fk.deferrable);
                 }
                 return constraint;
             }).join(", ");
-            sql += ", " + foreignKeysSql;
+            sql += ", ".concat(foreignKeysSql);
         }
         var primaryColumns = table.columns.filter(function (column) { return column.isPrimary; });
         if (primaryColumns.length > 0) {
             var primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, primaryColumns.map(function (column) { return column.name; }));
-            var columnNames = primaryColumns.map(function (column) { return "\"" + column.name + "\""; }).join(", ");
-            sql += ", CONSTRAINT \"" + primaryKeyName + "\" PRIMARY KEY (" + columnNames + ")";
+            var columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
+            sql += ", CONSTRAINT \"".concat(primaryKeyName, "\" PRIMARY KEY (").concat(columnNames, ")");
         }
         sql += ")";
         return new Query_1.Query(sql);
@@ -2372,15 +2378,15 @@ var SapQueryRunner = /** @class */ (function (_super) {
      * Builds drop table sql.
      */
     SapQueryRunner.prototype.dropTableSql = function (tableOrName, ifExist) {
-        var query = ifExist ? "DROP TABLE IF EXISTS " + this.escapePath(tableOrName) : "DROP TABLE " + this.escapePath(tableOrName);
+        var query = ifExist ? "DROP TABLE IF EXISTS ".concat(this.escapePath(tableOrName)) : "DROP TABLE ".concat(this.escapePath(tableOrName));
         return new Query_1.Query(query);
     };
     SapQueryRunner.prototype.createViewSql = function (view) {
         if (typeof view.expression === "string") {
-            return new Query_1.Query("CREATE VIEW " + this.escapePath(view) + " AS " + view.expression);
+            return new Query_1.Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression));
         }
         else {
-            return new Query_1.Query("CREATE VIEW " + this.escapePath(view) + " AS " + view.expression(this.connection).getQuery());
+            return new Query_1.Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression(this.connection).getQuery()));
         }
     };
     SapQueryRunner.prototype.insertViewDefinitionSql = function (view) {
@@ -2411,7 +2417,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
      * Builds drop view sql.
      */
     SapQueryRunner.prototype.dropViewSql = function (viewOrPath) {
-        return new Query_1.Query("DROP VIEW " + this.escapePath(viewOrPath));
+        return new Query_1.Query("DROP VIEW ".concat(this.escapePath(viewOrPath)));
     };
     /**
      * Builds remove view sql.
@@ -2434,16 +2440,16 @@ var SapQueryRunner = /** @class */ (function (_super) {
         });
     };
     SapQueryRunner.prototype.addColumnSql = function (table, column) {
-        return "ALTER TABLE " + this.escapePath(table) + " ADD (" + this.buildCreateColumnSql(column) + ")";
+        return "ALTER TABLE ".concat(this.escapePath(table), " ADD (").concat(this.buildCreateColumnSql(column), ")");
     };
     SapQueryRunner.prototype.dropColumnSql = function (table, column) {
-        return "ALTER TABLE " + this.escapePath(table) + " DROP (\"" + column.name + "\")";
+        return "ALTER TABLE ".concat(this.escapePath(table), " DROP (\"").concat(column.name, "\")");
     };
     /**
      * Builds create index sql.
      */
     SapQueryRunner.prototype.createIndexSql = function (table, index) {
-        var columns = index.columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
+        var columns = index.columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
         var indexType = "";
         if (index.isUnique) {
             indexType += "UNIQUE ";
@@ -2451,7 +2457,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
         if (index.isFulltext) {
             indexType += "FULLTEXT ";
         }
-        return new Query_1.Query("CREATE " + indexType + "INDEX \"" + index.name + "\" ON " + this.escapePath(table) + " (" + columns + ") " + (index.where ? "WHERE " + index.where : ""));
+        return new Query_1.Query("CREATE ".concat(indexType, "INDEX \"").concat(index.name, "\" ON ").concat(this.escapePath(table), " (").concat(columns, ") ").concat(index.where ? "WHERE " + index.where : ""));
     };
     /**
      * Builds drop index sql.
@@ -2460,10 +2466,10 @@ var SapQueryRunner = /** @class */ (function (_super) {
         var indexName = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName.name : indexOrName;
         var parsedTableName = this.driver.parseTableName(table);
         if (!parsedTableName.schema) {
-            return new Query_1.Query("DROP INDEX \"" + indexName + "\"");
+            return new Query_1.Query("DROP INDEX \"".concat(indexName, "\""));
         }
         else {
-            return new Query_1.Query("DROP INDEX \"" + parsedTableName.schema + "\".\"" + indexName + "\"");
+            return new Query_1.Query("DROP INDEX \"".concat(parsedTableName.schema, "\".\"").concat(indexName, "\""));
         }
     };
     /**
@@ -2471,8 +2477,8 @@ var SapQueryRunner = /** @class */ (function (_super) {
      */
     SapQueryRunner.prototype.createPrimaryKeySql = function (table, columnNames) {
         var primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
-        var columnNamesString = columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
-        return new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + primaryKeyName + "\" PRIMARY KEY (" + columnNamesString + ")");
+        var columnNamesString = columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
+        return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(primaryKeyName, "\" PRIMARY KEY (").concat(columnNamesString, ")"));
     };
     /**
      * Builds drop primary key sql.
@@ -2480,20 +2486,20 @@ var SapQueryRunner = /** @class */ (function (_super) {
     SapQueryRunner.prototype.dropPrimaryKeySql = function (table) {
         var columnNames = table.primaryColumns.map(function (column) { return column.name; });
         var primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
-        return new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + primaryKeyName + "\"");
+        return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(primaryKeyName, "\""));
     };
     /**
      * Builds create check constraint sql.
      */
     SapQueryRunner.prototype.createCheckConstraintSql = function (table, checkConstraint) {
-        return new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + checkConstraint.name + "\" CHECK (" + checkConstraint.expression + ")");
+        return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(checkConstraint.name, "\" CHECK (").concat(checkConstraint.expression, ")"));
     };
     /**
      * Builds drop check constraint sql.
      */
     SapQueryRunner.prototype.dropCheckConstraintSql = function (table, checkOrName) {
         var checkName = checkOrName instanceof TableCheck_1.TableCheck ? checkOrName.name : checkOrName;
-        return new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + checkName + "\"");
+        return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(checkName, "\""));
     };
     /**
      * Builds create foreign key sql.
@@ -2501,19 +2507,19 @@ var SapQueryRunner = /** @class */ (function (_super) {
     SapQueryRunner.prototype.createForeignKeySql = function (tableOrName, foreignKey) {
         var columnNames = foreignKey.columnNames.map(function (column) { return "\"" + column + "\""; }).join(", ");
         var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "\"" + column + "\""; }).join(",");
-        var sql = "ALTER TABLE " + this.escapePath(tableOrName) + " ADD CONSTRAINT \"" + foreignKey.name + "\" FOREIGN KEY (" + columnNames + ") " +
-            ("REFERENCES " + this.escapePath(this.getTablePath(foreignKey)) + "(" + referencedColumnNames + ")");
+        var sql = "ALTER TABLE ".concat(this.escapePath(tableOrName), " ADD CONSTRAINT \"").concat(foreignKey.name, "\" FOREIGN KEY (").concat(columnNames, ") ") +
+            "REFERENCES ".concat(this.escapePath(this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
         // SAP HANA does not have "NO ACTION" option for FK's
         if (foreignKey.onDelete) {
             var onDelete = foreignKey.onDelete === "NO ACTION" ? "RESTRICT" : foreignKey.onDelete;
-            sql += " ON DELETE " + onDelete;
+            sql += " ON DELETE ".concat(onDelete);
         }
         if (foreignKey.onUpdate) {
             var onUpdate = foreignKey.onUpdate === "NO ACTION" ? "RESTRICT" : foreignKey.onUpdate;
-            sql += " ON UPDATE " + onUpdate;
+            sql += " ON UPDATE ".concat(onUpdate);
         }
         if (foreignKey.deferrable) {
-            sql += " " + foreignKey.deferrable;
+            sql += " ".concat(foreignKey.deferrable);
         }
         return new Query_1.Query(sql);
     };
@@ -2522,7 +2528,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
      */
     SapQueryRunner.prototype.dropForeignKeySql = function (tableOrName, foreignKeyOrName) {
         var foreignKeyName = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey ? foreignKeyOrName.name : foreignKeyOrName;
-        return new Query_1.Query("ALTER TABLE " + this.escapePath(tableOrName) + " DROP CONSTRAINT \"" + foreignKeyName + "\"");
+        return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(tableOrName), " DROP CONSTRAINT \"").concat(foreignKeyName, "\""));
     };
     /**
      * Escapes given table or view path.
@@ -2530,9 +2536,9 @@ var SapQueryRunner = /** @class */ (function (_super) {
     SapQueryRunner.prototype.escapePath = function (target) {
         var _a = this.driver.parseTableName(target), schema = _a.schema, tableName = _a.tableName;
         if (schema) {
-            return "\"" + schema + "\".\"" + tableName + "\"";
+            return "\"".concat(schema, "\".\"").concat(tableName, "\"");
         }
-        return "\"" + tableName + "\"";
+        return "\"".concat(tableName, "\"");
     };
     /**
      * Concat database name and schema name to the foreign key name.
@@ -2563,7 +2569,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
      * Builds a query for create column.
      */
     SapQueryRunner.prototype.buildCreateColumnSql = function (column) {
-        var c = "\"" + column.name + "\" " + this.connection.driver.createFullType(column);
+        var c = "\"".concat(column.name, "\" ") + this.connection.driver.createFullType(column);
         if (column.charset)
             c += " CHARACTER SET " + column.charset;
         if (column.collation)