Skip to content

Commit

Permalink
drop all unnecessary FK references
Browse files Browse the repository at this point in the history
  • Loading branch information
@rugglcon
rugglcon committed Aug 22, 2019
1 parent 0a58c2a commit 48796ea
Show file tree
Hide file tree
Showing 9 changed files with 139 additions and 175 deletions.
30 changes: 15 additions & 15 deletions src/data/migrations/1560478695439-initial.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ import {MigrationInterface, QueryRunner} from 'typeorm';
export class initial1560478695439 implements MigrationInterface {

public async up(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query("CREATE TABLE `token` (`id` int NOT NULL AUTO_INCREMENT, `tokenString` varchar(20) NOT NULL, PRIMARY KEY (`id`)) ENGINE=InnoDB");
await queryRunner.query("CREATE TABLE `user` (`id` int NOT NULL AUTO_INCREMENT, `firstName` varchar(255) NULL DEFAULT null, `lastName` varchar(255) NULL DEFAULT null, `userName` varchar(255) NULL DEFAULT null, `email` varchar(255) NULL DEFAULT null, `password` varchar(255) NULL DEFAULT null, `loggedIn` tinyint NOT NULL DEFAULT 0, `tokenId` int NULL DEFAULT null, UNIQUE INDEX `REL_63301650f99948e1ff5e0af00b` (`tokenId`), PRIMARY KEY (`id`)) ENGINE=InnoDB");
await queryRunner.query("CREATE TABLE `expense` (`id` int NOT NULL AUTO_INCREMENT, `budgetId` int NOT NULL, `title` varchar(255) NULL DEFAULT null, `cost` decimal(2) NOT NULL DEFAULT 0, PRIMARY KEY (`id`)) ENGINE=InnoDB");
await queryRunner.query("CREATE TABLE `budget` (`id` int NOT NULL AUTO_INCREMENT, `ownerId` int NULL DEFAULT null, `name` varchar(255) NULL DEFAULT null, `total` decimal(2) NOT NULL DEFAULT 0, PRIMARY KEY (`id`)) ENGINE=InnoDB");
await queryRunner.query("ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`)");
await queryRunner.query("ALTER TABLE `expense` ADD CONSTRAINT `FK_a09e4ae0273f63ed09f9eae0a30` FOREIGN KEY (`budgetId`) REFERENCES `budget`(`id`)");
await queryRunner.query("ALTER TABLE `budget` ADD CONSTRAINT `FK_854388e7f4b9e910f736dd0c552` FOREIGN KEY (`ownerId`) REFERENCES `user`(`id`)");
await queryRunner.query('CREATE TABLE `token` (`id` int NOT NULL AUTO_INCREMENT, `tokenString` varchar(20) NOT NULL, PRIMARY KEY (`id`)) ENGINE=InnoDB');
await queryRunner.query('CREATE TABLE `user` (`id` int NOT NULL AUTO_INCREMENT, `firstName` varchar(255) NULL DEFAULT null, `lastName` varchar(255) NULL DEFAULT null, `userName` varchar(255) NULL DEFAULT null, `email` varchar(255) NULL DEFAULT null, `password` varchar(255) NULL DEFAULT null, `loggedIn` tinyint NOT NULL DEFAULT 0, `tokenId` int NULL DEFAULT null, UNIQUE INDEX `REL_63301650f99948e1ff5e0af00b` (`tokenId`), PRIMARY KEY (`id`)) ENGINE=InnoDB');
await queryRunner.query('CREATE TABLE `expense` (`id` int NOT NULL AUTO_INCREMENT, `budgetId` int NOT NULL, `title` varchar(255) NULL DEFAULT null, `cost` decimal(2) NOT NULL DEFAULT 0, PRIMARY KEY (`id`)) ENGINE=InnoDB');
await queryRunner.query('CREATE TABLE `budget` (`id` int NOT NULL AUTO_INCREMENT, `ownerId` int NULL DEFAULT null, `name` varchar(255) NULL DEFAULT null, `total` decimal(2) NOT NULL DEFAULT 0, PRIMARY KEY (`id`)) ENGINE=InnoDB');
await queryRunner.query('ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`)');
await queryRunner.query('ALTER TABLE `expense` ADD CONSTRAINT `FK_a09e4ae0273f63ed09f9eae0a30` FOREIGN KEY (`budgetId`) REFERENCES `budget`(`id`)');
await queryRunner.query('ALTER TABLE `budget` ADD CONSTRAINT `FK_854388e7f4b9e910f736dd0c552` FOREIGN KEY (`ownerId`) REFERENCES `user`(`id`)');
}

public async down(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query("ALTER TABLE `budget` DROP FOREIGN KEY `FK_854388e7f4b9e910f736dd0c552`");
await queryRunner.query("ALTER TABLE `expense` DROP FOREIGN KEY `FK_a09e4ae0273f63ed09f9eae0a30`");
await queryRunner.query("ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`");
await queryRunner.query("DROP TABLE `budget`");
await queryRunner.query("DROP TABLE `expense`");
await queryRunner.query("DROP INDEX `REL_63301650f99948e1ff5e0af00b` ON `user`");
await queryRunner.query("DROP TABLE `user`");
await queryRunner.query("DROP TABLE `token`");
await queryRunner.query('ALTER TABLE `budget` DROP FOREIGN KEY `FK_854388e7f4b9e910f736dd0c552`');
await queryRunner.query('ALTER TABLE `expense` DROP FOREIGN KEY `FK_a09e4ae0273f63ed09f9eae0a30`');
await queryRunner.query('ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`');
await queryRunner.query('DROP TABLE `budget`');
await queryRunner.query('DROP TABLE `expense`');
await queryRunner.query('DROP INDEX `REL_63301650f99948e1ff5e0af00b` ON `user`');
await queryRunner.query('DROP TABLE `user`');
await queryRunner.query('DROP TABLE `token`');
}

}
60 changes: 27 additions & 33 deletions src/data/migrations/1560487421834-changeTokenLength.ts
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,39 @@
import {MigrationInterface, QueryRunner} from "typeorm";
import {MigrationInterface, QueryRunner} from 'typeorm';

