typeorm 0.2.45-dev.96ac8f7 → 0.2.45

package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js

@@ -81,7 +81,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                     case 5:
                         _a.sent();
                         return [3 /*break*/, 8];
-                    case 6: return [4 /*yield*/, this.query("SAVEPOINT typeorm_" + this.transactionDepth)];
+                    case 6: return [4 /*yield*/, this.query("SAVEPOINT typeorm_".concat(this.transactionDepth))];
                     case 7:
                         _a.sent();
                         _a.label = 8;
@@ -110,7 +110,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                     case 1:
                         _a.sent();
                         if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_" + (this.transactionDepth - 1))];
+                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
                     case 2:
                         _a.sent();
                         return [3 /*break*/, 5];
@@ -144,7 +144,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                     case 1:
                         _a.sent();
                         if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_" + (this.transactionDepth - 1))];
+                        return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
                     case 2:
                         _a.sent();
                         return [3 /*break*/, 5];
@@ -255,7 +255,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             var result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '" + database + "'")];
+                    case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '".concat(database, "'"))];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result.length ? true : false];
@@ -315,7 +315,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         parsedTableName = this.driver.parseTableName(tableOrName);
-                        sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '" + parsedTableName.database + "' AND `TABLE_NAME` = '" + parsedTableName.tableName + "'";
+                        sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "'");
                         return [4 /*yield*/, this.query(sql)];
                     case 1:
                         result = _a.sent();
@@ -335,7 +335,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                     case 0:
                         parsedTableName = this.driver.parseTableName(tableOrName);
                         columnName = column instanceof TableColumn ? column.name : column;
-                        sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '" + parsedTableName.database + "' AND `TABLE_NAME` = '" + parsedTableName.tableName + "' AND `COLUMN_NAME` = '" + columnName + "'";
+                        sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "' AND `COLUMN_NAME` = '").concat(columnName, "'");
                         return [4 /*yield*/, this.query(sql)];
                     case 1:
                         result = _a.sent();
@@ -353,8 +353,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `" + database + "`" : "CREATE DATABASE `" + database + "`";
-                        down = "DROP DATABASE `" + database + "`";
+                        up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `".concat(database, "`") : "CREATE DATABASE `".concat(database, "`");
+                        down = "DROP DATABASE `".concat(database, "`");
                         return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
                     case 1:
                         _a.sent();
@@ -372,8 +372,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        up = ifExist ? "DROP DATABASE IF EXISTS `" + database + "`" : "DROP DATABASE `" + database + "`";
-                        down = "CREATE DATABASE `" + database + "`";
+                        up = ifExist ? "DROP DATABASE IF EXISTS `".concat(database, "`") : "DROP DATABASE `".concat(database, "`");
+                        down = "CREATE DATABASE `".concat(database, "`");
                         return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
                     case 1:
                         _a.sent();
@@ -564,14 +564,14 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         oldTable = _a;
                         newTable = oldTable.clone();
                         database = this.driver.parseTableName(oldTable).database;
-                        newTable.name = database ? database + "." + newTableName : newTableName;
+                        newTable.name = database ? "".concat(database, ".").concat(newTableName) : newTableName;
                         // rename table
