diff --git a/migrations/sqlite-drizzle.config.ts b/migrations/sqlite-drizzle.config.ts index f0fac86fa3..c4610783d8 100644 --- a/migrations/sqlite-drizzle.config.ts +++ b/migrations/sqlite-drizzle.config.ts @@ -1,7 +1,7 @@ import { defineConfig } from 'drizzle-kit' export default defineConfig({ out: './migrations/sqlite-drizzle', - schema: './src/main/db/schema/*', + schema: './src/main/db/schemas/*', dialect: 'sqlite', casing: 'snake_case' }) diff --git a/src/main/db/DbService.ts b/src/main/db/DbService.ts index 1e0fa57a84..c5cb17db88 100644 --- a/src/main/db/DbService.ts +++ b/src/main/db/DbService.ts @@ -5,7 +5,7 @@ import Logger from 'electron-log' import path from 'path' import { pathToFileURL } from 'url' -import Seeds from './seed' +import Seeding from './seeding' import type { DbType } from './types' const DB_NAME = 'cherrystudio.sqlite' @@ -38,9 +38,9 @@ class DbService { return this.db } - public async migrateSeed(seedName: keyof typeof Seeds): Promise { + public async migrateSeed(seedName: keyof typeof Seeding): Promise { try { - const Seed = Seeds[seedName] + const Seed = Seeding[seedName] await new Seed().migrate(this.db) return true } catch (error) { diff --git a/src/main/db/schema/columnHelpers.ts b/src/main/db/schemas/columnHelpers.ts similarity index 100% rename from src/main/db/schema/columnHelpers.ts rename to src/main/db/schemas/columnHelpers.ts diff --git a/src/main/db/schema/preference.ts b/src/main/db/schemas/preference.ts similarity index 100% rename from src/main/db/schema/preference.ts rename to src/main/db/schemas/preference.ts diff --git a/src/main/db/seed/index.ts b/src/main/db/seed/index.ts deleted file mode 100644 index 6897b2c7fe..0000000000 --- a/src/main/db/seed/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import PreferenceSeed from './preferenceSeed' - -const seedList = { - preference: PreferenceSeed -} - -export default seedList diff --git a/src/main/db/seeding/index.ts b/src/main/db/seeding/index.ts new file mode 100644 index 0000000000..cfa16f5709 --- /dev/null +++ b/src/main/db/seeding/index.ts @@ -0,0 +1,7 @@ +import PreferenceSeeding from './preferenceSeeding' + +const seedingList = { + preference: PreferenceSeeding +} + +export default seedingList diff --git a/src/main/db/seed/preferenceSeed.ts b/src/main/db/seeding/preferenceSeeding.ts similarity index 95% rename from src/main/db/seed/preferenceSeed.ts rename to src/main/db/seeding/preferenceSeeding.ts index 8d8d9ae9a8..4f9fd02320 100644 --- a/src/main/db/seed/preferenceSeed.ts +++ b/src/main/db/seeding/preferenceSeeding.ts @@ -1,4 +1,4 @@ -import { preferenceTable } from '@main/db/schema/preference' +import { preferenceTable } from '@main/db/schemas/preference' import { defaultPreferences } from '@shared/preferences' import type { DbType, ISeed } from '../types' diff --git a/yarn.lock b/yarn.lock index 9882f346dc..1b239a9c4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11527,6 +11527,15 @@ __metadata: languageName: node linkType: hard +"get-tsconfig@npm:^4.7.0": + version: 4.10.1 + resolution: "get-tsconfig@npm:4.10.1" + dependencies: + resolve-pkg-maps: "npm:^1.0.0" + checksum: 10c0/7f8e3dabc6a49b747920a800fb88e1952fef871cdf51b79e98db48275a5de6cdaf499c55ee67df5fa6fe7ce65f0063e26de0f2e53049b408c585aa74d39ffa21 + languageName: node + linkType: hard + "get-uri@npm:^6.0.1": version: 6.0.4 resolution: "get-uri@npm:6.0.4"