diff --git a/package.json b/package.json index e839c8c88..9e48d1beb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "typeorm", "private": true, - "version": "0.1.0-alpha.13", + "version": "0.1.0-alpha.14", "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, WebSQL, MongoDB databases.", "license": "MIT", "readmeFilename": "README.md", diff --git a/src/commands/MigrationGenerateCommand.ts b/src/commands/MigrationGenerateCommand.ts index 7cbe33d17..2e3b45370 100644 --- a/src/commands/MigrationGenerateCommand.ts +++ b/src/commands/MigrationGenerateCommand.ts @@ -58,7 +58,7 @@ export class MigrationGenerateCommand { const connectionOptions = await connectionOptionsReader.get(argv.connection); connection = await createConnection(connectionOptions); const sqls = await connection.logSyncSchema(); - const fileContent = MigrationGenerateCommand.getTemplate(argv.name, timestamp, sqls); + const fileContent = MigrationGenerateCommand.getTemplate(argv.name, timestamp, sqls, connection); await CommandUtils.createFile(process.cwd() + "/" + (directory ? (directory + "/") : "") + filename, fileContent); } catch (err) { @@ -79,13 +79,14 @@ export class MigrationGenerateCommand { /** * Gets contents of the migration file. */ - protected static getTemplate(name: string, timestamp: number, sqlQueries: string[]): string { + protected static getTemplate(name: string, timestamp: number, sqlQueries: string[], connection: Connection): string { return `import {Connection, EntityManager, MigrationInterface, QueryRunner} from "typeorm"; export class ${name}${timestamp} implements MigrationInterface { public async up(queryRunner: QueryRunner, connection: Connection, entityManager?: EntityManager): Promise { - ${sqlQueries.map(query => "queryRunner.query(" + query + ")\r\n")} + ${sqlQueries.map(query => "queryRunner.query(`" + query.replace("`", "\\`") + `\`); +`)} } public async down(queryRunner: QueryRunner, connection: Connection, entityManager?: EntityManager): Promise {