From 9d8c2e81e9b7b383da27e13818741c57e62c0650 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Wed, 12 Jun 2024 13:10:40 -1000 Subject: [PATCH] refactor(database): :truck: Move drizzle migrations to their own folder --- cli/commands/emoji/add.ts | 2 +- cli/commands/emoji/import.ts | 2 +- drizzle.config.ts | 2 +- drizzle/db.ts | 4 ++-- drizzle/{ => migrations}/0000_illegal_living_lightning.sql | 0 drizzle/{ => migrations}/0001_salty_night_thrasher.sql | 0 drizzle/{ => migrations}/0002_stiff_ares.sql | 0 drizzle/{ => migrations}/0003_spicy_arachne.sql | 0 drizzle/{ => migrations}/0004_burly_lockjaw.sql | 0 drizzle/{ => migrations}/0005_sleepy_puma.sql | 0 drizzle/{ => migrations}/0006_messy_network.sql | 0 drizzle/{ => migrations}/0007_naive_sleeper.sql | 0 drizzle/{ => migrations}/0008_flawless_brother_voodoo.sql | 0 drizzle/{ => migrations}/0009_easy_slyde.sql | 0 drizzle/{ => migrations}/0010_daffy_frightful_four.sql | 0 drizzle/{ => migrations}/0011_special_the_fury.sql | 0 drizzle/{ => migrations}/0012_certain_thor_girl.sql | 0 drizzle/{ => migrations}/0013_wandering_celestials.sql | 0 drizzle/{ => migrations}/0014_wonderful_sandman.sql | 0 drizzle/{ => migrations}/0015_easy_mojo.sql | 0 drizzle/{ => migrations}/0016_keen_mindworm.sql | 0 drizzle/{ => migrations}/0017_dusty_black_knight.sql | 0 drizzle/{ => migrations}/0018_rapid_hairball.sql | 0 drizzle/{ => migrations}/0019_mushy_lorna_dane.sql | 0 drizzle/{ => migrations}/0020_giant_the_stranger.sql | 0 drizzle/{ => migrations}/0021_wise_stephen_strange.sql | 0 drizzle/{ => migrations}/0022_curly_the_call.sql | 0 drizzle/{ => migrations}/0023_lazy_wolfsbane.sql | 0 drizzle/{ => migrations}/0024_lush_aaron_stack.sql | 0 drizzle/{ => migrations}/0025_violet_susan_delgado.sql | 0 drizzle/{ => migrations}/meta/0000_snapshot.json | 0 drizzle/{ => migrations}/meta/0001_snapshot.json | 0 drizzle/{ => migrations}/meta/0002_snapshot.json | 0 drizzle/{ => migrations}/meta/0003_snapshot.json | 0 drizzle/{ => migrations}/meta/0004_snapshot.json | 0 drizzle/{ => migrations}/meta/0005_snapshot.json | 0 drizzle/{ => migrations}/meta/0006_snapshot.json | 0 drizzle/{ => migrations}/meta/0007_snapshot.json | 0 drizzle/{ => migrations}/meta/0008_snapshot.json | 0 drizzle/{ => migrations}/meta/0009_snapshot.json | 0 drizzle/{ => migrations}/meta/0010_snapshot.json | 0 drizzle/{ => migrations}/meta/0011_snapshot.json | 0 drizzle/{ => migrations}/meta/0012_snapshot.json | 0 drizzle/{ => migrations}/meta/0013_snapshot.json | 0 drizzle/{ => migrations}/meta/0014_snapshot.json | 0 drizzle/{ => migrations}/meta/0015_snapshot.json | 0 drizzle/{ => migrations}/meta/0016_snapshot.json | 0 drizzle/{ => migrations}/meta/0017_snapshot.json | 0 drizzle/{ => migrations}/meta/0018_snapshot.json | 0 drizzle/{ => migrations}/meta/0019_snapshot.json | 0 drizzle/{ => migrations}/meta/0020_snapshot.json | 0 drizzle/{ => migrations}/meta/0021_snapshot.json | 0 drizzle/{ => migrations}/meta/0022_snapshot.json | 0 drizzle/{ => migrations}/meta/0023_snapshot.json | 0 drizzle/{ => migrations}/meta/0024_snapshot.json | 0 drizzle/{ => migrations}/meta/0025_snapshot.json | 0 drizzle/{ => migrations}/meta/_journal.json | 0 57 files changed, 5 insertions(+), 5 deletions(-) rename drizzle/{ => migrations}/0000_illegal_living_lightning.sql (100%) rename drizzle/{ => migrations}/0001_salty_night_thrasher.sql (100%) rename drizzle/{ => migrations}/0002_stiff_ares.sql (100%) rename drizzle/{ => migrations}/0003_spicy_arachne.sql (100%) rename drizzle/{ => migrations}/0004_burly_lockjaw.sql (100%) rename drizzle/{ => migrations}/0005_sleepy_puma.sql (100%) rename drizzle/{ => migrations}/0006_messy_network.sql (100%) rename drizzle/{ => migrations}/0007_naive_sleeper.sql (100%) rename drizzle/{ => migrations}/0008_flawless_brother_voodoo.sql (100%) rename drizzle/{ => migrations}/0009_easy_slyde.sql (100%) rename drizzle/{ => migrations}/0010_daffy_frightful_four.sql (100%) rename drizzle/{ => migrations}/0011_special_the_fury.sql (100%) rename drizzle/{ => migrations}/0012_certain_thor_girl.sql (100%) rename drizzle/{ => migrations}/0013_wandering_celestials.sql (100%) rename drizzle/{ => migrations}/0014_wonderful_sandman.sql (100%) rename drizzle/{ => migrations}/0015_easy_mojo.sql (100%) rename drizzle/{ => migrations}/0016_keen_mindworm.sql (100%) rename drizzle/{ => migrations}/0017_dusty_black_knight.sql (100%) rename drizzle/{ => migrations}/0018_rapid_hairball.sql (100%) rename drizzle/{ => migrations}/0019_mushy_lorna_dane.sql (100%) rename drizzle/{ => migrations}/0020_giant_the_stranger.sql (100%) rename drizzle/{ => migrations}/0021_wise_stephen_strange.sql (100%) rename drizzle/{ => migrations}/0022_curly_the_call.sql (100%) rename drizzle/{ => migrations}/0023_lazy_wolfsbane.sql (100%) rename drizzle/{ => migrations}/0024_lush_aaron_stack.sql (100%) rename drizzle/{ => migrations}/0025_violet_susan_delgado.sql (100%) rename drizzle/{ => migrations}/meta/0000_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0001_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0002_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0003_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0004_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0005_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0006_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0007_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0008_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0009_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0010_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0011_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0012_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0013_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0014_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0015_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0016_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0017_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0018_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0019_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0020_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0021_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0022_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0023_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0024_snapshot.json (100%) rename drizzle/{ => migrations}/meta/0025_snapshot.json (100%) rename drizzle/{ => migrations}/meta/_journal.json (100%) diff --git a/cli/commands/emoji/add.ts b/cli/commands/emoji/add.ts index 28d1d260..c7acbc9b 100644 --- a/cli/commands/emoji/add.ts +++ b/cli/commands/emoji/add.ts @@ -1,7 +1,7 @@ import { Args } from "@oclif/core"; import chalk from "chalk"; import ora from "ora"; -import { BaseCommand } from "~//cli/base"; +import { BaseCommand } from "~/cli/base"; import { getUrl } from "~/database/entities/Attachment"; import { db } from "~/drizzle/db"; import { Emojis } from "~/drizzle/schema"; diff --git a/cli/commands/emoji/import.ts b/cli/commands/emoji/import.ts index db855d15..c89998ca 100644 --- a/cli/commands/emoji/import.ts +++ b/cli/commands/emoji/import.ts @@ -4,7 +4,7 @@ import { and, inArray, isNull } from "drizzle-orm"; import { lookup } from "mime-types"; import ora from "ora"; import { unzip } from "unzipit"; -import { BaseCommand } from "~//cli/base"; +import { BaseCommand } from "~/cli/base"; import { getUrl } from "~/database/entities/Attachment"; import { db } from "~/drizzle/db"; import { Emojis } from "~/drizzle/schema"; diff --git a/drizzle.config.ts b/drizzle.config.ts index c1bced95..3f90c425 100644 --- a/drizzle.config.ts +++ b/drizzle.config.ts @@ -3,7 +3,7 @@ import type { Config } from "drizzle-kit"; export default { dialect: "postgresql", - out: "./drizzle", + out: "./drizzle/migrations", schema: "./drizzle/schema.ts", dbCredentials: { /* host: "localhost", diff --git a/drizzle/db.ts b/drizzle/db.ts index 8f37b861..66626768 100644 --- a/drizzle/db.ts +++ b/drizzle/db.ts @@ -2,7 +2,7 @@ import { drizzle } from "drizzle-orm/node-postgres"; import { migrate } from "drizzle-orm/postgres-js/migrator"; import { LogLevel, LogManager, type MultiLogManager } from "log-manager"; import { Client } from "pg"; -import { config } from "~//packages/config-manager"; +import { config } from "~/packages/config-manager"; import * as schema from "./schema"; export const client = new Client({ @@ -42,7 +42,7 @@ export const setupDatabase = async ( try { await migrate(db, { - migrationsFolder: "./drizzle", + migrationsFolder: "./drizzle/migrations", }); } catch (e) { await logger.logError(LogLevel.CRITICAL, "Database", e as Error); diff --git a/drizzle/0000_illegal_living_lightning.sql b/drizzle/migrations/0000_illegal_living_lightning.sql similarity index 100% rename from drizzle/0000_illegal_living_lightning.sql rename to drizzle/migrations/0000_illegal_living_lightning.sql diff --git a/drizzle/0001_salty_night_thrasher.sql b/drizzle/migrations/0001_salty_night_thrasher.sql similarity index 100% rename from drizzle/0001_salty_night_thrasher.sql rename to drizzle/migrations/0001_salty_night_thrasher.sql diff --git a/drizzle/0002_stiff_ares.sql b/drizzle/migrations/0002_stiff_ares.sql similarity index 100% rename from drizzle/0002_stiff_ares.sql rename to drizzle/migrations/0002_stiff_ares.sql diff --git a/drizzle/0003_spicy_arachne.sql b/drizzle/migrations/0003_spicy_arachne.sql similarity index 100% rename from drizzle/0003_spicy_arachne.sql rename to drizzle/migrations/0003_spicy_arachne.sql diff --git a/drizzle/0004_burly_lockjaw.sql b/drizzle/migrations/0004_burly_lockjaw.sql similarity index 100% rename from drizzle/0004_burly_lockjaw.sql rename to drizzle/migrations/0004_burly_lockjaw.sql diff --git a/drizzle/0005_sleepy_puma.sql b/drizzle/migrations/0005_sleepy_puma.sql similarity index 100% rename from drizzle/0005_sleepy_puma.sql rename to drizzle/migrations/0005_sleepy_puma.sql diff --git a/drizzle/0006_messy_network.sql b/drizzle/migrations/0006_messy_network.sql similarity index 100% rename from drizzle/0006_messy_network.sql rename to drizzle/migrations/0006_messy_network.sql diff --git a/drizzle/0007_naive_sleeper.sql b/drizzle/migrations/0007_naive_sleeper.sql similarity index 100% rename from drizzle/0007_naive_sleeper.sql rename to drizzle/migrations/0007_naive_sleeper.sql diff --git a/drizzle/0008_flawless_brother_voodoo.sql b/drizzle/migrations/0008_flawless_brother_voodoo.sql similarity index 100% rename from drizzle/0008_flawless_brother_voodoo.sql rename to drizzle/migrations/0008_flawless_brother_voodoo.sql diff --git a/drizzle/0009_easy_slyde.sql b/drizzle/migrations/0009_easy_slyde.sql similarity index 100% rename from drizzle/0009_easy_slyde.sql rename to drizzle/migrations/0009_easy_slyde.sql diff --git a/drizzle/0010_daffy_frightful_four.sql b/drizzle/migrations/0010_daffy_frightful_four.sql similarity index 100% rename from drizzle/0010_daffy_frightful_four.sql rename to drizzle/migrations/0010_daffy_frightful_four.sql diff --git a/drizzle/0011_special_the_fury.sql b/drizzle/migrations/0011_special_the_fury.sql similarity index 100% rename from drizzle/0011_special_the_fury.sql rename to drizzle/migrations/0011_special_the_fury.sql diff --git a/drizzle/0012_certain_thor_girl.sql b/drizzle/migrations/0012_certain_thor_girl.sql similarity index 100% rename from drizzle/0012_certain_thor_girl.sql rename to drizzle/migrations/0012_certain_thor_girl.sql diff --git a/drizzle/0013_wandering_celestials.sql b/drizzle/migrations/0013_wandering_celestials.sql similarity index 100% rename from drizzle/0013_wandering_celestials.sql rename to drizzle/migrations/0013_wandering_celestials.sql diff --git a/drizzle/0014_wonderful_sandman.sql b/drizzle/migrations/0014_wonderful_sandman.sql similarity index 100% rename from drizzle/0014_wonderful_sandman.sql rename to drizzle/migrations/0014_wonderful_sandman.sql diff --git a/drizzle/0015_easy_mojo.sql b/drizzle/migrations/0015_easy_mojo.sql similarity index 100% rename from drizzle/0015_easy_mojo.sql rename to drizzle/migrations/0015_easy_mojo.sql diff --git a/drizzle/0016_keen_mindworm.sql b/drizzle/migrations/0016_keen_mindworm.sql similarity index 100% rename from drizzle/0016_keen_mindworm.sql rename to drizzle/migrations/0016_keen_mindworm.sql diff --git a/drizzle/0017_dusty_black_knight.sql b/drizzle/migrations/0017_dusty_black_knight.sql similarity index 100% rename from drizzle/0017_dusty_black_knight.sql rename to drizzle/migrations/0017_dusty_black_knight.sql diff --git a/drizzle/0018_rapid_hairball.sql b/drizzle/migrations/0018_rapid_hairball.sql similarity index 100% rename from drizzle/0018_rapid_hairball.sql rename to drizzle/migrations/0018_rapid_hairball.sql diff --git a/drizzle/0019_mushy_lorna_dane.sql b/drizzle/migrations/0019_mushy_lorna_dane.sql similarity index 100% rename from drizzle/0019_mushy_lorna_dane.sql rename to drizzle/migrations/0019_mushy_lorna_dane.sql diff --git a/drizzle/0020_giant_the_stranger.sql b/drizzle/migrations/0020_giant_the_stranger.sql similarity index 100% rename from drizzle/0020_giant_the_stranger.sql rename to drizzle/migrations/0020_giant_the_stranger.sql diff --git a/drizzle/0021_wise_stephen_strange.sql b/drizzle/migrations/0021_wise_stephen_strange.sql similarity index 100% rename from drizzle/0021_wise_stephen_strange.sql rename to drizzle/migrations/0021_wise_stephen_strange.sql diff --git a/drizzle/0022_curly_the_call.sql b/drizzle/migrations/0022_curly_the_call.sql similarity index 100% rename from drizzle/0022_curly_the_call.sql rename to drizzle/migrations/0022_curly_the_call.sql diff --git a/drizzle/0023_lazy_wolfsbane.sql b/drizzle/migrations/0023_lazy_wolfsbane.sql similarity index 100% rename from drizzle/0023_lazy_wolfsbane.sql rename to drizzle/migrations/0023_lazy_wolfsbane.sql diff --git a/drizzle/0024_lush_aaron_stack.sql b/drizzle/migrations/0024_lush_aaron_stack.sql similarity index 100% rename from drizzle/0024_lush_aaron_stack.sql rename to drizzle/migrations/0024_lush_aaron_stack.sql diff --git a/drizzle/0025_violet_susan_delgado.sql b/drizzle/migrations/0025_violet_susan_delgado.sql similarity index 100% rename from drizzle/0025_violet_susan_delgado.sql rename to drizzle/migrations/0025_violet_susan_delgado.sql diff --git a/drizzle/meta/0000_snapshot.json b/drizzle/migrations/meta/0000_snapshot.json similarity index 100% rename from drizzle/meta/0000_snapshot.json rename to drizzle/migrations/meta/0000_snapshot.json diff --git a/drizzle/meta/0001_snapshot.json b/drizzle/migrations/meta/0001_snapshot.json similarity index 100% rename from drizzle/meta/0001_snapshot.json rename to drizzle/migrations/meta/0001_snapshot.json diff --git a/drizzle/meta/0002_snapshot.json b/drizzle/migrations/meta/0002_snapshot.json similarity index 100% rename from drizzle/meta/0002_snapshot.json rename to drizzle/migrations/meta/0002_snapshot.json diff --git a/drizzle/meta/0003_snapshot.json b/drizzle/migrations/meta/0003_snapshot.json similarity index 100% rename from drizzle/meta/0003_snapshot.json rename to drizzle/migrations/meta/0003_snapshot.json diff --git a/drizzle/meta/0004_snapshot.json b/drizzle/migrations/meta/0004_snapshot.json similarity index 100% rename from drizzle/meta/0004_snapshot.json rename to drizzle/migrations/meta/0004_snapshot.json diff --git a/drizzle/meta/0005_snapshot.json b/drizzle/migrations/meta/0005_snapshot.json similarity index 100% rename from drizzle/meta/0005_snapshot.json rename to drizzle/migrations/meta/0005_snapshot.json diff --git a/drizzle/meta/0006_snapshot.json b/drizzle/migrations/meta/0006_snapshot.json similarity index 100% rename from drizzle/meta/0006_snapshot.json rename to drizzle/migrations/meta/0006_snapshot.json diff --git a/drizzle/meta/0007_snapshot.json b/drizzle/migrations/meta/0007_snapshot.json similarity index 100% rename from drizzle/meta/0007_snapshot.json rename to drizzle/migrations/meta/0007_snapshot.json diff --git a/drizzle/meta/0008_snapshot.json b/drizzle/migrations/meta/0008_snapshot.json similarity index 100% rename from drizzle/meta/0008_snapshot.json rename to drizzle/migrations/meta/0008_snapshot.json diff --git a/drizzle/meta/0009_snapshot.json b/drizzle/migrations/meta/0009_snapshot.json similarity index 100% rename from drizzle/meta/0009_snapshot.json rename to drizzle/migrations/meta/0009_snapshot.json diff --git a/drizzle/meta/0010_snapshot.json b/drizzle/migrations/meta/0010_snapshot.json similarity index 100% rename from drizzle/meta/0010_snapshot.json rename to drizzle/migrations/meta/0010_snapshot.json diff --git a/drizzle/meta/0011_snapshot.json b/drizzle/migrations/meta/0011_snapshot.json similarity index 100% rename from drizzle/meta/0011_snapshot.json rename to drizzle/migrations/meta/0011_snapshot.json diff --git a/drizzle/meta/0012_snapshot.json b/drizzle/migrations/meta/0012_snapshot.json similarity index 100% rename from drizzle/meta/0012_snapshot.json rename to drizzle/migrations/meta/0012_snapshot.json diff --git a/drizzle/meta/0013_snapshot.json b/drizzle/migrations/meta/0013_snapshot.json similarity index 100% rename from drizzle/meta/0013_snapshot.json rename to drizzle/migrations/meta/0013_snapshot.json diff --git a/drizzle/meta/0014_snapshot.json b/drizzle/migrations/meta/0014_snapshot.json similarity index 100% rename from drizzle/meta/0014_snapshot.json rename to drizzle/migrations/meta/0014_snapshot.json diff --git a/drizzle/meta/0015_snapshot.json b/drizzle/migrations/meta/0015_snapshot.json similarity index 100% rename from drizzle/meta/0015_snapshot.json rename to drizzle/migrations/meta/0015_snapshot.json diff --git a/drizzle/meta/0016_snapshot.json b/drizzle/migrations/meta/0016_snapshot.json similarity index 100% rename from drizzle/meta/0016_snapshot.json rename to drizzle/migrations/meta/0016_snapshot.json diff --git a/drizzle/meta/0017_snapshot.json b/drizzle/migrations/meta/0017_snapshot.json similarity index 100% rename from drizzle/meta/0017_snapshot.json rename to drizzle/migrations/meta/0017_snapshot.json diff --git a/drizzle/meta/0018_snapshot.json b/drizzle/migrations/meta/0018_snapshot.json similarity index 100% rename from drizzle/meta/0018_snapshot.json rename to drizzle/migrations/meta/0018_snapshot.json diff --git a/drizzle/meta/0019_snapshot.json b/drizzle/migrations/meta/0019_snapshot.json similarity index 100% rename from drizzle/meta/0019_snapshot.json rename to drizzle/migrations/meta/0019_snapshot.json diff --git a/drizzle/meta/0020_snapshot.json b/drizzle/migrations/meta/0020_snapshot.json similarity index 100% rename from drizzle/meta/0020_snapshot.json rename to drizzle/migrations/meta/0020_snapshot.json diff --git a/drizzle/meta/0021_snapshot.json b/drizzle/migrations/meta/0021_snapshot.json similarity index 100% rename from drizzle/meta/0021_snapshot.json rename to drizzle/migrations/meta/0021_snapshot.json diff --git a/drizzle/meta/0022_snapshot.json b/drizzle/migrations/meta/0022_snapshot.json similarity index 100% rename from drizzle/meta/0022_snapshot.json rename to drizzle/migrations/meta/0022_snapshot.json diff --git a/drizzle/meta/0023_snapshot.json b/drizzle/migrations/meta/0023_snapshot.json similarity index 100% rename from drizzle/meta/0023_snapshot.json rename to drizzle/migrations/meta/0023_snapshot.json diff --git a/drizzle/meta/0024_snapshot.json b/drizzle/migrations/meta/0024_snapshot.json similarity index 100% rename from drizzle/meta/0024_snapshot.json rename to drizzle/migrations/meta/0024_snapshot.json diff --git a/drizzle/meta/0025_snapshot.json b/drizzle/migrations/meta/0025_snapshot.json similarity index 100% rename from drizzle/meta/0025_snapshot.json rename to drizzle/migrations/meta/0025_snapshot.json diff --git a/drizzle/meta/_journal.json b/drizzle/migrations/meta/_journal.json similarity index 100% rename from drizzle/meta/_journal.json rename to drizzle/migrations/meta/_journal.json