Merge branch 'develop' into feature/#71-settings-store
# Conflicts: # src/data-source.ts
This commit is contained in:
commit
753cfdd5da
8 changed files with 85 additions and 11 deletions
|
@ -1,4 +1,14 @@
|
|||
import { Column, ColumnType, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne, PrimaryColumn } from "typeorm";
|
||||
import {
|
||||
Column,
|
||||
ColumnType,
|
||||
CreateDateColumn,
|
||||
Entity,
|
||||
JoinColumn,
|
||||
ManyToOne,
|
||||
OneToMany,
|
||||
OneToOne,
|
||||
PrimaryColumn,
|
||||
} from "typeorm";
|
||||
import { membership } from "./membership";
|
||||
import { memberAwards } from "./memberAwards";
|
||||
import { memberQualifications } from "./memberQualifications";
|
||||
|
@ -30,6 +40,9 @@ export class member {
|
|||
@Column()
|
||||
salutationId: number;
|
||||
|
||||
@CreateDateColumn()
|
||||
createdAt: Date;
|
||||
|
||||
@ManyToOne(() => salutation, (salutation) => salutation.members, {
|
||||
nullable: false,
|
||||
onDelete: "RESTRICT",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue