From e4f076b2b96afd3ef376566edb1570bb0cd47fb0 Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Thu, 4 Jul 2019 13:11:59 +0300
Subject: [PATCH] added onDelete
---
src/draw/coordinate.entity.ts | 4 +++-
src/faction/faction.entity.ts | 12 +++++++++---
src/game/game.entity.ts | 12 +++++++++---
src/task/task.entity.ts | 8 ++++++--
4 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/draw/coordinate.entity.ts b/src/draw/coordinate.entity.ts
index 9cee16c..8f5c4e1 100644
--- a/src/draw/coordinate.entity.ts
+++ b/src/draw/coordinate.entity.ts
@@ -17,7 +17,9 @@ export class MapDrawingEntity {
@Column({ type: 'json', nullable: true }) data: JSON;
- @ManyToOne(type => FactionEntity, faction => faction.mapDrawings)
+ @ManyToOne(type => FactionEntity, faction => faction.mapDrawings, {
+ onDelete: 'CASCADE',
+ })
faction: FactionEntity;
@ManyToOne(type => GameEntity, gameEntity => gameEntity.id)
gameId: GameEntity;
diff --git a/src/faction/faction.entity.ts b/src/faction/faction.entity.ts
index 42f3aca..8bc7548 100644
--- a/src/faction/faction.entity.ts
+++ b/src/faction/faction.entity.ts
@@ -26,11 +26,15 @@ export class FactionEntity {
@Column({ type: 'text' })
factionPassword: string;
- @OneToMany(type => Game_PersonEntity, game_persons => game_persons.faction)
+ @OneToMany(type => Game_PersonEntity, game_persons => game_persons.faction, {
+ onDelete: 'SET NULL',
+ })
game_persons: Game_PersonEntity[];
@ManyToOne(type => GameEntity, game => game.factions)
game: GameEntity;
- @OneToMany(type => MapDrawingEntity, mapDrawings => mapDrawings.faction)
+ @OneToMany(type => MapDrawingEntity, mapDrawings => mapDrawings.faction, {
+ onDelete: 'CASCADE',
+ })
mapDrawings: MapDrawingEntity[];
factionObject() {
@@ -102,6 +106,8 @@ export class GameGroupEntity {
onDelete: 'CASCADE',
})
players: Game_PersonEntity[];
- @ManyToOne(type => FactionEntity, faction => faction.factionId)
+ @ManyToOne(type => FactionEntity, faction => faction.factionId, {
+ onDelete: 'CASCADE',
+ })
faction: FactionEntity;
}
diff --git a/src/game/game.entity.ts b/src/game/game.entity.ts
index 5ff35d5..c4f4e55 100644
--- a/src/game/game.entity.ts
+++ b/src/game/game.entity.ts
@@ -56,7 +56,9 @@ export class GameEntity {
export class Game_PersonEntity {
@PrimaryGeneratedColumn('uuid') gamepersonId: string;
@Column({ type: 'text', nullable: true }) role: string;
- @ManyToOne(type => FactionEntity, faction => faction.game_persons)
+ @ManyToOne(type => FactionEntity, faction => faction.game_persons, {
+ onDelete: 'SET NULL',
+ })
faction: FactionEntity;
@ManyToOne(type => GameEntity, game => game.id)
game: GameEntity;
@@ -90,9 +92,13 @@ export class ObjectivePoint_HistoryEntity {
@PrimaryGeneratedColumn('uuid') oP_HistoryId: string;
@Column({ type: 'timestamp' }) oP_HistoryTimestamp: Timestamp;
@Column('float') action: number;
- @ManyToOne(type => FactionEntity, factionEntity => factionEntity.factionId)
+ @ManyToOne(type => FactionEntity, factionEntity => factionEntity.factionId, {
+ onDelete: 'CASCADE',
+ })
capture: FactionEntity;
- @ManyToOne(type => FactionEntity, factionentity => factionentity.factionId)
+ @ManyToOne(type => FactionEntity, factionentity => factionentity.factionId, {
+ onDelete: 'CASCADE',
+ })
owner: FactionEntity;
@ManyToOne(
type => ObjectivePointEntity,
diff --git a/src/task/task.entity.ts b/src/task/task.entity.ts
index 85ee3c2..c8f7d62 100644
--- a/src/task/task.entity.ts
+++ b/src/task/task.entity.ts
@@ -16,9 +16,13 @@ export class TaskEntity {
@Column({ type: 'text' }) taskDescription: string;
@Column({ type: 'bool' }) taskIsActive: boolean;
- @ManyToOne(type => FactionEntity, faction => faction.factionId)
+ @ManyToOne(type => FactionEntity, faction => faction.factionId, {
+ onDelete: 'CASCADE',
+ })
faction: FactionEntity;
- @ManyToOne(type => FactionEntity, faction => faction.factionId)
+ @ManyToOne(type => FactionEntity, faction => faction.factionId, {
+ onDelete: 'CASCADE',
+ })
taskWinner: FactionEntity;
@ManyToOne(type => GameEntity, game => game.id)
@JoinColumn({ name: 'taskGame' })
--
GitLab