"engine" const value shared

src/util/entities/Application.ts

@@ -20,10 +20,11 @@ import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { Team } from "./Team";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "applications",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Application extends BaseClass {
 	@Column()

src/util/entities/Attachment.ts

@@ -27,10 +27,11 @@ import {
 import { URL } from "url";
 import { deleteFile } from "../util/cdn";
 import { BaseClass } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "attachments",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Attachment extends BaseClass {
 	@Column()

src/util/entities/AuditLog.ts

@@ -20,6 +20,7 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { ChannelPermissionOverwrite } from "./Channel";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export enum AuditLogEvents {
 	// guild level
@@ -113,7 +114,7 @@ export enum AuditLogEvents {
 
 @Entity({
 	name: "audit_logs",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class AuditLog extends BaseClass {
 	@JoinColumn({ name: "target_id" })

src/util/entities/BackupCodes.ts

@@ -20,10 +20,11 @@ import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";
 import crypto from "crypto";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "backup_codes",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class BackupCode extends BaseClass {
 	@JoinColumn({ name: "user_id" })

src/util/entities/Badge.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity } from "typeorm";
 import { BaseClassWithoutId } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "badges",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Badge extends BaseClassWithoutId {
 	@Column({ primary: true })

src/util/entities/Ban.ts

@@ -20,10 +20,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { Guild } from "./Guild";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "bans",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Ban extends BaseClass {
 	@Column({ nullable: true })

src/util/entities/Categories.ts

@@ -18,6 +18,7 @@
 
 import { Column, Entity } from "typeorm";
 import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 // TODO: categories:
 // [{
@@ -35,7 +36,7 @@ import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
 
 @Entity({
 	name: "categories",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Categories extends BaseClassWithoutId {
 	// Not using snowflake

src/util/entities/Channel.ts

@@ -44,6 +44,7 @@ import { Recipient } from "./Recipient";
 import { PublicUserProjection, User } from "./User";
 import { VoiceState } from "./VoiceState";
 import { Webhook } from "./Webhook";
+import { dbEngine } from "../util/Database";
 
 export enum ChannelType {
 	GUILD_TEXT = 0, // a text channel within a guild
@@ -71,7 +72,7 @@ export enum ChannelType {
 
 @Entity({
 	name: "channels",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Channel extends BaseClass {
 	@Column()

src/util/entities/ClientRelease.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity } from "typeorm";
 import { BaseClass } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "client_release",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Release extends BaseClass {
 	@Column()

src/util/entities/Config.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity } from "typeorm";
 import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "config",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class ConfigEntity extends BaseClassWithoutId {
 	@PrimaryIdColumn()

src/util/entities/ConnectedAccount.ts

@@ -20,6 +20,7 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { ConnectedAccountTokenData } from "../interfaces";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export type PublicConnectedAccount = Pick<
 	ConnectedAccount,
@@ -28,7 +29,7 @@ export type PublicConnectedAccount = Pick<
 
 @Entity({
 	name: "connected_accounts",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class ConnectedAccount extends BaseClass {
 	@Column()

src/util/entities/ConnectionConfigEntity.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity } from "typeorm";
 import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "connection_config",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class ConnectionConfigEntity extends BaseClassWithoutId {
 	@PrimaryIdColumn()

src/util/entities/EmbedCache.ts

@@ -19,10 +19,11 @@
 import { BaseClass } from "./BaseClass";
 import { Entity, Column } from "typeorm";
 import { Embed } from "./Message";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "embed_cache",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class EmbedCache extends BaseClass {
 	@Column()

src/util/entities/Emoji.ts

@@ -20,10 +20,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { User } from ".";
 import { BaseClass } from "./BaseClass";
 import { Guild } from "./Guild";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "emojis",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Emoji extends BaseClass {
 	@Column()

src/util/entities/Encryption.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity } from "typeorm";
 import { BaseClass } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "security_settings",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class SecuritySettings extends BaseClass {
 	@Column({ nullable: true })

src/util/entities/Guild.ts

@@ -37,6 +37,7 @@ import { Template } from "./Template";
 import { User } from "./User";
 import { VoiceState } from "./VoiceState";
 import { Webhook } from "./Webhook";
+import { dbEngine } from "../util/Database";
 
 // TODO: application_command_count, application_command_counts: {1: 0, 2: 0, 3: 0}
 // TODO: guild_scheduled_events
@@ -68,7 +69,7 @@ export const PublicGuildRelations = [
 
 @Entity({
 	name: "guilds",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Guild extends BaseClass {
 	@Column({ nullable: true })

src/util/entities/Invite.ts

@@ -22,12 +22,13 @@ import { Channel } from "./Channel";
 import { Guild } from "./Guild";
 import { Member } from "./Member";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export const PublicInviteRelation = ["inviter", "guild", "channel"];
 
 @Entity({
 	name: "invites",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Invite extends BaseClassWithoutId {
 	@PrimaryIdColumn()

src/util/entities/Member.ts

@@ -48,6 +48,7 @@ import { Guild } from "./Guild";
 import { Message } from "./Message";
 import { Role } from "./Role";
 import { PublicUser, User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export const MemberPrivateProjection: (keyof Member)[] = [
 	"id",
@@ -67,7 +68,7 @@ export const MemberPrivateProjection: (keyof Member)[] = [
 
 @Entity({
 	name: "members",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 @Index(["id", "guild_id"], { unique: true })
 export class Member extends BaseClassWithoutId {

src/util/entities/Message.ts

@@ -39,6 +39,7 @@ import { Guild } from "./Guild";
 import { Webhook } from "./Webhook";
 import { Sticker } from "./Sticker";
 import { Attachment } from "./Attachment";
+import { dbEngine } from "../util/Database";
 
 export enum MessageType {
 	DEFAULT = 0,
@@ -70,7 +71,7 @@ export enum MessageType {
 
 @Entity({
 	name: "messages",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 @Index(["channel_id", "id"], { unique: true })
 export class Message extends BaseClass {

src/util/entities/Migration.ts

@@ -23,6 +23,7 @@ import {
 	PrimaryGeneratedColumn,
 	BaseEntity,
 } from "typeorm";
+import { dbEngine } from "../util/Database";
 
 export const PrimaryIdAutoGenerated = process.env.DATABASE?.startsWith(
 	"mongodb",
@@ -32,7 +33,7 @@ export const PrimaryIdAutoGenerated = process.env.DATABASE?.startsWith(
 
 @Entity({
 	name: "migrations",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Migration extends BaseEntity {
 	@PrimaryIdAutoGenerated()

src/util/entities/Note.ts

@@ -19,10 +19,11 @@
 import { Column, Entity, JoinColumn, ManyToOne, Unique } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "notes",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 @Unique(["owner", "target"])
 export class Note extends BaseClass {

src/util/entities/RateLimit.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity } from "typeorm";
 import { BaseClass } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "rate_limits",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class RateLimit extends BaseClass {
 	@Column() // no relation as it also

src/util/entities/ReadState.ts

@@ -27,6 +27,7 @@ import {
 import { BaseClass } from "./BaseClass";
 import { Channel } from "./Channel";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 // for read receipts
 // notification cursor and public read receipt need to be forwards-only (the former to prevent re-pinging when marked as unread, and the latter to be acceptable as a legal acknowledgement in criminal proceedings), and private read marker needs to be advance-rewind capable
@@ -34,7 +35,7 @@ import { User } from "./User";
 
 @Entity({
 	name: "read_states",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 @Index(["channel_id", "user_id"], { unique: true })
 export class ReadState extends BaseClass {

src/util/entities/Recipient.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "recipients",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Recipient extends BaseClass {
 	@Column()

src/util/entities/Relationship.ts

@@ -26,6 +26,7 @@ import {
 } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export enum RelationshipType {
 	outgoing = 4,
@@ -36,7 +37,7 @@ export enum RelationshipType {
 
 @Entity({
 	name: "relationships",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 @Index(["from_id", "to_id"], { unique: true })
 export class Relationship extends BaseClass {

src/util/entities/Role.ts

@@ -20,10 +20,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 
 import { BaseClass } from "./BaseClass";
 import { Guild } from "./Guild";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "roles",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Role extends BaseClass {
 	@Column()

src/util/entities/SecurityKey.ts

@@ -19,10 +19,11 @@
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "security_keys",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class SecurityKey extends BaseClass {
 	@Column({ nullable: true })

src/util/entities/Session.ts

@@ -21,12 +21,13 @@ import { BaseClass } from "./BaseClass";
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { ClientStatus, Status } from "../interfaces/Status";
 import { Activity } from "../interfaces/Activity";
+import { dbEngine } from "../util/Database";
 
 //TODO we need to remove all sessions on server start because if the server crashes without closing websockets it won't delete them
 
 @Entity({
 	name: "sessions",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Session extends BaseClass {
 	@Column({ nullable: true })

src/util/entities/Sticker.ts

@@ -20,6 +20,7 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { Guild } from "./Guild";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export enum StickerType {
 	STANDARD = 1,
@@ -35,7 +36,7 @@ export enum StickerFormatType {
 
 @Entity({
 	name: "stickers",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Sticker extends BaseClass {
 	@Column()

src/util/entities/StickerPack.ts

@@ -26,10 +26,11 @@ import {
 } from "typeorm";
 import { Sticker } from ".";
 import { BaseClass } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "sticker_packs",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class StickerPack extends BaseClass {
 	@Column()

src/util/entities/Team.ts

@@ -27,10 +27,11 @@ import {
 import { BaseClass } from "./BaseClass";
 import { TeamMember } from "./TeamMember";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "teams",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Team extends BaseClass {
 	@Column({ nullable: true })

src/util/entities/TeamMember.ts

@@ -19,6 +19,7 @@
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export enum TeamMemberState {
 	INVITED = 1,
@@ -27,7 +28,7 @@ export enum TeamMemberState {
 
 @Entity({
 	name: "team_members",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class TeamMember extends BaseClass {
 	@Column({ type: "int" })

src/util/entities/Template.ts

@@ -20,10 +20,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { Guild } from "./Guild";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "templates",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Template extends BaseClass {
 	@Column({ unique: true })

src/util/entities/User.ts

@@ -34,6 +34,7 @@ import { Relationship } from "./Relationship";
 import { SecurityKey } from "./SecurityKey";
 import { Session } from "./Session";
 import { UserSettings } from "./UserSettings";
+import { dbEngine } from "../util/Database";
 
 export enum PublicUserEnum {
 	username,
@@ -88,7 +89,7 @@ export interface UserPrivate extends Pick<User, PrivateUserKeys> {
 
 @Entity({
 	name: "users",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class User extends BaseClass {
 	@Column()

src/util/entities/UserSettings.ts

@@ -18,10 +18,11 @@
 
 import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 import { BaseClassWithoutId } from "./BaseClass";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "user_settings",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class UserSettings extends BaseClassWithoutId {
 	@PrimaryGeneratedColumn()

src/util/entities/ValidRegistrationTokens.ts

@@ -17,10 +17,11 @@
 */
 
 import { BaseEntity, Column, Entity, PrimaryColumn } from "typeorm";
+import { dbEngine } from "../util/Database";
 
 @Entity({
 	name: "valid_registration_tokens",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class ValidRegistrationToken extends BaseEntity {
 	@PrimaryColumn()

src/util/entities/VoiceState.ts

@@ -22,11 +22,12 @@ import { Channel } from "./Channel";
 import { Guild } from "./Guild";
 import { Member } from "./Member";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 //https://gist.github.com/vassjozsef/e482c65df6ee1facaace8b3c9ff66145#file-voice_state-ex
 @Entity({
 	name: "voice_states",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class VoiceState extends BaseClass {
 	@Column({ nullable: true })

src/util/entities/Webhook.ts

@@ -22,6 +22,7 @@ import { BaseClass } from "./BaseClass";
 import { Channel } from "./Channel";
 import { Guild } from "./Guild";
 import { User } from "./User";
+import { dbEngine } from "../util/Database";
 
 export enum WebhookType {
 	Incoming = 1,
@@ -31,7 +32,7 @@ export enum WebhookType {
 
 @Entity({
 	name: "webhooks",
-	engine: "InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+	engine: dbEngine,
 })
 export class Webhook extends BaseClass {
 	@Column({ type: "int" })

src/util/util/Database.ts

@@ -134,3 +134,6 @@ export { DataSourceOptions, DatabaseType, dbConnection };
 export async function closeDatabase() {
 	await dbConnection?.destroy();
 }
+
+export const dbEngine =
+	"InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci";