From a0046bc89a9a5d827bbee0509b84c91644d707d7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 28 Feb 2022 12:58:44 +0100 Subject: [PATCH] corrected merge migration namings --- .../Transaction.ts | 59 ------------------- .../Transaction.ts | 0 .../Transaction.ts | 0 ...decimal_types.ts => 0028-decimal_types.ts} | 0 ...ble.ts => 0029-clean_transaction_table.ts} | 0 5 files changed, 59 deletions(-) delete mode 100644 database/entity/0026-clean_transaction_table/Transaction.ts rename database/entity/{0027-decimal_types => 0028-decimal_types}/Transaction.ts (100%) rename database/entity/{0028-clean_transaction_table => 0029-clean_transaction_table}/Transaction.ts (100%) rename database/migrations/{0027-decimal_types.ts => 0028-decimal_types.ts} (100%) rename database/migrations/{0028-clean_transaction_table.ts => 0029-clean_transaction_table.ts} (100%) diff --git a/database/entity/0026-clean_transaction_table/Transaction.ts b/database/entity/0026-clean_transaction_table/Transaction.ts deleted file mode 100644 index e50f5d164..000000000 --- a/database/entity/0026-clean_transaction_table/Transaction.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' - -@Entity('transactions') -export class Transaction extends BaseEntity { - @PrimaryGeneratedColumn('increment', { unsigned: true }) - id: number - - @Column({ name: 'user_id', unsigned: true, nullable: false }) - userId: number - - @Column({ name: 'type_id', unsigned: true, nullable: false }) - typeId: number - - @Column({ type: 'bigint', nullable: false }) - amount: BigInt - - @Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' }) - memo: string - - @Column({ - name: 'send_sender_final_balance', - type: 'bigint', - nullable: true, - default: null, - }) - sendSenderFinalBalance: BigInt | null - - @Column({ name: 'balance', type: 'bigint', default: 0 }) - balance: BigInt - - @Column({ - name: 'balance_date', - type: 'timestamp', - default: () => 'CURRENT_TIMESTAMP', - nullable: false, - }) - balanceDate: Date - - @Column({ name: 'creation_date', type: 'timestamp', nullable: true, default: null }) - creationDate: Date - - @Column({ - name: 'linked_user_id', - type: 'int', - unsigned: true, - nullable: true, - default: null, - }) - linkedUserId?: number | null - - @Column({ - name: 'linked_transaction_id', - type: 'int', - unsigned: true, - nullable: true, - default: null, - }) - linkedTransactionId?: number | null -} diff --git a/database/entity/0027-decimal_types/Transaction.ts b/database/entity/0028-decimal_types/Transaction.ts similarity index 100% rename from database/entity/0027-decimal_types/Transaction.ts rename to database/entity/0028-decimal_types/Transaction.ts diff --git a/database/entity/0028-clean_transaction_table/Transaction.ts b/database/entity/0029-clean_transaction_table/Transaction.ts similarity index 100% rename from database/entity/0028-clean_transaction_table/Transaction.ts rename to database/entity/0029-clean_transaction_table/Transaction.ts diff --git a/database/migrations/0027-decimal_types.ts b/database/migrations/0028-decimal_types.ts similarity index 100% rename from database/migrations/0027-decimal_types.ts rename to database/migrations/0028-decimal_types.ts diff --git a/database/migrations/0028-clean_transaction_table.ts b/database/migrations/0029-clean_transaction_table.ts similarity index 100% rename from database/migrations/0028-clean_transaction_table.ts rename to database/migrations/0029-clean_transaction_table.ts