-                        upQueries.push(new Query("RENAME TABLE " + this.escapePath(oldTable) + " TO " + this.escapePath(newTable)));
-                        downQueries.push(new Query("RENAME TABLE " + this.escapePath(newTable) + " TO " + this.escapePath(oldTable)));
+                        upQueries.push(new Query("RENAME TABLE ".concat(this.escapePath(oldTable), " TO ").concat(this.escapePath(newTable))));
+                        downQueries.push(new Query("RENAME TABLE ".concat(this.escapePath(newTable), " TO ").concat(this.escapePath(oldTable))));
                         // rename index constraints
                         newTable.indices.forEach(function (index) {
                             // build new constraint name
-                            var columnNames = index.columnNames.map(function (column) { return "`" + column + "`"; }).join(", ");
+                            var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
                             var newIndexName = _this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
                             // build queries
                             var indexType = "";
@@ -581,30 +581,30 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 indexType += "SPATIAL ";
                             if (index.isFulltext)
                                 indexType += "FULLTEXT ";
-                            upQueries.push(new Query("ALTER TABLE " + _this.escapePath(newTable) + " DROP INDEX `" + index.name + "`, ADD " + indexType + "INDEX `" + newIndexName + "` (" + columnNames + ")"));
-                            downQueries.push(new Query("ALTER TABLE " + _this.escapePath(newTable) + " DROP INDEX `" + newIndexName + "`, ADD " + indexType + "INDEX `" + index.name + "` (" + columnNames + ")"));
+                            upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " DROP INDEX `").concat(index.name, "`, ADD ").concat(indexType, "INDEX `").concat(newIndexName, "` (").concat(columnNames, ")")));
+                            downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " DROP INDEX `").concat(newIndexName, "`, ADD ").concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")")));
                             // replace constraint name
                             index.name = newIndexName;
                         });
                         // rename foreign key constraint
                         newTable.foreignKeys.forEach(function (foreignKey) {
                             // build new constraint name
-                            var columnNames = foreignKey.columnNames.map(function (column) { return "`" + column + "`"; }).join(", ");
-                            var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`" + column + "`"; }).join(",");
+                            var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
+                            var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
                             var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames);
                             // build queries
-                            var up = "ALTER TABLE " + _this.escapePath(newTable) + " DROP FOREIGN KEY `" + foreignKey.name + "`, ADD CONSTRAINT `" + newForeignKeyName + "` FOREIGN KEY (" + columnNames + ") " +
-                                ("REFERENCES " + _this.escapePath(_this.getTablePath(foreignKey)) + "(" + referencedColumnNames + ")");
+                            var up = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
+                                "REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
                             if (foreignKey.onDelete)
-                                up += " ON DELETE " + foreignKey.onDelete;
+                                up += " ON DELETE ".concat(foreignKey.onDelete);
                             if (foreignKey.onUpdate)
-                                up += " ON UPDATE " + foreignKey.onUpdate;
-                            var down = "ALTER TABLE " + _this.escapePath(newTable) + " DROP FOREIGN KEY `" + newForeignKeyName + "`, ADD CONSTRAINT `" + foreignKey.name + "` FOREIGN KEY (" + columnNames + ") " +
-                                ("REFERENCES " + _this.escapePath(_this.getTablePath(foreignKey)) + "(" + referencedColumnNames + ")");
+                                up += " ON UPDATE ".concat(foreignKey.onUpdate);
+                            var down = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
+                                "REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
                             if (foreignKey.onDelete)
-                                down += " ON DELETE " + foreignKey.onDelete;
+                                down += " ON DELETE ".concat(foreignKey.onDelete);
                             if (foreignKey.onUpdate)
-                                down += " ON UPDATE " + foreignKey.onUpdate;
+                                down += " ON UPDATE ".concat(foreignKey.onUpdate);
                             upQueries.push(new Query(up));
                             downQueries.push(new Query(down));
                             // replace constraint name
@@ -643,8 +643,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         upQueries = [];
                         downQueries = [];
                         skipColumnLevelPrimary = clonedTable.primaryColumns.length > 0;
-                        upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD " + this.buildCreateColumnSql(column, skipColumnLevelPrimary, false)));
-                        downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP COLUMN `" + column.name + "`"));
+                        upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, skipColumnLevelPrimary, false))));
+                        downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
                         // create or update primary key constraint
                         if (column.isPrimary && skipColumnLevelPrimary) {
                             generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
@@ -652,24 +652,24 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 nonGeneratedColumn = generatedColumn.clone();
                                 nonGeneratedColumn.isGenerated = false;
                                 nonGeneratedColumn.generationStrategy = undefined;
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + column.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(column, true)));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
                             }
                             primaryColumns = clonedTable.primaryColumns;
-                            columnNames = primaryColumns.map(function (column) { return "`" + column.name + "`"; }).join(", ");
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY"));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNames + ")"));
+                            columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
                             primaryColumns.push(column);
-                            columnNames = primaryColumns.map(function (column) { return "`" + column.name + "`"; }).join(", ");
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNames + ")"));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY"));
+                            columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
                             // if we previously dropped AUTO_INCREMENT property, we must bring it back
                             if (generatedColumn) {
                                 nonGeneratedColumn = generatedColumn.clone();
                                 nonGeneratedColumn.isGenerated = false;
                                 nonGeneratedColumn.generationStrategy = undefined;
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(column, true)));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + column.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
                             }
                         }
                         columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
@@ -688,8 +688,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 name: uniqueIndex.name,
                                 columnNames: uniqueIndex.columnNames
                             }));
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD UNIQUE INDEX `" + uniqueIndex.name + "` (`" + column.name + "`)"));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP INDEX `" + uniqueIndex.name + "`"));
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(column.name, "`)")));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
                         }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
                     case 4:
@@ -760,7 +760,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         oldColumn = oldTableColumnOrName instanceof TableColumn ? oldTableColumnOrName : table.columns.find(function (c) { return c.name === oldTableColumnOrName; });
                         if (!oldColumn)
-                            throw new TypeORMError("Column \"" + oldTableColumnOrName + "\" was not found in the \"" + table.name + "\" table.");
+                            throw new TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
                         newColumn = undefined;
                         if (newTableColumnOrName instanceof TableColumn) {
                             newColumn = newTableColumnOrName;
@@ -803,7 +803,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             ? oldColumnOrName
                             : table.columns.find(function (column) { return column.name === oldColumnOrName; });
                         if (!oldColumn)
-                            throw new TypeORMError("Column \"" + oldColumnOrName + "\" was not found in the \"" + table.name + "\" table.");
+                            throw new TypeORMError("Column \"".concat(oldColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
                         if (!((newColumn.isGenerated !== oldColumn.isGenerated && newColumn.generationStrategy !== "uuid")
                             || oldColumn.type !== newColumn.type
                             || oldColumn.length !== newColumn.length
@@ -820,14 +820,14 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                     case 6:
                         if (newColumn.name !== oldColumn.name) {
                             // We don't change any column properties, just rename it.
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + oldColumn.name + "` `" + newColumn.name + "` " + this.buildCreateColumnSql(oldColumn, true, true)));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + newColumn.name + "` `" + oldColumn.name + "` " + this.buildCreateColumnSql(oldColumn, true, true)));
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(oldColumn.name, "` `").concat(newColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true, true))));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newColumn.name, "` `").concat(oldColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true, true))));
                             // rename index constraints
                             clonedTable.findColumnIndices(oldColumn).forEach(function (index) {
                                 // build new constraint name
                                 index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
                                 index.columnNames.push(newColumn.name);
-                                var columnNames = index.columnNames.map(function (column) { return "`" + column + "`"; }).join(", ");
+                                var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
                                 var newIndexName = _this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
                                 // build queries
                                 var indexType = "";
@@ -837,8 +837,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                     indexType += "SPATIAL ";
                                 if (index.isFulltext)
                                     indexType += "FULLTEXT ";
-                                upQueries.push(new Query("ALTER TABLE " + _this.escapePath(table) + " DROP INDEX `" + index.name + "`, ADD " + indexType + "INDEX `" + newIndexName + "` (" + columnNames + ")"));
-                                downQueries.push(new Query("ALTER TABLE " + _this.escapePath(table) + " DROP INDEX `" + newIndexName + "`, ADD " + indexType + "INDEX `" + index.name + "` (" + columnNames + ")"));
+                                upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " DROP INDEX `").concat(index.name, "`, ADD ").concat(indexType, "INDEX `").concat(newIndexName, "` (").concat(columnNames, ")")));
+                                downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " DROP INDEX `").concat(newIndexName, "`, ADD ").concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")")));
                                 // replace constraint name
                                 index.name = newIndexName;
                             });
@@ -847,22 +847,22 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 // build new constraint name
                                 foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
                                 foreignKey.columnNames.push(newColumn.name);
-                                var columnNames = foreignKey.columnNames.map(function (column) { return "`" + column + "`"; }).join(", ");
-                                var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`" + column + "`"; }).join(",");
+                                var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
+                                var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
                                 var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames);
                                 // build queries
-                                var up = "ALTER TABLE " + _this.escapePath(table) + " DROP FOREIGN KEY `" + foreignKey.name + "`, ADD CONSTRAINT `" + newForeignKeyName + "` FOREIGN KEY (" + columnNames + ") " +
-                                    ("REFERENCES " + _this.escapePath(_this.getTablePath(foreignKey)) + "(" + referencedColumnNames + ")");
+                                var up = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
+                                    "REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
                                 if (foreignKey.onDelete)
-                                    up += " ON DELETE " + foreignKey.onDelete;
+                                    up += " ON DELETE ".concat(foreignKey.onDelete);
                                 if (foreignKey.onUpdate)
-                                    up += " ON UPDATE " + foreignKey.onUpdate;
-                                var down = "ALTER TABLE " + _this.escapePath(table) + " DROP FOREIGN KEY `" + newForeignKeyName + "`, ADD CONSTRAINT `" + foreignKey.name + "` FOREIGN KEY (" + columnNames + ") " +
-                                    ("REFERENCES " + _this.escapePath(_this.getTablePath(foreignKey)) + "(" + referencedColumnNames + ")");
+                                    up += " ON UPDATE ".concat(foreignKey.onUpdate);
+                                var down = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
+                                    "REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
                                 if (foreignKey.onDelete)
-                                    down += " ON DELETE " + foreignKey.onDelete;
+                                    down += " ON DELETE ".concat(foreignKey.onDelete);
                                 if (foreignKey.onUpdate)
-                                    down += " ON UPDATE " + foreignKey.onUpdate;
+                                    down += " ON UPDATE ".concat(foreignKey.onUpdate);
                                 upQueries.push(new Query(up));
                                 downQueries.push(new Query(down));
                                 // replace constraint name
@@ -873,8 +873,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             oldColumn.name = newColumn.name;
                         }
                         if (this.isColumnChanged(oldColumn, newColumn, true)) {
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + oldColumn.name + "` " + this.buildCreateColumnSql(newColumn, true)));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + newColumn.name + "` " + this.buildCreateColumnSql(oldColumn, true)));
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(oldColumn.name, "` ").concat(this.buildCreateColumnSql(newColumn, true))));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true))));
                         }
                         if (newColumn.isPrimary !== oldColumn.isPrimary) {
                             generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
@@ -882,23 +882,23 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 nonGeneratedColumn = generatedColumn.clone();
                                 nonGeneratedColumn.isGenerated = false;
                                 nonGeneratedColumn.generationStrategy = undefined;
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + generatedColumn.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(generatedColumn, true)));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
                             }
                             primaryColumns = clonedTable.primaryColumns;
                             // if primary column state changed, we must always drop existed constraint.
                             if (primaryColumns.length > 0) {
-                                columnNames = primaryColumns.map(function (column) { return "`" + column.name + "`"; }).join(", ");
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY"));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNames + ")"));
+                                columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD 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;
-                                columnNames = primaryColumns.map(function (column) { return "`" + column.name + "`"; }).join(", ");
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNames + ")"));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY"));
+                                columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
                             }
                             else {
                                 primaryColumn = primaryColumns.find(function (c) { return c.name === newColumn.name; });
@@ -907,9 +907,9 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 column.isPrimary = false;
                                 // if we have another primary keys, we must recreate constraint.
                                 if (primaryColumns.length > 0) {
-                                    columnNames = primaryColumns.map(function (column) { return "`" + column.name + "`"; }).join(", ");
-                                    upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNames + ")"));
-                                    downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY"));
+                                    columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
+                                    upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
+                                    downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
                                 }
                             }
                             // if we have generated column, and we dropped AUTO_INCREMENT property before, we must bring it back