export class changeTokenLength1560487421834 implements MigrationInterface {

public async up(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query("ALTER TABLE `token` DROP COLUMN `tokenString`");
await queryRunner.query("ALTER TABLE `token` ADD `tokenString` varchar(35) NOT NULL");
await queryRunner.query("ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`");
await queryRunner.query("ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `tokenId` `tokenId` int NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `expense` CHANGE `cost` `cost` decimal(2) NOT NULL DEFAULT 0");
await queryRunner.query("ALTER TABLE `budget` DROP FOREIGN KEY `FK_854388e7f4b9e910f736dd0c552`");
await queryRunner.query("ALTER TABLE `budget` CHANGE `ownerId` `ownerId` int NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `budget` CHANGE `total` `total` decimal(2) NOT NULL DEFAULT 0");
await queryRunner.query("ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`)");
await queryRunner.query("ALTER TABLE `budget` ADD CONSTRAINT `FK_854388e7f4b9e910f736dd0c552` FOREIGN KEY (`ownerId`) REFERENCES `user`(`id`)");
await queryRunner.query('ALTER TABLE `token` DROP COLUMN `tokenString`');
await queryRunner.query('ALTER TABLE `token` ADD `tokenString` varchar(35) NOT NULL');
await queryRunner.query('ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`');
await queryRunner.query('ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `tokenId` `tokenId` int NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `expense` CHANGE `cost` `cost` decimal(2) NOT NULL DEFAULT 0');
await queryRunner.query('ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `budget` CHANGE `total` `total` decimal(2) NOT NULL DEFAULT 0');
await queryRunner.query('ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`)');
}

public async down(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query("ALTER TABLE `budget` DROP FOREIGN KEY `FK_854388e7f4b9e910f736dd0c552`");
await queryRunner.query("ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`");
await queryRunner.query('ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`');
await queryRunner.query("ALTER TABLE `budget` CHANGE `total` `total` decimal(2,0) NOT NULL DEFAULT '0'");
await queryRunner.query("ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `budget` CHANGE `ownerId` `ownerId` int NULL");
await queryRunner.query("ALTER TABLE `budget` ADD CONSTRAINT `FK_854388e7f4b9e910f736dd0c552` FOREIGN KEY (`ownerId`) REFERENCES `user`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT");
await queryRunner.query('ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL');
await queryRunner.query("ALTER TABLE `expense` CHANGE `cost` `cost` decimal(2,0) NOT NULL DEFAULT '0'");
await queryRunner.query("ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `tokenId` `tokenId` int NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT");
await queryRunner.query("ALTER TABLE `token` DROP COLUMN `tokenString`");
await queryRunner.query("ALTER TABLE `token` ADD `tokenString` varchar(20) NOT NULL");
await queryRunner.query('ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `tokenId` `tokenId` int NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT');
await queryRunner.query('ALTER TABLE `token` DROP COLUMN `tokenString`');
await queryRunner.query('ALTER TABLE `token` ADD `tokenString` varchar(20) NOT NULL');
}

}
52 changes: 23 additions & 29 deletions src/data/migrations/1560578490233-removeToken_replaceWithJWT.ts
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,35 @@
import {MigrationInterface, QueryRunner} from "typeorm";
import {MigrationInterface, QueryRunner} from 'typeorm';

