From f1d620dacdb8fa902479d701fce6579514395e78 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Sat, 24 Jul 2021 22:47:45 +0200 Subject: [PATCH] Fixed sequelize crash, added variables --- src/database/models/spells/Ingredient.ts | 7 +-- src/database/models/spells/MetaSchool.ts | 7 +-- src/database/models/spells/School.ts | 7 +-- src/database/models/spells/Spell.ts | 7 +-- src/database/models/spells/Variable.ts | 55 ++++++++++++++++++++++++ src/database/models/users/Permission.ts | 7 +-- src/database/models/users/Role.ts | 7 +-- src/database/models/users/User.ts | 7 +-- 8 files changed, 83 insertions(+), 21 deletions(-) create mode 100644 src/database/models/spells/Variable.ts diff --git a/src/database/models/spells/Ingredient.ts b/src/database/models/spells/Ingredient.ts index ff9c04f..6229c39 100644 --- a/src/database/models/spells/Ingredient.ts +++ b/src/database/models/spells/Ingredient.ts @@ -34,9 +34,10 @@ export default () => { primaryKey: true }, uuid: { - type: DataTypes.UUIDV4, + type: DataTypes.UUID, allowNull: false, - unique: true + unique: true, + defaultValue: DataTypes.UUIDV4 }, name: { type: DataTypes.STRING, @@ -54,7 +55,7 @@ export default () => { } }, { - tableName: 'ingredient', + tableName: 'ingredients', sequelize: AuracleDatabaseDriver, } ) diff --git a/src/database/models/spells/MetaSchool.ts b/src/database/models/spells/MetaSchool.ts index d8c7ef0..2095b24 100644 --- a/src/database/models/spells/MetaSchool.ts +++ b/src/database/models/spells/MetaSchool.ts @@ -34,9 +34,10 @@ export default () => { primaryKey: true }, uuid: { - type: DataTypes.UUIDV4, + type: DataTypes.UUID, allowNull: false, - unique: true + unique: true, + defaultValue: DataTypes.UUIDV4 }, name: { type: DataTypes.STRING, @@ -54,7 +55,7 @@ export default () => { } }, { - tableName: 'meta-school', + tableName: 'meta_schools', sequelize: AuracleDatabaseDriver, } ) diff --git a/src/database/models/spells/School.ts b/src/database/models/spells/School.ts index 36f6877..3ea36bd 100644 --- a/src/database/models/spells/School.ts +++ b/src/database/models/spells/School.ts @@ -34,9 +34,10 @@ export default () => { primaryKey: true }, uuid: { - type: DataTypes.UUIDV4, + type: DataTypes.UUID, allowNull: false, - unique: true + unique: true, + defaultValue: DataTypes.UUIDV4 }, name: { type: DataTypes.STRING, @@ -54,7 +55,7 @@ export default () => { } }, { - tableName: 'school', + tableName: 'schools', sequelize: AuracleDatabaseDriver, } ) diff --git a/src/database/models/spells/Spell.ts b/src/database/models/spells/Spell.ts index 7fcedb7..9497575 100644 --- a/src/database/models/spells/Spell.ts +++ b/src/database/models/spells/Spell.ts @@ -46,9 +46,10 @@ export default () => { primaryKey: true }, uuid: { - type: DataTypes.UUIDV4, + type: DataTypes.UUID, allowNull: false, - unique: true + unique: true, + defaultValue: DataTypes.UUIDV4 }, name: { type: DataTypes.STRING, @@ -87,7 +88,7 @@ export default () => { }, }, { - tableName: 'spell', + tableName: 'spells', sequelize: AuracleDatabaseDriver, } ) diff --git a/src/database/models/spells/Variable.ts b/src/database/models/spells/Variable.ts new file mode 100644 index 0000000..6819c9f --- /dev/null +++ b/src/database/models/spells/Variable.ts @@ -0,0 +1,55 @@ +import { DataTypes, Model, Optional } from "sequelize"; + +import { AuracleDatabaseDriver } from "../../AuracleDatabaseDriver"; + +interface VariableAttributes { + id: number + uuid: string + description: string + + published: boolean +} + +interface VariableCreationAttributes extends Optional { } + +export class Variable extends Model implements VariableAttributes { + public readonly id!: number + public readonly uuid!: string + public description!: string + + public published: boolean + + public readonly createdAt!: Date; + public readonly updatedAt!: Date; +} + +export default () => { + Variable.init( + { + id: { + type: DataTypes.INTEGER.UNSIGNED, + autoIncrement: true, + primaryKey: true + }, + uuid: { + type: DataTypes.UUID, + allowNull: false, + unique: true, + defaultValue: DataTypes.UUIDV4 + }, + description: { + type: DataTypes.STRING, + allowNull: false, + }, + + published: { + type: DataTypes.BOOLEAN, + defaultValue: false + } + }, + { + tableName: 'variables', + sequelize: AuracleDatabaseDriver, + } + ) +} diff --git a/src/database/models/users/Permission.ts b/src/database/models/users/Permission.ts index f5848bf..0852778 100644 --- a/src/database/models/users/Permission.ts +++ b/src/database/models/users/Permission.ts @@ -28,9 +28,10 @@ export default () => { primaryKey: true }, uuid: { - type: DataTypes.UUIDV4, + type: DataTypes.UUID, allowNull: false, - unique: true + unique: true, + defaultValue: DataTypes.UUIDV4 }, slug: { type: DataTypes.STRING, @@ -39,7 +40,7 @@ export default () => { }, }, { - tableName: 'permission', + tableName: 'permissions', sequelize: AuracleDatabaseDriver, } ) diff --git a/src/database/models/users/Role.ts b/src/database/models/users/Role.ts index 47e545f..7525101 100644 --- a/src/database/models/users/Role.ts +++ b/src/database/models/users/Role.ts @@ -30,9 +30,10 @@ export default () => { primaryKey: true }, uuid: { - type: DataTypes.UUIDV4, + type: DataTypes.UUID, allowNull: false, - unique: true + unique: true, + defaultValue: DataTypes.UUIDV4 }, name: { type: DataTypes.STRING, @@ -46,7 +47,7 @@ export default () => { }, }, { - tableName: 'role', + tableName: 'roles', sequelize: AuracleDatabaseDriver, } ) diff --git a/src/database/models/users/User.ts b/src/database/models/users/User.ts index 676f53f..ce959e7 100644 --- a/src/database/models/users/User.ts +++ b/src/database/models/users/User.ts @@ -40,9 +40,10 @@ export default () => { primaryKey: true }, uuid: { - type: DataTypes.UUIDV4, + type: DataTypes.UUID, allowNull: false, - unique: true + unique: true, + defaultValue: DataTypes.UUIDV4 }, mail: { type: DataTypes.STRING, @@ -69,7 +70,7 @@ export default () => { }, }, { - tableName: 'user', + tableName: 'users', sequelize: AuracleDatabaseDriver, } )