@@ -917,8 +917,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 nonGeneratedColumn = generatedColumn.clone();
                                 nonGeneratedColumn.isGenerated = false;
                                 nonGeneratedColumn.generationStrategy = undefined;
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(generatedColumn, true)));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + generatedColumn.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
                             }
                         }
                         if (newColumn.isUnique !== oldColumn.isUnique) {
@@ -933,8 +933,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                     name: uniqueIndex.name,
                                     columnNames: uniqueIndex.columnNames
                                 }));
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD UNIQUE INDEX `" + uniqueIndex.name + "` (`" + newColumn.name + "`)"));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP INDEX `" + uniqueIndex.name + "`"));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(newColumn.name, "`)")));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
                             }
                             else {
                                 uniqueIndex_1 = clonedTable.indices.find(function (index) {
@@ -943,8 +943,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 clonedTable.indices.splice(clonedTable.indices.indexOf(uniqueIndex_1), 1);
                                 tableUnique = clonedTable.uniques.find(function (unique) { return unique.name === uniqueIndex_1.name; });
                                 clonedTable.uniques.splice(clonedTable.uniques.indexOf(tableUnique), 1);
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP INDEX `" + uniqueIndex_1.name + "`"));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD UNIQUE INDEX `" + uniqueIndex_1.name + "` (`" + newColumn.name + "`)"));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex_1.name, "`")));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex_1.name, "` (`").concat(newColumn.name, "`)")));
                             }
                         }
                         _b.label = 7;
@@ -1016,7 +1016,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         column = columnOrName instanceof TableColumn ? columnOrName : table.findColumnByName(columnOrName);
                         if (!column)
-                            throw new TypeORMError("Column \"" + columnOrName + "\" was not found in table \"" + table.name + "\"");
+                            throw new TypeORMError("Column \"".concat(columnOrName, "\" was not found in table \"").concat(table.name, "\""));
                         clonedTable = table.clone();
                         upQueries = [];
                         downQueries = [];
@@ -1027,27 +1027,27 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 nonGeneratedColumn = generatedColumn.clone();
                                 nonGeneratedColumn.isGenerated = false;
                                 nonGeneratedColumn.generationStrategy = undefined;
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + generatedColumn.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(generatedColumn, true)));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
                             }
-                            columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`" + primaryColumn.name + "`"; }).join(", ");
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(clonedTable) + " DROP PRIMARY KEY"));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(clonedTable) + " ADD PRIMARY KEY (" + columnNames + ")"));
+                            columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD 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) {
-                                columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`" + primaryColumn.name + "`"; }).join(", ");
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(clonedTable) + " ADD PRIMARY KEY (" + columnNames_1 + ")"));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(clonedTable) + " DROP PRIMARY KEY"));
+                                columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD PRIMARY KEY (").concat(columnNames_1, ")")));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
                             }
                             // if we have generated column, and we dropped AUTO_INCREMENT property before, and this column is not current dropping column, we must bring it back
                             if (generatedColumn && generatedColumn.name !== column.name) {
                                 nonGeneratedColumn = generatedColumn.clone();
                                 nonGeneratedColumn.isGenerated = false;
                                 nonGeneratedColumn.generationStrategy = undefined;
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(generatedColumn, true)));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + generatedColumn.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
+                                upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
+                                downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
                             }
                         }
                         columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
@@ -1065,11 +1065,11 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             foundIndex = clonedTable.indices.find(function (index) { return index.name === indexName_1; });
                             if (foundIndex)
                                 clonedTable.indices.splice(clonedTable.indices.indexOf(foundIndex), 1);
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP INDEX `" + indexName_1 + "`"));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD UNIQUE INDEX `" + indexName_1 + "` (`" + column.name + "`)"));
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(indexName_1, "`")));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(indexName_1, "` (`").concat(column.name, "`)")));
                         }
-                        upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP COLUMN `" + column.name + "`"));
-                        downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD " + this.buildCreateColumnSql(column, true)));
+                        upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
+                        downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, true))));
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
                     case 4:
                         _b.sent();
@@ -1180,29 +1180,29 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             nonGeneratedColumn = generatedColumn.clone();
                             nonGeneratedColumn.isGenerated = false;
                             nonGeneratedColumn.generationStrategy = undefined;
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + generatedColumn.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(generatedColumn, true)));
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
                         }
                         primaryColumns = clonedTable.primaryColumns;
                         if (primaryColumns.length > 0) {
-                            columnNames_2 = primaryColumns.map(function (column) { return "`" + column.name + "`"; }).join(", ");
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY"));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNames_2 + ")"));
+                            columnNames_2 = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames_2, ")")));
                         }
                         // update columns in table.
                         clonedTable.columns
                             .filter(function (column) { return columnNames.indexOf(column.name) !== -1; })
                             .forEach(function (column) { return column.isPrimary = true; });
-                        columnNamesString = columnNames.map(function (columnName) { return "`" + columnName + "`"; }).join(", ");
-                        upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNamesString + ")"));
-                        downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY"));
+                        columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
+                        upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")")));
+                        downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
                         newOrExistGeneratedColumn = generatedColumn ? generatedColumn : columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
                         if (newOrExistGeneratedColumn) {
                             nonGeneratedColumn = newOrExistGeneratedColumn.clone();
                             nonGeneratedColumn.isGenerated = false;
                             nonGeneratedColumn.generationStrategy = undefined;
-                            upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + nonGeneratedColumn.name + "` " + this.buildCreateColumnSql(newOrExistGeneratedColumn, true)));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + newOrExistGeneratedColumn.name + "` " + this.buildCreateColumnSql(nonGeneratedColumn, true)));
+                            upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(newOrExistGeneratedColumn, true))));
+                            downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newOrExistGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
                             changedGeneratedColumn = clonedTable.columns.find(function (column) { return column.name === newOrExistGeneratedColumn.name; });
                             changedGeneratedColumn.isGenerated = true;
                             changedGeneratedColumn.generationStrategy = "increment";
@@ -1438,7 +1438,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         foreignKey = foreignKeyOrName instanceof TableForeignKey ? foreignKeyOrName : table.foreignKeys.find(function (fk) { return fk.name === foreignKeyOrName; });
                         if (!foreignKey)
-                            throw new TypeORMError("Supplied foreign key was not found in table " + table.name);
+                            throw new 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)];
@@ -1540,7 +1540,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         index = indexOrName instanceof TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
                         if (!index)
-                            throw new TypeORMError("Supplied index " + indexOrName + " was not found in table " + table.name);
+                            throw new 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)];
@@ -1579,7 +1579,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE " + this.escapePath(tableOrName))];
+                    case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE ".concat(this.escapePath(tableOrName)))];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1594,7 +1594,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      */
     AuroraDataApiQueryRunner.prototype.clearDatabase = function (database) {
         return __awaiter(this, void 0, void 0, function () {
-            var dbName, isDatabaseExist, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_1, rollbackError_1;
+            var dbName, isDatabaseExist, isAnotherTransactionActive, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_1, rollbackError_1;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1608,13 +1608,16 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             return [2 /*return*/, Promise.resolve()];
                         return [3 /*break*/, 3];
                     case 2: throw new TypeORMError("Can not clear database. No database is specified");
-                    case 3: return [4 /*yield*/, this.startTransaction()];
+                    case 3:
+                        isAnotherTransactionActive = this.isTransactionActive;
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.startTransaction()];
                     case 4:
                         _a.sent();
                         _a.label = 5;
                     case 5:
-                        _a.trys.push([5, 13, , 18]);
-                        selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '" + dbName + "'";
+                        _a.trys.push([5, 14, , 20]);
+                        selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
                         return [4 /*yield*/, this.query(selectViewDropsQuery)];
                     case 6:
                         dropViewQueries = _a.sent();
@@ -1622,7 +1625,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                     case 7:
                         _a.sent();
                         disableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 0;";
-                        dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '" + dbName + "'";
+                        dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
                         enableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 1;";
                         return [4 /*yield*/, this.query(disableForeignKeysCheckQuery)];
                     case 8:
@@ -1636,24 +1639,28 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.query(enableForeignKeysCheckQuery)];
                     case 11:
                         _a.sent();
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.commitTransaction()];
                     case 12:
                         _a.sent();
-                        return [3 /*break*/, 18];
-                    case 13:
-                        error_1 = _a.sent();
-                        _a.label = 14;
+                        _a.label = 13;
+                    case 13: return [3 /*break*/, 20];
                     case 14:
-                        _a.trys.push([14, 16, , 17]);
-                        return [4 /*yield*/, this.rollbackTransaction()];
+                        error_1 = _a.sent();
+                        _a.label = 15;
                     case 15:
-                        _a.sent();
-                        return [3 /*break*/, 17];
+                        _a.trys.push([15, 18, , 19]);
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 17];
+                        return [4 /*yield*/, this.rollbackTransaction()];
                     case 16:
+                        _a.sent();
+                        _a.label = 17;
+                    case 17: return [3 /*break*/, 19];
+                    case 18:
                         rollbackError_1 = _a.sent();
-                        return [3 /*break*/, 17];
-                    case 17: throw error_1;
-                    case 18: return [2 /*return*/];
+                        return [3 /*break*/, 19];
+                    case 19: throw error_1;
+                    case 20: return [2 /*return*/];
                 }
             });
         });
@@ -1684,10 +1691,10 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             if (!database) {
                                 database = currentDatabase;
                             }
-                            return "(`t`.`schema` = '" + database + "' AND `t`.`name` = '" + name + "')";
+                            return "(`t`.`schema` = '".concat(database, "' AND `t`.`name` = '").concat(name, "')");
                         }).join(" OR ");
