From 3ea64b2308ab577cd1723ffeb25266e9dfe296f7 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Mon, 13 Apr 2020 19:47:08 +0200 Subject: [PATCH] models/revision.ts: Fix primary key default value Signed-off-by: David Mehren --- lib/models/revision.ts | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/models/revision.ts b/lib/models/revision.ts index d1100ef0a..ccc9af2ca 100644 --- a/lib/models/revision.ts +++ b/lib/models/revision.ts @@ -1,16 +1,26 @@ -import { BelongsTo, Column, DataType, ForeignKey, IsUUID, Model, PrimaryKey, Table } from 'sequelize-typescript' import { ChildProcess } from 'child_process' -import { Note } from './note' -import { processData, stripNullByte } from '../utils' import Sequelize from 'sequelize' +import { + BelongsTo, + Column, + DataType, + Default, + ForeignKey, + IsUUID, + Model, + PrimaryKey, + Table +} from 'sequelize-typescript' // core import { logger } from '../logger' +import { processData, stripNullByte } from '../utils' +import { Note } from './note' import async = require('async') -import moment = require('moment') import childProcess = require('child_process') -import shortId = require('shortid') +import moment = require('moment') import path = require('path') +import shortId = require('shortid') const Op = Sequelize.Op @@ -64,9 +74,9 @@ function sendDmpWorker (data, callback): void { @Table export class Revision extends Model { - @IsUUID(4) + @Default(Sequelize.UUIDV4) @PrimaryKey - @Column + @Column(DataType.UUID) id: string @Column(DataType.INTEGER)