ashpie
/
swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Wrap each migration in a transaction

This commit is contained in:
Alice Gaudon 2020-06-04 17:27:05 +02:00
parent 0970ff3116
commit 91b9e51a7d
7 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "wms-core",
"version": "0.5.0",
"version": "0.6.0",
"description": "Node web framework",
"repository": "git@gitlab.com:ArisuOngaku/wms-core.git",
"author": "Alice Gaudon <alice@gaudon.pro>",

12
src/auth/migrations/CreateMagicLinksTable.ts
View File

@ -1,9 +1,9 @@
import Migration from "../../db/Migration";
import {query} from "../../db/MysqlConnectionManager";
import {Connection} from "mysql";
export default class CreateMagicLinksTable extends Migration {
async install(): Promise<void> {
await query('CREATE TABLE magic_links(' +
async install(connection: Connection): Promise<void> {
await this.query('CREATE TABLE magic_links(' +
'id INT NOT NULL AUTO_INCREMENT,' +
'session_id CHAR(32) UNIQUE NOT NULL,' +
'email VARCHAR(254) NOT NULL,' +
@ -13,11 +13,11 @@ export default class CreateMagicLinksTable extends Migration {
'generated_at DATETIME NOT NULL,' +
'authorized BOOLEAN NOT NULL,' +
'PRIMARY KEY(id)' +
')');
')', connection);
}
async rollback(): Promise<void> {
await query('DROP TABLE magic_links');
async rollback(connection: Connection): Promise<void> {
await this.query('DROP TABLE magic_links', connection);
}
}

18
src/auth/migrations/CreateUsersAndUserEmailsTable.ts
View File

@ -1,17 +1,17 @@
import Migration from "../../db/Migration";
import {query} from "../../db/MysqlConnectionManager";
import {Connection} from "mysql";
export default class CreateUsersAndUserEmailsTable extends Migration {
async install(): Promise<void> {
await query('CREATE TABLE users(' +
async install(connection: Connection): Promise<void> {
await this.query('CREATE TABLE users(' +
'id INT NOT NULL AUTO_INCREMENT,' +
'name VARCHAR(64),' +
'is_admin BOOLEAN NOT NULL DEFAULT false,' +
'created_at DATETIME NOT NULL DEFAULT NOW(),' +
'updated_at DATETIME NOT NULL DEFAULT NOW(),' +
'PRIMARY KEY(id)' +
')');
await query('CREATE TABLE user_emails(' +
')', connection);
await this.query('CREATE TABLE user_emails(' +
'id INT NOT NULL AUTO_INCREMENT,' +
'user_id INT,' +
'email VARCHAR(254) UNIQUE NOT NULL,' +
@ -19,11 +19,11 @@ export default class CreateUsersAndUserEmailsTable extends Migration {
'created_at DATETIME NOT NULL DEFAULT NOW(),' +
'PRIMARY KEY(id),' +
'FOREIGN KEY user_fk (user_id) REFERENCES users (id) ON DELETE CASCADE' +
')');
')', connection);
}
async rollback(): Promise<void> {
await query('DROP TABLE user_emails');
await query('DROP TABLE users');
async rollback(connection: Connection): Promise<void> {
await this.query('DROP TABLE user_emails', connection);
await this.query('DROP TABLE users', connection);
}
}

11
src/db/Migration.ts
View File

@ -1,3 +1,6 @@
import {Connection} from "mysql";
import MysqlConnectionManager from "./MysqlConnectionManager";
export default abstract class Migration {
public readonly version: number;
@ -9,7 +12,11 @@ export default abstract class Migration {
return this.version > currentVersion;
}
abstract async install(): Promise<void>;
abstract async install(connection: Connection): Promise<void>;
abstract async rollback(): Promise<void>;
abstract async rollback(connection: Connection): Promise<void>;
protected async query(queryString: string, connection: Connection): Promise<void> {
await MysqlConnectionManager.query(queryString, undefined, connection);
}
}

12
src/db/MysqlConnectionManager.ts
View File

@ -167,11 +167,13 @@ export default class MysqlConnectionManager {
for (const migration of this.migrations) {
if (await migration.shouldRun(currentVersion)) {
Logger.info('Running migration ', migration.version, migration.constructor.name);
await migration.install();
await query('INSERT INTO migrations VALUES(?, ?, NOW())', [
migration.version,
migration.constructor.name,
]);
await MysqlConnectionManager.wrapTransaction<void>(async c => {
await migration.install(c);
await query('INSERT INTO migrations VALUES(?, ?, NOW())', [
migration.version,
migration.constructor.name,
]);
});
}
}
}

12
src/migrations/CreateLogsTable.ts
View File

@ -1,12 +1,12 @@
import Migration from "../db/Migration";
import {query} from "../db/MysqlConnectionManager";
import {Connection} from "mysql";
/**
* Must be the first migration
*/
export default class CreateLogsTable extends Migration {
async install(): Promise<void> {
await query('CREATE TABLE logs(' +
async install(connection: Connection): Promise<void> {
await this.query('CREATE TABLE logs(' +
'id INT NOT NULL AUTO_INCREMENT,' +
'level TINYINT UNSIGNED NOT NULL,' +
'message TEXT NOT NULL,' +
@ -16,10 +16,10 @@ export default class CreateLogsTable extends Migration {
'error_stack TEXT,' +
'created_at DATETIME NOT NULL DEFAULT NOW(),' +
'PRIMARY KEY (id)' +
')');
')', connection);
}
async rollback(): Promise<void> {
await query('DROP TABLE logs');
async rollback(connection: Connection): Promise<void> {
await this.query('DROP TABLE logs', connection);
}
}

11
src/migrations/CreateMigrationsTable.ts
View File

@ -1,4 +1,5 @@
import Migration from "../db/Migration";
import {Connection} from "mysql";
import {query} from "../db/MysqlConnectionManager";
/**
@ -17,16 +18,16 @@ export default class CreateMigrationsTable extends Migration {
return await super.shouldRun(currentVersion);
}
async install(): Promise<void> {
await query('CREATE TABLE migrations(' +
async install(connection: Connection): Promise<void> {
await this.query('CREATE TABLE migrations(' +
'id INT NOT NULL,' +
'name VARCHAR(64) NOT NULL,' +
'migration_date DATE,' +
'PRIMARY KEY (id)' +
')');
')', connection);
}
async rollback(): Promise<void> {
await query('DROP TABLE migrations');
async rollback(connection: Connection): Promise<void> {
await this.query('DROP TABLE migrations', connection);
}
}