-                        query = "SELECT `t`.*, `v`.`check_option` FROM " + this.escapePath(this.getTypeormMetadataTableName()) + " `t` " +
-                            ("INNER JOIN `information_schema`.`views` `v` ON `v`.`table_schema` = `t`.`schema` AND `v`.`table_name` = `t`.`name` WHERE `t`.`type` = '" + MetadataTableType.VIEW + "' " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
+                        query = "SELECT `t`.*, `v`.`check_option` FROM ".concat(this.escapePath(this.getTypeormMetadataTableName()), " `t` ") +
+                            "INNER JOIN `information_schema`.`views` `v` ON `v`.`table_schema` = `t`.`schema` AND `v`.`table_name` = `t`.`name` WHERE `t`.`type` = '".concat(MetadataTableType.VIEW, "' ").concat(viewsCondition ? "AND (".concat(viewsCondition, ")") : "");
                         return [4 /*yield*/, this.query(query)];
                     case 3:
                         dbViews = _a.sent();
@@ -1737,7 +1744,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                 name = database;
                                 database = _this.driver.database || currentDatabase;
                             }
-                            return "(`TABLE_SCHEMA` = '" + database + "' AND `TABLE_NAME` = '" + name + "')";
+                            return "(`TABLE_SCHEMA` = '".concat(database, "' AND `TABLE_NAME` = '").concat(name, "')");
                         }).join(" OR ");
                         tablesSql = "SELECT TABLE_NAME, TABLE_SCHEMA FROM `INFORMATION_SCHEMA`.`TABLES` WHERE " + tablesCondition;
                         _f = (_e = dbTables.push).apply;
@@ -1753,21 +1760,21 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         }
                         columnsCondition = dbTables.map(function (_a) {
                             var TABLE_NAME = _a.TABLE_NAME, TABLE_SCHEMA = _a.TABLE_SCHEMA;
-                            return "(`TABLE_SCHEMA` = '" + TABLE_SCHEMA + "' AND `TABLE_NAME` = '" + TABLE_NAME + "')";
+                            return "(`TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "' AND `TABLE_NAME` = '").concat(TABLE_NAME, "')");
                         }).join(" OR ");
                         columnsSql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE " + columnsCondition;
-                        primaryKeySql = "SELECT * FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` WHERE `CONSTRAINT_NAME` = 'PRIMARY' AND (" + columnsCondition + ")";
+                        primaryKeySql = "SELECT * FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` WHERE `CONSTRAINT_NAME` = 'PRIMARY' AND (".concat(columnsCondition, ")");
                         collationsSql = "SELECT `SCHEMA_NAME`, `DEFAULT_CHARACTER_SET_NAME` as `CHARSET`, `DEFAULT_COLLATION_NAME` AS `COLLATION` FROM `INFORMATION_SCHEMA`.`SCHEMATA`";
                         indicesCondition = dbTables.map(function (_a) {
                             var TABLE_NAME = _a.TABLE_NAME, TABLE_SCHEMA = _a.TABLE_SCHEMA;
-                            return "(`s`.`TABLE_SCHEMA` = '" + TABLE_SCHEMA + "' AND `s`.`TABLE_NAME` = '" + TABLE_NAME + "')";
+                            return "(`s`.`TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "' AND `s`.`TABLE_NAME` = '").concat(TABLE_NAME, "')");
                         }).join(" OR ");
                         indicesSql = "SELECT `s`.* FROM `INFORMATION_SCHEMA`.`STATISTICS` `s` " +
                             "LEFT JOIN `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS` `rc` ON `s`.`INDEX_NAME` = `rc`.`CONSTRAINT_NAME` " +
-                            ("WHERE (" + indicesCondition + ") AND `s`.`INDEX_NAME` != 'PRIMARY' AND `rc`.`CONSTRAINT_NAME` IS NULL");
+                            "WHERE (".concat(indicesCondition, ") AND `s`.`INDEX_NAME` != 'PRIMARY' AND `rc`.`CONSTRAINT_NAME` IS NULL");
                         foreignKeysCondition = dbTables.map(function (_a) {
                             var TABLE_NAME = _a.TABLE_NAME, TABLE_SCHEMA = _a.TABLE_SCHEMA;
-                            return "(`kcu`.`TABLE_SCHEMA` = '" + TABLE_SCHEMA + "' AND `kcu`.`TABLE_NAME` = '" + TABLE_NAME + "')";
+                            return "(`kcu`.`TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "' AND `kcu`.`TABLE_NAME` = '").concat(TABLE_NAME, "')");
                         }).join(" OR ");
                         foreignKeysSql = "SELECT `kcu`.`TABLE_SCHEMA`, `kcu`.`TABLE_NAME`, `kcu`.`CONSTRAINT_NAME`, `kcu`.`COLUMN_NAME`, `kcu`.`REFERENCED_TABLE_SCHEMA`, " +
                             "`kcu`.`REFERENCED_TABLE_NAME`, `kcu`.`REFERENCED_COLUMN_NAME`, `rc`.`DELETE_RULE` `ON_DELETE`, `rc`.`UPDATE_RULE` `ON_UPDATE` " +