export class removeTokenReplaceWithJWT1560578490233 implements MigrationInterface {

public async up(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query("ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`");
await queryRunner.query("DROP INDEX `REL_63301650f99948e1ff5e0af00b` ON `user`");
await queryRunner.query("ALTER TABLE `user` DROP COLUMN `tokenId`");
await queryRunner.query("ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `expense` CHANGE `cost` `cost` decimal(2) NOT NULL DEFAULT 0");
await queryRunner.query("ALTER TABLE `budget` DROP FOREIGN KEY `FK_854388e7f4b9e910f736dd0c552`");
await queryRunner.query("ALTER TABLE `budget` CHANGE `ownerId` `ownerId` int NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL DEFAULT null");
await queryRunner.query("ALTER TABLE `budget` CHANGE `total` `total` decimal(2) NOT NULL DEFAULT 0");
await queryRunner.query("ALTER TABLE `budget` ADD CONSTRAINT `FK_854388e7f4b9e910f736dd0c552` FOREIGN KEY (`ownerId`) REFERENCES `user`(`id`)");
await queryRunner.query('ALTER TABLE `user` DROP FOREIGN KEY `FK_63301650f99948e1ff5e0af00b5`');
await queryRunner.query('DROP INDEX `REL_63301650f99948e1ff5e0af00b` ON `user`');
await queryRunner.query('ALTER TABLE `user` DROP COLUMN `tokenId`');
await queryRunner.query('ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `expense` CHANGE `cost` `cost` decimal(2) NOT NULL DEFAULT 0');
await queryRunner.query('ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL DEFAULT null');
await queryRunner.query('ALTER TABLE `budget` CHANGE `total` `total` decimal(2) NOT NULL DEFAULT 0');
}

public async down(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query("ALTER TABLE `budget` DROP FOREIGN KEY `FK_854388e7f4b9e910f736dd0c552`");
await queryRunner.query("ALTER TABLE `budget` CHANGE `total` `total` decimal(2,0) NOT NULL DEFAULT '0'");
await queryRunner.query("ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `budget` CHANGE `ownerId` `ownerId` int NULL");
await queryRunner.query("ALTER TABLE `budget` ADD CONSTRAINT `FK_854388e7f4b9e910f736dd0c552` FOREIGN KEY (`ownerId`) REFERENCES `user`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT");
await queryRunner.query('ALTER TABLE `budget` CHANGE `name` `name` varchar(255) NULL');
await queryRunner.query("ALTER TABLE `expense` CHANGE `cost` `cost` decimal(2,0) NOT NULL DEFAULT '0'");
await queryRunner.query("ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL");
await queryRunner.query("ALTER TABLE `user` ADD `tokenId` int NULL");
await queryRunner.query("CREATE UNIQUE INDEX `REL_63301650f99948e1ff5e0af00b` ON `user` (`tokenId`)");
await queryRunner.query("ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT");
await queryRunner.query('ALTER TABLE `expense` CHANGE `title` `title` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `password` `password` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `email` `email` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `userName` `userName` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `lastName` `lastName` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` CHANGE `firstName` `firstName` varchar(255) NULL');
await queryRunner.query('ALTER TABLE `user` ADD `tokenId` int NULL');
await queryRunner.query('CREATE UNIQUE INDEX `REL_63301650f99948e1ff5e0af00b` ON `user` (`tokenId`)');
await queryRunner.query('ALTER TABLE `user` ADD CONSTRAINT `FK_63301650f99948e1ff5e0af00b5` FOREIGN KEY (`tokenId`) REFERENCES `token`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT');
}

}
Loading

0 comments on commit 48796ea

Please sign in to comment.