From 30a52687a8fce569dae2e6b3fc222753f321f74e Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Wed, 30 Aug 2023 22:09:18 +0200 Subject: [PATCH] fix timestamp with ms and some wrong usage of CreateDateColumn --- dlt-database/entity/0001-init_db/Account.ts | 12 ++++++------ dlt-database/entity/0001-init_db/Community.ts | 2 +- .../entity/0001-init_db/ConfirmedTransaction.ts | 12 ++---------- dlt-database/entity/0001-init_db/User.ts | 12 ++++++++++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlt-database/entity/0001-init_db/Account.ts b/dlt-database/entity/0001-init_db/Account.ts index 81abb5ba7..d7a2254df 100644 --- a/dlt-database/entity/0001-init_db/Account.ts +++ b/dlt-database/entity/0001-init_db/Account.ts @@ -38,11 +38,7 @@ export class Account { @Column({ type: 'tinyint', unsigned: true }) type: number - @CreateDateColumn({ - name: 'created_at', - type: 'datetime', - default: () => 'CURRENT_TIMESTAMP', - }) + @CreateDateColumn({ name: 'created_at', type: 'datetime', default: () => 'CURRENT_TIMESTAMP(3)' }) createdAt: Date @Column({ name: 'confirmed_at', type: 'datetime', nullable: true }) @@ -57,7 +53,11 @@ export class Account { }) balance: Decimal - @Column({ name: 'balance_date', type: 'datetime' }) + @Column({ + name: 'balance_date', + type: 'datetime', + default: () => 'CURRENT_TIMESTAMP(3)', + }) balanceDate: Date @ManyToMany(() => Community, (community) => community.communityAccounts) diff --git a/dlt-database/entity/0001-init_db/Community.ts b/dlt-database/entity/0001-init_db/Community.ts index a3c321113..4be6a7f40 100644 --- a/dlt-database/entity/0001-init_db/Community.ts +++ b/dlt-database/entity/0001-init_db/Community.ts @@ -46,7 +46,7 @@ export class Community { @JoinColumn({ name: 'auf_account_id' }) aufAccount?: Account - @CreateDateColumn({ name: 'created_at', type: 'datetime', default: () => 'CURRENT_TIMESTAMP' }) + @CreateDateColumn({ name: 'created_at', type: 'datetime', default: () => 'CURRENT_TIMESTAMP(3)' }) createdAt: Date @Column({ name: 'confirmed_at', type: 'datetime', nullable: true }) diff --git a/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts b/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts index aff1ac07d..4cd616464 100644 --- a/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts +++ b/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts @@ -1,12 +1,4 @@ -import { - Entity, - PrimaryGeneratedColumn, - Column, - CreateDateColumn, - ManyToOne, - JoinColumn, - OneToOne, -} from 'typeorm' +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, OneToOne } from 'typeorm' import { Decimal } from 'decimal.js-light' import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' @@ -52,6 +44,6 @@ export class ConfirmedTransaction { @Column({ name: 'iota_milestone', type: 'bigint' }) iotaMilestone: number - @CreateDateColumn({ name: 'confirmed_at', type: 'datetime' }) + @Column({ name: 'confirmed_at', type: 'datetime' }) confirmedAt: Date } diff --git a/dlt-database/entity/0001-init_db/User.ts b/dlt-database/entity/0001-init_db/User.ts index e396e14ca..8fb7dc3ef 100644 --- a/dlt-database/entity/0001-init_db/User.ts +++ b/dlt-database/entity/0001-init_db/User.ts @@ -1,4 +1,12 @@ -import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToMany, JoinColumn } from 'typeorm' +import { + BaseEntity, + Entity, + PrimaryGeneratedColumn, + Column, + OneToMany, + JoinColumn, + CreateDateColumn, +} from 'typeorm' import { Account } from './Account' @@ -18,7 +26,7 @@ export class User extends BaseEntity { @Column({ name: 'derive1_pubkey', type: 'binary', length: 32, unique: true }) derive1Pubkey: Buffer - @Column({ + @CreateDateColumn({ name: 'created_at', type: 'datetime', default: () => 'CURRENT_TIMESTAMP(3)',