archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

fixed migration generation bug

Browse Source
This commit is contained in:
Umed Khudoiberdiev 2017-06-19 15:11:13 +05:00
parent 17580ea15f
commit 83e89fd8c0
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "typeorm",
"private": true,
"version": "0.1.0-alpha.14",
"version": "0.1.0-alpha.17",
"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",

25
src/commands/MigrationGenerateCommand.ts
View File

@ -2,6 +2,7 @@ import {ConnectionOptionsReader} from "../connection/ConnectionOptionsReader";
import {CommandUtils} from "./CommandUtils";
import {Connection} from "../connection/Connection";
import {createConnection} from "../index";
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
const mkdirp = require("mkdirp");
/**
@ -51,15 +52,27 @@ export class MigrationGenerateCommand {
let connection: Connection|undefined = undefined;
try {
process.env.LOGGER_CLI_SCHEMA_SYNC = true;
process.env.LOGGER_CLI_SCHEMA_SYNC = false;
process.env.SKIP_SCHEMA_CREATION = true;
const connectionOptionsReader = new ConnectionOptionsReader({ root: process.cwd(), configName: argv.config });
const connectionOptions = await connectionOptionsReader.get(argv.connection);
connection = await createConnection(connectionOptions);
const sqls = await connection.logSyncSchema();
const fileContent = MigrationGenerateCommand.getTemplate(argv.name, timestamp, sqls, connection);
await CommandUtils.createFile(process.cwd() + "/" + (directory ? (directory + "/") : "") + filename, fileContent);
const sqlQueries = await connection.logSyncSchema();
let contentSqls: string[] = [];
// mysql is exceptional here because it uses ` character in to escape names in queries, thats why for mysql
// we are using simple quoted string instead of template string sytax
if (connection.driver instanceof MysqlDriver) {
contentSqls = sqlQueries.map(query => " await queryRunner.query(\"" + query.replace(new RegExp(`"`, "g"), `\\"`) + "\");");
} else {
contentSqls = sqlQueries.map(query => " await queryRunner.query(`" + query.replace(new RegExp("`", "g"), "\\`") + "`);");
}
const fileContent = MigrationGenerateCommand.getTemplate(argv.name, timestamp, contentSqls);
const path = process.cwd() + "/" + (directory ? (directory + "/") : "") + filename;
await CommandUtils.createFile(path, fileContent);
console.log(`Migration ${path} has been generated successfully.`);
} catch (err) {
if (connection)
@ -79,13 +92,13 @@ export class MigrationGenerateCommand {
/**
* Gets contents of the migration file.
*/
protected static getTemplate(name: string, timestamp: number, sqlQueries: string[], connection: Connection): string {
protected static getTemplate(name: string, timestamp: number, sqls: string[]): 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<any> {
${sqlQueries.map(query => "queryRunner.query(`" + query.replace("`", "\\`") + `\`);
${sqls.join(`
`)}
}