@@ -1828,7 +1835,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                             tableColumn.default = undefined;
                                         }
                                         else {
-                                            tableColumn.default = dbColumn["COLUMN_DEFAULT"] === "CURRENT_TIMESTAMP" ? dbColumn["COLUMN_DEFAULT"] : "'" + dbColumn["COLUMN_DEFAULT"] + "'";
+                                            tableColumn.default = dbColumn["COLUMN_DEFAULT"] === "CURRENT_TIMESTAMP" ? dbColumn["COLUMN_DEFAULT"] : "'".concat(dbColumn["COLUMN_DEFAULT"], "'");
                                         }
                                         if (dbColumn["EXTRA"].indexOf("on update") !== -1) {
                                             tableColumn.onUpdate = dbColumn["EXTRA"].substring(dbColumn["EXTRA"].indexOf("on update") + 10);
@@ -1932,7 +1939,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
     AuroraDataApiQueryRunner.prototype.createTableSql = function (table, createForeignKeys) {
         var _this = this;
         var columnDefinitions = table.columns.map(function (column) { return _this.buildCreateColumnSql(column, true); }).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 MySql does not have unique constraints.
         // if we mark column as Unique, it means that we create UNIQUE INDEX.
         table.columns
@@ -1966,7 +1973,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
         }
         if (table.indices.length > 0) {
             var indicesSql = table.indices.map(function (index) {
-                var columnNames = index.columnNames.map(function (columnName) { return "`" + columnName + "`"; }).join(", ");
+                var columnNames = index.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
                 if (!index.name)
                     index.name = _this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
                 var indexType = "";
@@ -1976,44 +1983,44 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                     indexType += "SPATIAL ";
                 if (index.isFulltext)
                     indexType += "FULLTEXT ";
-                return indexType + "INDEX `" + index.name + "` (" + columnNames + ")";
+                return "".concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")");
             }).join(", ");
-            sql += ", " + indicesSql;
+            sql += ", ".concat(indicesSql);
         }
         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);
-                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, ")");
                 if (fk.onDelete)
-                    constraint += " ON DELETE " + fk.onDelete;
+                    constraint += " ON DELETE ".concat(fk.onDelete);
                 if (fk.onUpdate)
-                    constraint += " ON UPDATE " + fk.onUpdate;
+                    constraint += " ON UPDATE ".concat(fk.onUpdate);
                 return constraint;
             }).join(", ");
-            sql += ", " + foreignKeysSql;
+            sql += ", ".concat(foreignKeysSql);
         }
         if (table.primaryColumns.length > 0) {
-            var columnNames = table.primaryColumns.map(function (column) { return "`" + column.name + "`"; }).join(", ");
-            sql += ", PRIMARY KEY (" + columnNames + ")";
+            var columnNames = table.primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
+            sql += ", PRIMARY KEY (".concat(columnNames, ")");
         }
-        sql += ") ENGINE=" + (table.engine || "InnoDB");
+        sql += ") ENGINE=".concat(table.engine || "InnoDB");
         return new Query(sql);
     };
     /**
      * Builds drop table sql
      */
     AuroraDataApiQueryRunner.prototype.dropTableSql = function (tableOrName) {
-        return new Query("DROP TABLE " + this.escapePath(tableOrName));
+        return new Query("DROP TABLE ".concat(this.escapePath(tableOrName)));
     };
     AuroraDataApiQueryRunner.prototype.createViewSql = function (view) {
         if (typeof view.expression === "string") {
-            return new Query("CREATE VIEW " + this.escapePath(view) + " AS " + view.expression);
+            return new Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression));
         }
         else {
-            return new Query("CREATE VIEW " + this.escapePath(view) + " AS " + view.expression(this.connection).getQuery());
+            return new Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression(this.connection).getQuery()));
         }
     };
     AuroraDataApiQueryRunner.prototype.insertViewDefinitionSql = function (view) {
@@ -2039,7 +2046,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      * Builds drop view sql.
      */
     AuroraDataApiQueryRunner.prototype.dropViewSql = function (viewOrPath) {
-        return new Query("DROP VIEW " + this.escapePath(viewOrPath));
+        return new Query("DROP VIEW ".concat(this.escapePath(viewOrPath)));
     };
     /**
      * Builds remove view sql.
@@ -2062,7 +2069,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      * Builds create index sql.
      */
     AuroraDataApiQueryRunner.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 ";
@@ -2070,40 +2077,40 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             indexType += "SPATIAL ";
         if (index.isFulltext)
             indexType += "FULLTEXT ";
-        return new Query("CREATE " + indexType + "INDEX `" + index.name + "` ON " + this.escapePath(table) + " (" + columns + ")");
+        return new Query("CREATE ".concat(indexType, "INDEX `").concat(index.name, "` ON ").concat(this.escapePath(table), " (").concat(columns, ")"));
     };
     /**
      * Builds drop index sql.
      */
     AuroraDataApiQueryRunner.prototype.dropIndexSql = function (table, indexOrName) {
         var indexName = indexOrName instanceof TableIndex ? indexOrName.name : indexOrName;
-        return new Query("DROP INDEX `" + indexName + "` ON " + this.escapePath(table));
+        return new Query("DROP INDEX `".concat(indexName, "` ON ").concat(this.escapePath(table)));
     };
     /**
      * Builds create primary key sql.
      */
     AuroraDataApiQueryRunner.prototype.createPrimaryKeySql = function (table, columnNames) {
-        var columnNamesString = columnNames.map(function (columnName) { return "`" + columnName + "`"; }).join(", ");
-        return new Query("ALTER TABLE " + this.escapePath(table) + " ADD PRIMARY KEY (" + columnNamesString + ")");
+        var columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
+        return new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")"));
     };
     /**
      * Builds drop primary key sql.
      */
     AuroraDataApiQueryRunner.prototype.dropPrimaryKeySql = function (table) {
-        return new Query("ALTER TABLE " + this.escapePath(table) + " DROP PRIMARY KEY");
+        return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY"));
     };
     /**
      * Builds create foreign key sql.
      */
     AuroraDataApiQueryRunner.prototype.createForeignKeySql = function (table, 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(table) + " ADD CONSTRAINT `" + foreignKey.name + "` FOREIGN KEY (" + columnNames + ") " +
-            ("REFERENCES " + this.escapePath(this.getTablePath(foreignKey)) + "(" + referencedColumnNames + ")");
+        var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
+        var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
+        var sql = "ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
+            "REFERENCES ".concat(this.escapePath(this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
         if (foreignKey.onDelete)
-            sql += " ON DELETE " + foreignKey.onDelete;
+            sql += " ON DELETE ".concat(foreignKey.onDelete);
         if (foreignKey.onUpdate)
-            sql += " ON UPDATE " + foreignKey.onUpdate;
+            sql += " ON UPDATE ".concat(foreignKey.onUpdate);
         return new Query(sql);
     };
     /**
@@ -2111,7 +2118,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      */
     AuroraDataApiQueryRunner.prototype.dropForeignKeySql = function (table, foreignKeyOrName) {
         var foreignKeyName = foreignKeyOrName instanceof TableForeignKey ? foreignKeyOrName.name : foreignKeyOrName;
-        return new Query("ALTER TABLE " + this.escapePath(table) + " DROP FOREIGN KEY `" + foreignKeyName + "`");
+        return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKeyName, "`"));
     };
     /**
      * Escapes a given comment so it's safe to include in a query.
@@ -2124,7 +2131,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             .replace(/\\/g, "\\\\") // MySQL allows escaping characters via backslashes
             .replace(/'/g, "''")
             .replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
-        return "'" + comment + "'";
+        return "'".concat(comment, "'");
     };
     /**
      * Escapes given table or view path.
@@ -2132,9 +2139,9 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
     AuroraDataApiQueryRunner.prototype.escapePath = function (target) {
         var _a = this.driver.parseTableName(target), database = _a.database, tableName = _a.tableName;
         if (database && database !== this.driver.database) {
-            return "`" + database + "`.`" + tableName + "`";
+            return "`".concat(database, "`.`").concat(tableName, "`");
         }
-        return "`" + tableName + "`";
+        return "`".concat(tableName, "`");
     };
     /**
      * Builds a part of query to create/change a column.
@@ -2146,10 +2153,10 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             c = this.connection.driver.createFullType(column);
         }
         else {
-            c = "`" + column.name + "` " + this.connection.driver.createFullType(column);
+            c = "`".concat(column.name, "` ").concat(this.connection.driver.createFullType(column));
         }
         if (column.asExpression)
-            c += " AS (" + column.asExpression + ") " + (column.generatedType ? column.generatedType : "VIRTUAL");
+            c += " AS (".concat(column.asExpression, ") ").concat(column.generatedType ? column.generatedType : "VIRTUAL");
         // if you specify ZEROFILL for a numeric column, MySQL automatically adds the UNSIGNED attribute to that column.
         if (column.zerofill) {
             c += " ZEROFILL";
@@ -2158,11 +2165,11 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             c += " UNSIGNED";
         }
         if (column.enum)
-            c += " (" + column.enum.map(function (value) { return "'" + value + "'"; }).join(", ") + ")";
+            c += " (".concat(column.enum.map(function (value) { return "'" + value + "'"; }).join(", "), ")");
         if (column.charset)
-            c += " CHARACTER SET \"" + column.charset + "\"";
+            c += " CHARACTER SET \"".concat(column.charset, "\"");
         if (column.collation)
-            c += " COLLATE \"" + column.collation + "\"";
+            c += " COLLATE \"".concat(column.collation, "\"");
         if (!column.isNullable)
             c += " NOT NULL";
         if (column.isNullable)
@@ -2172,11 +2179,11 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
         if (column.isGenerated && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
             c += " AUTO_INCREMENT";
         if (column.comment)
-            c += " COMMENT " + this.escapeComment(column.comment);
+            c += " COMMENT ".concat(this.escapeComment(column.comment));
         if (column.default !== undefined && column.default !== null)
-            c += " DEFAULT " + column.default;
+            c += " DEFAULT ".concat(column.default);
         if (column.onUpdate)
-            c += " ON UPDATE " + column.onUpdate;
+            c += " ON UPDATE ".concat(column.onUpdate);
         return c;
     };
     /**