diff --git a/apps/nextjs/src/app/[locale]/auth/invite/[id]/page.tsx b/apps/nextjs/src/app/[locale]/auth/invite/[id]/page.tsx index 1624b50b5..39e8fa623 100644 --- a/apps/nextjs/src/app/[locale]/auth/invite/[id]/page.tsx +++ b/apps/nextjs/src/app/[locale]/auth/invite/[id]/page.tsx @@ -4,7 +4,7 @@ import { Card, Center, Stack, Text, Title } from "@mantine/core"; import { auth } from "@homarr/auth/next"; import { isProviderEnabled } from "@homarr/auth/server"; import { and, db, eq } from "@homarr/db"; -import { invites } from "@homarr/db/schema/sqlite"; +import { invites } from "@homarr/db/schema"; import { getScopedI18n } from "@homarr/translation/server"; import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo"; diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/not-found.tsx b/apps/nextjs/src/app/[locale]/boards/(content)/not-found.tsx index ba84e0593..5ab6c8c61 100644 --- a/apps/nextjs/src/app/[locale]/boards/(content)/not-found.tsx +++ b/apps/nextjs/src/app/[locale]/boards/(content)/not-found.tsx @@ -2,7 +2,7 @@ import { IconHomeOff } from "@tabler/icons-react"; import { auth } from "@homarr/auth/next"; import { db } from "@homarr/db"; -import { boards } from "@homarr/db/schema/sqlite"; +import { boards } from "@homarr/db/schema"; import { getI18n } from "@homarr/translation/server"; import type { BoardNotFoundProps } from "~/components/board/not-found"; diff --git a/apps/nextjs/src/app/[locale]/manage/users/create/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/create/page.tsx index 4c49b6595..30511e47f 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/create/page.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/create/page.tsx @@ -3,7 +3,7 @@ import { notFound } from "next/navigation"; import { auth } from "@homarr/auth/next"; import { isProviderEnabled } from "@homarr/auth/server"; import { db, inArray } from "@homarr/db"; -import { groups } from "@homarr/db/schema/sqlite"; +import { groups } from "@homarr/db/schema"; import { everyoneGroup } from "@homarr/definitions"; import { getScopedI18n } from "@homarr/translation/server"; diff --git a/apps/nextjs/src/app/api/[...trpc]/route.ts b/apps/nextjs/src/app/api/[...trpc]/route.ts index ffd59c784..8d1d30f26 100644 --- a/apps/nextjs/src/app/api/[...trpc]/route.ts +++ b/apps/nextjs/src/app/api/[...trpc]/route.ts @@ -8,7 +8,7 @@ import { hashPasswordAsync } from "@homarr/auth"; import type { Session } from "@homarr/auth"; import { createSessionAsync } from "@homarr/auth/server"; import { db, eq } from "@homarr/db"; -import { apiKeys } from "@homarr/db/schema/sqlite"; +import { apiKeys } from "@homarr/db/schema"; import { logger } from "@homarr/log"; const handlerAsync = async (req: NextRequest) => { diff --git a/apps/nextjs/src/app/api/user-medias/[id]/route.ts b/apps/nextjs/src/app/api/user-medias/[id]/route.ts index 5f3fb36e3..751895381 100644 --- a/apps/nextjs/src/app/api/user-medias/[id]/route.ts +++ b/apps/nextjs/src/app/api/user-medias/[id]/route.ts @@ -3,7 +3,7 @@ import { NextResponse } from "next/server"; import type { NextRequest } from "next/server"; import { db, eq } from "@homarr/db"; -import { medias } from "@homarr/db/schema/sqlite"; +import { medias } from "@homarr/db/schema"; export async function GET(_req: NextRequest, { params }: { params: { id: string } }) { const image = await db.query.medias.findFirst({ diff --git a/packages/analytics/src/send-server-analytics.ts b/packages/analytics/src/send-server-analytics.ts index 51b3741ae..e09bd71da 100644 --- a/packages/analytics/src/send-server-analytics.ts +++ b/packages/analytics/src/send-server-analytics.ts @@ -3,7 +3,7 @@ import { Umami } from "@umami/node"; import { count, db } from "@homarr/db"; import { getServerSettingByKeyAsync } from "@homarr/db/queries"; -import { integrations, items, users } from "@homarr/db/schema/sqlite"; +import { integrations, items, users } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { defaultServerSettings } from "@homarr/server-settings"; diff --git a/packages/api/src/middlewares/integration.ts b/packages/api/src/middlewares/integration.ts index b6d715a56..d2a84f641 100644 --- a/packages/api/src/middlewares/integration.ts +++ b/packages/api/src/middlewares/integration.ts @@ -7,7 +7,7 @@ import { decryptSecret } from "@homarr/common/server"; import type { AtLeastOneOf } from "@homarr/common/types"; import type { Database } from "@homarr/db"; import { and, eq, inArray } from "@homarr/db"; -import { integrations } from "@homarr/db/schema/sqlite"; +import { integrations } from "@homarr/db/schema"; import type { IntegrationKind } from "@homarr/definitions"; import { z } from "@homarr/validation"; diff --git a/packages/api/src/middlewares/item.ts b/packages/api/src/middlewares/item.ts index 78cc623db..79d93a463 100644 --- a/packages/api/src/middlewares/item.ts +++ b/packages/api/src/middlewares/item.ts @@ -1,7 +1,7 @@ import { TRPCError } from "@trpc/server"; import { and, eq } from "@homarr/db"; -import { items } from "@homarr/db/schema/sqlite"; +import { items } from "@homarr/db/schema"; import type { WidgetKind } from "@homarr/definitions"; import { z } from "@homarr/validation"; diff --git a/packages/api/src/router/apiKeys.ts b/packages/api/src/router/apiKeys.ts index 715e85906..da903d695 100644 --- a/packages/api/src/router/apiKeys.ts +++ b/packages/api/src/router/apiKeys.ts @@ -1,7 +1,7 @@ import { createSaltAsync, hashPasswordAsync } from "@homarr/auth"; import { generateSecureRandomToken } from "@homarr/common/server"; import { createId, db } from "@homarr/db"; -import { apiKeys } from "@homarr/db/schema/sqlite"; +import { apiKeys } from "@homarr/db/schema"; import { createTRPCRouter, permissionRequiredProcedure } from "../trpc"; diff --git a/packages/api/src/router/app.ts b/packages/api/src/router/app.ts index 918559c3a..da4184e89 100644 --- a/packages/api/src/router/app.ts +++ b/packages/api/src/router/app.ts @@ -1,7 +1,7 @@ import { TRPCError } from "@trpc/server"; import { asc, createId, eq, inArray, like } from "@homarr/db"; -import { apps } from "@homarr/db/schema/sqlite"; +import { apps } from "@homarr/db/schema"; import { selectAppSchema } from "@homarr/db/validationSchemas"; import { validation, z } from "@homarr/validation"; diff --git a/packages/api/src/router/app/app-access-control.ts b/packages/api/src/router/app/app-access-control.ts index b395cea09..d4254cb75 100644 --- a/packages/api/src/router/app/app-access-control.ts +++ b/packages/api/src/router/app/app-access-control.ts @@ -2,7 +2,7 @@ import SuperJSON from "superjson"; import type { Session } from "@homarr/auth"; import { db, eq, or } from "@homarr/db"; -import { items } from "@homarr/db/schema/sqlite"; +import { items } from "@homarr/db/schema"; import type { WidgetComponentProps } from "../../../../widgets/src"; diff --git a/packages/api/src/router/board.ts b/packages/api/src/router/board.ts index 26c38ba91..291ce54a4 100644 --- a/packages/api/src/router/board.ts +++ b/packages/api/src/router/board.ts @@ -15,7 +15,7 @@ import { items, sections, users, -} from "@homarr/db/schema/sqlite"; +} from "@homarr/db/schema"; import type { WidgetKind } from "@homarr/definitions"; import { getPermissionsWithParents, widgetKinds } from "@homarr/definitions"; import { importOldmarrAsync } from "@homarr/old-import"; diff --git a/packages/api/src/router/board/board-access.ts b/packages/api/src/router/board/board-access.ts index 0bce8817a..1e4351cba 100644 --- a/packages/api/src/router/board/board-access.ts +++ b/packages/api/src/router/board/board-access.ts @@ -4,7 +4,7 @@ import type { Session } from "@homarr/auth"; import { constructBoardPermissions } from "@homarr/auth/shared"; import type { Database, SQL } from "@homarr/db"; import { eq, inArray } from "@homarr/db"; -import { boardGroupPermissions, boardUserPermissions, groupMembers } from "@homarr/db/schema/sqlite"; +import { boardGroupPermissions, boardUserPermissions, groupMembers } from "@homarr/db/schema"; import type { BoardPermission } from "@homarr/definitions"; /** diff --git a/packages/api/src/router/docker/docker-router.ts b/packages/api/src/router/docker/docker-router.ts index 0559e6211..6a8b99a1f 100644 --- a/packages/api/src/router/docker/docker-router.ts +++ b/packages/api/src/router/docker/docker-router.ts @@ -3,7 +3,7 @@ import type Docker from "dockerode"; import type { Container } from "dockerode"; import { db, like, or } from "@homarr/db"; -import { icons } from "@homarr/db/schema/sqlite"; +import { icons } from "@homarr/db/schema"; import type { DockerContainerState } from "@homarr/definitions"; import { logger } from "@homarr/log"; import { createCacheChannel } from "@homarr/redis"; diff --git a/packages/api/src/router/group.ts b/packages/api/src/router/group.ts index 7d3ed049b..a1d3be92f 100644 --- a/packages/api/src/router/group.ts +++ b/packages/api/src/router/group.ts @@ -2,7 +2,7 @@ import { TRPCError } from "@trpc/server"; import type { Database } from "@homarr/db"; import { and, createId, eq, like, not, sql } from "@homarr/db"; -import { groupMembers, groupPermissions, groups } from "@homarr/db/schema/sqlite"; +import { groupMembers, groupPermissions, groups } from "@homarr/db/schema"; import { everyoneGroup } from "@homarr/definitions"; import { validation, z } from "@homarr/validation"; diff --git a/packages/api/src/router/home.ts b/packages/api/src/router/home.ts index 2174a2968..7b65c74f3 100644 --- a/packages/api/src/router/home.ts +++ b/packages/api/src/router/home.ts @@ -3,7 +3,7 @@ import type { AnySQLiteTable } from "drizzle-orm/sqlite-core"; import { isProviderEnabled } from "@homarr/auth/server"; import type { Database } from "@homarr/db"; import { count } from "@homarr/db"; -import { apps, boards, groups, integrations, invites, users } from "@homarr/db/schema/sqlite"; +import { apps, boards, groups, integrations, invites, users } from "@homarr/db/schema"; import { createTRPCRouter, publicProcedure } from "../trpc"; diff --git a/packages/api/src/router/icons.ts b/packages/api/src/router/icons.ts index 7b7c2f52b..2128e25ad 100644 --- a/packages/api/src/router/icons.ts +++ b/packages/api/src/router/icons.ts @@ -1,5 +1,5 @@ import { count, like } from "@homarr/db"; -import { icons } from "@homarr/db/schema/sqlite"; +import { icons } from "@homarr/db/schema"; import { validation } from "@homarr/validation"; import { createTRPCRouter, publicProcedure } from "../trpc"; diff --git a/packages/api/src/router/integration/integration-access.ts b/packages/api/src/router/integration/integration-access.ts index f8e83e90b..78f8961e4 100644 --- a/packages/api/src/router/integration/integration-access.ts +++ b/packages/api/src/router/integration/integration-access.ts @@ -4,7 +4,7 @@ import type { Session } from "@homarr/auth"; import { constructIntegrationPermissions } from "@homarr/auth/shared"; import type { Database, SQL } from "@homarr/db"; import { eq, inArray } from "@homarr/db"; -import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema/sqlite"; +import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema"; import type { IntegrationPermission } from "@homarr/definitions"; /** diff --git a/packages/api/src/router/integration/integration-router.ts b/packages/api/src/router/integration/integration-router.ts index 72378a7e9..6b19101de 100644 --- a/packages/api/src/router/integration/integration-router.ts +++ b/packages/api/src/router/integration/integration-router.ts @@ -11,7 +11,7 @@ import { integrations, integrationSecrets, integrationUserPermissions, -} from "@homarr/db/schema/sqlite"; +} from "@homarr/db/schema"; import type { IntegrationSecretKind } from "@homarr/definitions"; import { getIntegrationKindsByCategory, diff --git a/packages/api/src/router/integration/integration-test-connection.ts b/packages/api/src/router/integration/integration-test-connection.ts index 93a0bc356..58fcc9d21 100644 --- a/packages/api/src/router/integration/integration-test-connection.ts +++ b/packages/api/src/router/integration/integration-test-connection.ts @@ -1,5 +1,5 @@ import { decryptSecret } from "@homarr/common/server"; -import type { Integration } from "@homarr/db/schema/sqlite"; +import type { Integration } from "@homarr/db/schema"; import type { IntegrationKind, IntegrationSecretKind } from "@homarr/definitions"; import { getAllSecretKindOptions } from "@homarr/definitions"; import { integrationCreator, IntegrationTestConnectionError } from "@homarr/integrations"; diff --git a/packages/api/src/router/invite.ts b/packages/api/src/router/invite.ts index c380f0003..6cbcc2869 100644 --- a/packages/api/src/router/invite.ts +++ b/packages/api/src/router/invite.ts @@ -2,7 +2,7 @@ import { randomBytes } from "crypto"; import { TRPCError } from "@trpc/server"; import { asc, createId, eq } from "@homarr/db"; -import { invites } from "@homarr/db/schema/sqlite"; +import { invites } from "@homarr/db/schema"; import { selectInviteSchema } from "@homarr/db/validationSchemas"; import { z } from "@homarr/validation"; diff --git a/packages/api/src/router/medias/media-router.ts b/packages/api/src/router/medias/media-router.ts index 90f497523..600df24b4 100644 --- a/packages/api/src/router/medias/media-router.ts +++ b/packages/api/src/router/medias/media-router.ts @@ -1,7 +1,7 @@ import { TRPCError } from "@trpc/server"; import { and, createId, desc, eq, like } from "@homarr/db"; -import { medias } from "@homarr/db/schema/sqlite"; +import { medias } from "@homarr/db/schema"; import { validation, z } from "@homarr/validation"; import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure } from "../../trpc"; diff --git a/packages/api/src/router/onboard/onboard-queries.ts b/packages/api/src/router/onboard/onboard-queries.ts index 6aeb0386c..15f205d8b 100644 --- a/packages/api/src/router/onboard/onboard-queries.ts +++ b/packages/api/src/router/onboard/onboard-queries.ts @@ -3,7 +3,7 @@ import { objectEntries } from "@homarr/common"; import type { MaybePromise } from "@homarr/common/types"; import type { Database } from "@homarr/db"; import { eq } from "@homarr/db"; -import { groups, onboarding } from "@homarr/db/schema/sqlite"; +import { groups, onboarding } from "@homarr/db/schema"; import type { OnboardingStep } from "@homarr/definitions"; import { credentialsAdminGroup } from "@homarr/definitions"; diff --git a/packages/api/src/router/onboard/onboard-router.ts b/packages/api/src/router/onboard/onboard-router.ts index 8b6120655..89b6fb66f 100644 --- a/packages/api/src/router/onboard/onboard-router.ts +++ b/packages/api/src/router/onboard/onboard-router.ts @@ -1,4 +1,4 @@ -import { onboarding } from "@homarr/db/schema/sqlite"; +import { onboarding } from "@homarr/db/schema"; import { onboardingSteps } from "@homarr/definitions"; import { z, zodEnumFromArray } from "@homarr/validation"; diff --git a/packages/api/src/router/search-engine/search-engine-router.ts b/packages/api/src/router/search-engine/search-engine-router.ts index 63c7c3bda..8e8fe853a 100644 --- a/packages/api/src/router/search-engine/search-engine-router.ts +++ b/packages/api/src/router/search-engine/search-engine-router.ts @@ -1,7 +1,7 @@ import { TRPCError } from "@trpc/server"; import { createId, eq, like, sql } from "@homarr/db"; -import { searchEngines } from "@homarr/db/schema/sqlite"; +import { searchEngines } from "@homarr/db/schema"; import { validation } from "@homarr/validation"; import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure } from "../../trpc"; diff --git a/packages/api/src/router/test/app.spec.ts b/packages/api/src/router/test/app.spec.ts index 0354ad74e..4da8a6117 100644 --- a/packages/api/src/router/test/app.spec.ts +++ b/packages/api/src/router/test/app.spec.ts @@ -3,7 +3,7 @@ import { describe, expect, test, vi } from "vitest"; import type { Session } from "@homarr/auth"; import { createId } from "@homarr/db"; -import { apps } from "@homarr/db/schema/sqlite"; +import { apps } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import type { GroupPermissionKey } from "@homarr/definitions"; diff --git a/packages/api/src/router/test/board.spec.ts b/packages/api/src/router/test/board.spec.ts index c8a50ca25..8c0da79e5 100644 --- a/packages/api/src/router/test/board.spec.ts +++ b/packages/api/src/router/test/board.spec.ts @@ -17,7 +17,7 @@ import { sections, serverSettings, users, -} from "@homarr/db/schema/sqlite"; +} from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import type { BoardPermission, GroupPermissionKey } from "@homarr/definitions"; diff --git a/packages/api/src/router/test/board/board-access.spec.ts b/packages/api/src/router/test/board/board-access.spec.ts index 599d08489..370a5bc51 100644 --- a/packages/api/src/router/test/board/board-access.spec.ts +++ b/packages/api/src/router/test/board/board-access.spec.ts @@ -2,7 +2,7 @@ import { describe, expect, test, vi } from "vitest"; import * as authShared from "@homarr/auth/shared"; import { createId, eq } from "@homarr/db"; -import { boards, users } from "@homarr/db/schema/sqlite"; +import { boards, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { throwIfActionForbiddenAsync } from "../../board/board-access"; diff --git a/packages/api/src/router/test/group.spec.ts b/packages/api/src/router/test/group.spec.ts index b552e3bbd..ab5357e8f 100644 --- a/packages/api/src/router/test/group.spec.ts +++ b/packages/api/src/router/test/group.spec.ts @@ -3,7 +3,7 @@ import { describe, expect, test, vi } from "vitest"; import type { Session } from "@homarr/auth"; import * as env from "@homarr/auth/env.mjs"; import { createId, eq } from "@homarr/db"; -import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema/sqlite"; +import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import type { GroupPermissionKey } from "@homarr/definitions"; diff --git a/packages/api/src/router/test/integration/integration-access.spec.ts b/packages/api/src/router/test/integration/integration-access.spec.ts index 5013c015f..7251f1e9a 100644 --- a/packages/api/src/router/test/integration/integration-access.spec.ts +++ b/packages/api/src/router/test/integration/integration-access.spec.ts @@ -2,7 +2,7 @@ import { describe, expect, test, vi } from "vitest"; import * as authShared from "@homarr/auth/shared"; import { createId, eq } from "@homarr/db"; -import { integrations, users } from "@homarr/db/schema/sqlite"; +import { integrations, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { throwIfActionForbiddenAsync } from "../../integration/integration-access"; diff --git a/packages/api/src/router/test/integration/integration-router.spec.ts b/packages/api/src/router/test/integration/integration-router.spec.ts index 52a23f3b6..c07c6af2e 100644 --- a/packages/api/src/router/test/integration/integration-router.spec.ts +++ b/packages/api/src/router/test/integration/integration-router.spec.ts @@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest"; import type { Session } from "@homarr/auth"; import { encryptSecret } from "@homarr/common/server"; import { createId } from "@homarr/db"; -import { integrations, integrationSecrets } from "@homarr/db/schema/sqlite"; +import { integrations, integrationSecrets } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import type { GroupPermissionKey } from "@homarr/definitions"; diff --git a/packages/api/src/router/test/invite.spec.ts b/packages/api/src/router/test/invite.spec.ts index 927e7fd91..886ef63df 100644 --- a/packages/api/src/router/test/invite.spec.ts +++ b/packages/api/src/router/test/invite.spec.ts @@ -3,7 +3,7 @@ import { describe, expect, test, vi } from "vitest"; import type { Session } from "@homarr/auth"; import { createId } from "@homarr/db"; -import { invites, users } from "@homarr/db/schema/sqlite"; +import { invites, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { inviteRouter } from "../invite"; diff --git a/packages/api/src/router/test/serverSettings.spec.ts b/packages/api/src/router/test/serverSettings.spec.ts index ba2a7c784..a3ae26422 100644 --- a/packages/api/src/router/test/serverSettings.spec.ts +++ b/packages/api/src/router/test/serverSettings.spec.ts @@ -3,7 +3,7 @@ import { describe, expect, test, vi } from "vitest"; import type { Session } from "@homarr/auth"; import { createId } from "@homarr/db"; -import { serverSettings } from "@homarr/db/schema/sqlite"; +import { serverSettings } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings"; diff --git a/packages/api/src/router/test/user.spec.ts b/packages/api/src/router/test/user.spec.ts index 1ae7c2dc7..0a3aa8d4f 100644 --- a/packages/api/src/router/test/user.spec.ts +++ b/packages/api/src/router/test/user.spec.ts @@ -2,8 +2,8 @@ import { describe, expect, it, test, vi } from "vitest"; import type { Session } from "@homarr/auth"; import type { Database } from "@homarr/db"; -import { createId, eq, schema } from "@homarr/db"; -import { onboarding, users } from "@homarr/db/schema/sqlite"; +import { createId, eq } from "@homarr/db"; +import { invites, onboarding, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions"; @@ -121,7 +121,7 @@ describe("register should create a user with valid invitation", () => { await db.insert(users).values({ id: userId, }); - await db.insert(schema.invites).values({ + await db.insert(invites).values({ id: inviteId, token: inviteToken, creatorId: userId, @@ -176,7 +176,7 @@ describe("register should create a user with valid invitation", () => { await db.insert(users).values({ id: userId, }); - await db.insert(schema.invites).values({ + await db.insert(invites).values({ id: inviteId, token: inviteToken, creatorId: userId, @@ -211,7 +211,7 @@ describe("editProfile shoud update user", () => { const emailVerified = new Date(2024, 0, 5); - await db.insert(schema.users).values({ + await db.insert(users).values({ id: defaultOwnerId, name: "TEST 1", email: "abc@gmail.com", @@ -226,7 +226,7 @@ describe("editProfile shoud update user", () => { }); // assert - const user = await db.select().from(schema.users).where(eq(schema.users.id, defaultOwnerId)); + const user = await db.select().from(users).where(eq(users.id, defaultOwnerId)); expect(user).toHaveLength(1); expect(user[0]).containSubset({ @@ -245,7 +245,7 @@ describe("editProfile shoud update user", () => { session: defaultSession, }); - await db.insert(schema.users).values({ + await db.insert(users).values({ id: defaultOwnerId, name: "TEST 1", email: "abc@gmail.com", @@ -260,7 +260,7 @@ describe("editProfile shoud update user", () => { }); // assert - const user = await db.select().from(schema.users).where(eq(schema.users.id, defaultOwnerId)); + const user = await db.select().from(users).where(eq(users.id, defaultOwnerId)); expect(user).toHaveLength(1); expect(user[0]).containSubset({ @@ -295,11 +295,11 @@ describe("delete should delete user", () => { }, ]; - await db.insert(schema.users).values(initialUsers); + await db.insert(users).values(initialUsers); await caller.delete({ userId: defaultOwnerId }); - const usersInDb = await db.select().from(schema.users); + const usersInDb = await db.select().from(users); expect(usersInDb).toHaveLength(2); expect(usersInDb[0]).containSubset(initialUsers[0]); expect(usersInDb[1]).containSubset(initialUsers[2]); diff --git a/packages/api/src/router/user.ts b/packages/api/src/router/user.ts index 4a412365d..4d1691f29 100644 --- a/packages/api/src/router/user.ts +++ b/packages/api/src/router/user.ts @@ -2,8 +2,8 @@ import { TRPCError } from "@trpc/server"; import { createSaltAsync, hashPasswordAsync } from "@homarr/auth"; import type { Database } from "@homarr/db"; -import { and, createId, eq, like, schema } from "@homarr/db"; -import { groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema/sqlite"; +import { and, createId, eq, like } from "@homarr/db"; +import { groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema"; import { selectUserSchema } from "@homarr/db/validationSchemas"; import { credentialsAdminGroup } from "@homarr/definitions"; import type { SupportedAuthProvider } from "@homarr/definitions"; @@ -509,7 +509,7 @@ const createUserAsync = async (db: Database, input: Omit { diff --git a/packages/auth/callbacks.ts b/packages/auth/callbacks.ts index d5fac0b7a..8f1168ad8 100644 --- a/packages/auth/callbacks.ts +++ b/packages/auth/callbacks.ts @@ -4,7 +4,7 @@ import type { NextAuthConfig } from "next-auth"; import type { Session } from "@homarr/auth"; import type { Database } from "@homarr/db"; import { eq, inArray } from "@homarr/db"; -import { groupMembers, groupPermissions, users } from "@homarr/db/schema/sqlite"; +import { groupMembers, groupPermissions, users } from "@homarr/db/schema"; import { getPermissionsWithChildren } from "@homarr/definitions"; export const getCurrentUserPermissionsAsync = async (db: Database, userId: string) => { diff --git a/packages/auth/events.ts b/packages/auth/events.ts index 2c636d14b..92987e0cf 100644 --- a/packages/auth/events.ts +++ b/packages/auth/events.ts @@ -4,7 +4,7 @@ import type { NextAuthConfig } from "next-auth"; import { and, eq, inArray } from "@homarr/db"; import type { Database } from "@homarr/db"; -import { groupMembers, groups, users } from "@homarr/db/schema/sqlite"; +import { groupMembers, groups, users } from "@homarr/db/schema"; import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions"; import { logger } from "@homarr/log"; diff --git a/packages/auth/permissions/integration-query-permissions.ts b/packages/auth/permissions/integration-query-permissions.ts index 4ee7a31c2..13d65aca8 100644 --- a/packages/auth/permissions/integration-query-permissions.ts +++ b/packages/auth/permissions/integration-query-permissions.ts @@ -2,7 +2,7 @@ import type { Session } from "next-auth"; import type { Database } from "@homarr/db"; import { and, eq, inArray, or } from "@homarr/db"; -import { boards, boardUserPermissions, groupMembers } from "@homarr/db/schema/sqlite"; +import { boards, boardUserPermissions, groupMembers } from "@homarr/db/schema"; import type { IntegrationPermission } from "@homarr/definitions"; import { constructIntegrationPermissions } from "./integration-permissions"; diff --git a/packages/auth/permissions/integrations-with-permissions.ts b/packages/auth/permissions/integrations-with-permissions.ts index 64fe09087..76cae6c93 100644 --- a/packages/auth/permissions/integrations-with-permissions.ts +++ b/packages/auth/permissions/integrations-with-permissions.ts @@ -1,7 +1,7 @@ import type { Session } from "next-auth"; import { db, eq, inArray } from "@homarr/db"; -import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema/sqlite"; +import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema"; import { constructIntegrationPermissions } from "./integration-permissions"; diff --git a/packages/auth/permissions/test/integration-query-permissions.spec.ts b/packages/auth/permissions/test/integration-query-permissions.spec.ts index faf527d92..a1d9f52ed 100644 --- a/packages/auth/permissions/test/integration-query-permissions.spec.ts +++ b/packages/auth/permissions/test/integration-query-permissions.spec.ts @@ -3,14 +3,7 @@ import { describe, expect, test, vi } from "vitest"; import type { InferInsertModel } from "@homarr/db"; import { createId } from "@homarr/db"; -import { - boardGroupPermissions, - boards, - boardUserPermissions, - groupMembers, - groups, - users, -} from "@homarr/db/schema/sqlite"; +import { boardGroupPermissions, boards, boardUserPermissions, groupMembers, groups, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import * as integrationPermissions from "../integration-permissions"; diff --git a/packages/auth/providers/credentials/authorization/basic-authorization.ts b/packages/auth/providers/credentials/authorization/basic-authorization.ts index 6357df7c6..cdce3fe9e 100644 --- a/packages/auth/providers/credentials/authorization/basic-authorization.ts +++ b/packages/auth/providers/credentials/authorization/basic-authorization.ts @@ -2,7 +2,7 @@ import bcrypt from "bcrypt"; import type { Database } from "@homarr/db"; import { and, eq } from "@homarr/db"; -import { users } from "@homarr/db/schema/sqlite"; +import { users } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { validation, z } from "@homarr/validation"; diff --git a/packages/auth/providers/credentials/authorization/ldap-authorization.ts b/packages/auth/providers/credentials/authorization/ldap-authorization.ts index cae75f693..529d26ff2 100644 --- a/packages/auth/providers/credentials/authorization/ldap-authorization.ts +++ b/packages/auth/providers/credentials/authorization/ldap-authorization.ts @@ -2,7 +2,7 @@ import { CredentialsSignin } from "@auth/core/errors"; import type { Database, InferInsertModel } from "@homarr/db"; import { and, createId, eq } from "@homarr/db"; -import { users } from "@homarr/db/schema/sqlite"; +import { users } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { validation } from "@homarr/validation"; import { z } from "@homarr/validation"; diff --git a/packages/auth/providers/test/basic-authorization.spec.ts b/packages/auth/providers/test/basic-authorization.spec.ts index b828d2784..8955ea83a 100644 --- a/packages/auth/providers/test/basic-authorization.spec.ts +++ b/packages/auth/providers/test/basic-authorization.spec.ts @@ -1,7 +1,7 @@ import { describe, expect, test } from "vitest"; import { createId } from "@homarr/db"; -import { users } from "@homarr/db/schema/sqlite"; +import { users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { createSaltAsync, hashPasswordAsync } from "../../security"; diff --git a/packages/auth/providers/test/ldap-authorization.spec.ts b/packages/auth/providers/test/ldap-authorization.spec.ts index c78fba30f..8d4a03ff9 100644 --- a/packages/auth/providers/test/ldap-authorization.spec.ts +++ b/packages/auth/providers/test/ldap-authorization.spec.ts @@ -3,7 +3,7 @@ import { describe, expect, test, vi } from "vitest"; import type { Database } from "@homarr/db"; import { and, createId, eq } from "@homarr/db"; -import { groups, users } from "@homarr/db/schema/sqlite"; +import { groups, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization"; diff --git a/packages/auth/test/adapter.spec.ts b/packages/auth/test/adapter.spec.ts index 7c74ffa4e..d20ae3d1a 100644 --- a/packages/auth/test/adapter.spec.ts +++ b/packages/auth/test/adapter.spec.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from "vitest"; -import { users } from "@homarr/db/schema/sqlite"; +import { users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { createAdapter } from "../adapter"; diff --git a/packages/auth/test/callbacks.spec.ts b/packages/auth/test/callbacks.spec.ts index d2da21a3b..6a1f52e2b 100644 --- a/packages/auth/test/callbacks.spec.ts +++ b/packages/auth/test/callbacks.spec.ts @@ -3,7 +3,7 @@ import type { AdapterUser } from "@auth/core/adapters"; import type { JWT } from "next-auth/jwt"; import { describe, expect, test, vi } from "vitest"; -import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema/sqlite"; +import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import * as definitions from "@homarr/definitions"; diff --git a/packages/auth/test/events.spec.ts b/packages/auth/test/events.spec.ts index 272612ce9..5fb37a9a2 100644 --- a/packages/auth/test/events.spec.ts +++ b/packages/auth/test/events.spec.ts @@ -5,7 +5,7 @@ import { describe, expect, test, vi } from "vitest"; import { eq } from "@homarr/db"; import type { Database } from "@homarr/db"; -import { groupMembers, groups, users } from "@homarr/db/schema/sqlite"; +import { groupMembers, groups, users } from "@homarr/db/schema"; import { createDb } from "@homarr/db/test"; import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions"; diff --git a/packages/cli/src/commands/reset-password.ts b/packages/cli/src/commands/reset-password.ts index a2a31cac0..ee4383205 100644 --- a/packages/cli/src/commands/reset-password.ts +++ b/packages/cli/src/commands/reset-password.ts @@ -3,7 +3,7 @@ import { command, string } from "@drizzle-team/brocli"; import { hashPasswordAsync } from "@homarr/auth"; import { generateSecureRandomToken } from "@homarr/common/server"; import { and, db, eq } from "@homarr/db"; -import { sessions, users } from "@homarr/db/schema/sqlite"; +import { sessions, users } from "@homarr/db/schema"; export const resetPassword = command({ name: "reset-password", diff --git a/packages/cron-jobs/src/jobs/icons-updater.ts b/packages/cron-jobs/src/jobs/icons-updater.ts index 9c4aca75d..48fa0c59c 100644 --- a/packages/cron-jobs/src/jobs/icons-updater.ts +++ b/packages/cron-jobs/src/jobs/icons-updater.ts @@ -3,7 +3,7 @@ import { EVERY_WEEK } from "@homarr/cron-jobs-core/expressions"; import type { InferInsertModel } from "@homarr/db"; import { db, inArray } from "@homarr/db"; import { createId } from "@homarr/db/client"; -import { iconRepositories, icons } from "@homarr/db/schema/sqlite"; +import { iconRepositories, icons } from "@homarr/db/schema"; import { fetchIconsAsync } from "@homarr/icons"; import { logger } from "@homarr/log"; diff --git a/packages/cron-jobs/src/jobs/rss-feeds.ts b/packages/cron-jobs/src/jobs/rss-feeds.ts index 5c468520d..4c7f2d720 100644 --- a/packages/cron-jobs/src/jobs/rss-feeds.ts +++ b/packages/cron-jobs/src/jobs/rss-feeds.ts @@ -5,7 +5,7 @@ import SuperJSON from "superjson"; import type { Modify } from "@homarr/common/types"; import { EVERY_5_MINUTES } from "@homarr/cron-jobs-core/expressions"; import { db, eq } from "@homarr/db"; -import { items } from "@homarr/db/schema/sqlite"; +import { items } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import { createItemChannel } from "@homarr/redis"; import { z } from "@homarr/validation"; diff --git a/packages/cron-jobs/src/jobs/session-cleanup.ts b/packages/cron-jobs/src/jobs/session-cleanup.ts index f9d382ad5..cbfe8533d 100644 --- a/packages/cron-jobs/src/jobs/session-cleanup.ts +++ b/packages/cron-jobs/src/jobs/session-cleanup.ts @@ -1,7 +1,7 @@ import { env } from "@homarr/auth/env.mjs"; import { NEVER } from "@homarr/cron-jobs-core/expressions"; import { db, eq, inArray } from "@homarr/db"; -import { sessions, users } from "@homarr/db/schema/sqlite"; +import { sessions, users } from "@homarr/db/schema"; import { supportedAuthProviders } from "@homarr/definitions"; import { logger } from "@homarr/log"; diff --git a/packages/db/index.ts b/packages/db/index.ts index beec11606..33575cb57 100644 --- a/packages/db/index.ts +++ b/packages/db/index.ts @@ -1,10 +1,6 @@ import Database from "better-sqlite3"; import { database } from "./driver"; -import * as sqliteSchema from "./schema/sqlite"; - -// Export only the types from the sqlite schema as we're using that. -export const schema = sqliteSchema; export * from "drizzle-orm"; diff --git a/packages/db/migrations/seed.ts b/packages/db/migrations/seed.ts index 15a82ea20..105147e20 100644 --- a/packages/db/migrations/seed.ts +++ b/packages/db/migrations/seed.ts @@ -6,8 +6,8 @@ import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server import { createId, eq } from ".."; import type { Database } from ".."; +import { onboarding, serverSettings } from "../schema"; import { groups } from "../schema/mysql"; -import { onboarding, serverSettings } from "../schema/sqlite"; export const seedDataAsync = async (db: Database) => { await seedEveryoneGroupAsync(db); diff --git a/packages/db/migrations/sqlite/migrate.ts b/packages/db/migrations/sqlite/migrate.ts index 420169677..217fa1941 100644 --- a/packages/db/migrations/sqlite/migrate.ts +++ b/packages/db/migrations/sqlite/migrate.ts @@ -2,7 +2,7 @@ import Database from "better-sqlite3"; import { drizzle } from "drizzle-orm/better-sqlite3"; import { migrate } from "drizzle-orm/better-sqlite3/migrator"; -import { schema } from "../.."; +import * as sqliteSchema from "../../schema/sqlite"; import { seedDataAsync } from "../seed"; const migrationsFolder = process.argv[2] ?? "."; @@ -10,7 +10,7 @@ const migrationsFolder = process.argv[2] ?? "."; const migrateAsync = async () => { const sqlite = new Database(process.env.DB_URL?.replace("file:", "")); - const db = drizzle(sqlite, { schema, casing: "snake_case" }); + const db = drizzle(sqlite, { schema: sqliteSchema, casing: "snake_case" }); migrate(db, { migrationsFolder }); diff --git a/packages/db/package.json b/packages/db/package.json index d9185a487..3659823d0 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -7,7 +7,7 @@ "exports": { ".": "./index.ts", "./client": "./client.ts", - "./schema/sqlite": "./schema/sqlite.ts", + "./schema": "./schema/index.ts", "./test": "./test/index.ts", "./queries": "./queries/index.ts", "./validationSchemas": "./validationSchemas.ts" diff --git a/packages/db/queries/item.ts b/packages/db/queries/item.ts index 336270471..db048556f 100644 --- a/packages/db/queries/item.ts +++ b/packages/db/queries/item.ts @@ -3,7 +3,7 @@ import type { WidgetKind } from "@homarr/definitions"; import type { Database } from ".."; import { inArray } from ".."; import type { inferSupportedIntegrations } from "../../widgets/src"; -import { items } from "../schema/sqlite"; +import { items } from "../schema"; export const getItemsWithIntegrationsAsync = async ( db: Database, diff --git a/packages/db/queries/server-setting.ts b/packages/db/queries/server-setting.ts index a8039aa32..73f5156bc 100644 --- a/packages/db/queries/server-setting.ts +++ b/packages/db/queries/server-setting.ts @@ -5,7 +5,7 @@ import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server import type { Database } from ".."; import { eq } from ".."; -import { serverSettings } from "../schema/sqlite"; +import { serverSettings } from "../schema"; export const getServerSettingsAsync = async (db: Database) => { const settings = await db.query.serverSettings.findMany(); diff --git a/packages/db/schema/index.ts b/packages/db/schema/index.ts new file mode 100644 index 000000000..20000f771 --- /dev/null +++ b/packages/db/schema/index.ts @@ -0,0 +1,45 @@ +import type { InferSelectModel } from "drizzle-orm"; + +import * as mysqlSchema from "./mysql"; +import * as sqliteSchema from "./sqlite"; + +type Schema = typeof sqliteSchema; + +const schema = process.env.DB_DRIVER === "mysql2" ? (mysqlSchema as unknown as Schema) : sqliteSchema; + +// Sadly we can't use export * from here as we have multiple possible exports +export const { + accounts, + apiKeys, + apps, + boardGroupPermissions, + boardUserPermissions, + boards, + groupMembers, + groupPermissions, + groups, + iconRepositories, + icons, + integrationGroupPermissions, + integrationItems, + integrationSecrets, + integrationUserPermissions, + integrations, + invites, + items, + medias, + onboarding, + searchEngines, + sections, + serverSettings, + sessions, + users, + verificationTokens, +} = schema; + +export type User = InferSelectModel; +export type Account = InferSelectModel; +export type Session = InferSelectModel; +export type VerificationToken = InferSelectModel; +export type Integration = InferSelectModel; +export type IntegrationSecret = InferSelectModel; diff --git a/packages/db/schema/sqlite.ts b/packages/db/schema/sqlite.ts index f5feffc71..6a24a87ed 100644 --- a/packages/db/schema/sqlite.ts +++ b/packages/db/schema/sqlite.ts @@ -1,6 +1,5 @@ import type { AdapterAccount } from "@auth/core/adapters"; import type { DayOfWeek } from "@mantine/dates"; -import type { InferSelectModel } from "drizzle-orm"; import { relations, sql } from "drizzle-orm"; import type { AnySQLiteColumn } from "drizzle-orm/sqlite-core"; import { blob, index, int, primaryKey, sqliteTable, text } from "drizzle-orm/sqlite-core"; @@ -567,10 +566,3 @@ export const searchEngineRelations = relations(searchEngines, ({ one }) => ({ references: [integrations.id], }), })); - -export type User = InferSelectModel; -export type Account = InferSelectModel; -export type Session = InferSelectModel; -export type VerificationToken = InferSelectModel; -export type Integration = InferSelectModel; -export type IntegrationSecret = InferSelectModel; diff --git a/packages/db/test/db-mock.ts b/packages/db/test/db-mock.ts index e2f249554..176a27534 100644 --- a/packages/db/test/db-mock.ts +++ b/packages/db/test/db-mock.ts @@ -2,11 +2,11 @@ import Database from "better-sqlite3"; import { drizzle } from "drizzle-orm/better-sqlite3"; import { migrate } from "drizzle-orm/better-sqlite3/migrator"; -import { schema } from ".."; +import * as sqliteSchema from "../schema/sqlite"; export const createDb = (debug?: boolean) => { const sqlite = new Database(":memory:"); - const db = drizzle(sqlite, { schema, logger: debug, casing: "snake_case" }); + const db = drizzle(sqlite, { schema: sqliteSchema, logger: debug, casing: "snake_case" }); migrate(db, { migrationsFolder: "./packages/db/migrations/sqlite", }); diff --git a/packages/db/validationSchemas.ts b/packages/db/validationSchemas.ts index 584fdfa6f..da49819e3 100644 --- a/packages/db/validationSchemas.ts +++ b/packages/db/validationSchemas.ts @@ -1,6 +1,6 @@ import { createSelectSchema } from "drizzle-zod"; -import { apps, boards, groups, invites, searchEngines, serverSettings, users } from "./schema/sqlite"; +import { apps, boards, groups, invites, searchEngines, serverSettings, users } from "./schema"; export const selectAppSchema = createSelectSchema(apps); export const selectBoardSchema = createSelectSchema(boards); diff --git a/packages/integrations/src/base/creator.ts b/packages/integrations/src/base/creator.ts index 82e54d98d..c6782127a 100644 --- a/packages/integrations/src/base/creator.ts +++ b/packages/integrations/src/base/creator.ts @@ -1,6 +1,6 @@ import { decryptSecret } from "@homarr/common/server"; import type { Modify } from "@homarr/common/types"; -import type { Integration as DbIntegration } from "@homarr/db/schema/sqlite"; +import type { Integration as DbIntegration } from "@homarr/db/schema"; import type { IntegrationKind, IntegrationSecretKind } from "@homarr/definitions"; import { AdGuardHomeIntegration } from "../adguard-home/adguard-home-integration"; diff --git a/packages/integrations/src/interfaces/downloads/download-client-items.ts b/packages/integrations/src/interfaces/downloads/download-client-items.ts index 53d31b49a..7137890d8 100644 --- a/packages/integrations/src/interfaces/downloads/download-client-items.ts +++ b/packages/integrations/src/interfaces/downloads/download-client-items.ts @@ -1,4 +1,4 @@ -import type { Integration } from "@homarr/db/schema/sqlite"; +import type { Integration } from "@homarr/db/schema"; import { z } from "@homarr/validation"; const usenetQueueState = ["downloading", "queued", "paused"] as const; diff --git a/packages/integrations/src/interfaces/downloads/download-client-status.ts b/packages/integrations/src/interfaces/downloads/download-client-status.ts index d8bfc09c0..37fb290b6 100644 --- a/packages/integrations/src/interfaces/downloads/download-client-status.ts +++ b/packages/integrations/src/interfaces/downloads/download-client-status.ts @@ -1,4 +1,4 @@ -import type { Integration } from "@homarr/db/schema/sqlite"; +import type { Integration } from "@homarr/db/schema"; export interface DownloadClientStatus { /** If client is considered paused */ diff --git a/packages/old-import/src/import-apps.ts b/packages/old-import/src/import-apps.ts index 342ba682f..6f0a3f4fa 100644 --- a/packages/old-import/src/import-apps.ts +++ b/packages/old-import/src/import-apps.ts @@ -1,6 +1,6 @@ import { createId, inArray } from "@homarr/db"; import type { Database, InferInsertModel, InferSelectModel } from "@homarr/db"; -import { apps as appsTable } from "@homarr/db/schema/sqlite"; +import { apps as appsTable } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { OldmarrApp } from "@homarr/old-schema"; diff --git a/packages/old-import/src/import-board.ts b/packages/old-import/src/import-board.ts index 822e37ed3..737de5f56 100644 --- a/packages/old-import/src/import-board.ts +++ b/packages/old-import/src/import-board.ts @@ -1,6 +1,6 @@ import type { Database } from "@homarr/db"; import { createId } from "@homarr/db"; -import { boards } from "@homarr/db/schema/sqlite"; +import { boards } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { OldmarrConfig } from "@homarr/old-schema"; diff --git a/packages/old-import/src/import-items.ts b/packages/old-import/src/import-items.ts index 652687d21..a3fa7dbaf 100644 --- a/packages/old-import/src/import-items.ts +++ b/packages/old-import/src/import-items.ts @@ -2,7 +2,7 @@ import SuperJSON from "superjson"; import type { Database } from "@homarr/db"; import { createId } from "@homarr/db"; -import { items } from "@homarr/db/schema/sqlite"; +import { items } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { OldmarrApp, OldmarrWidget } from "@homarr/old-schema"; diff --git a/packages/old-import/src/import-sections.ts b/packages/old-import/src/import-sections.ts index 1aa8afc87..4d332b87c 100644 --- a/packages/old-import/src/import-sections.ts +++ b/packages/old-import/src/import-sections.ts @@ -1,6 +1,6 @@ import { createId } from "@homarr/db"; import type { Database } from "@homarr/db"; -import { sections } from "@homarr/db/schema/sqlite"; +import { sections } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { OldmarrConfig } from "@homarr/old-schema"; diff --git a/packages/old-import/src/import/collections/common.ts b/packages/old-import/src/import/collections/common.ts index 7dd07f087..4065063b5 100644 --- a/packages/old-import/src/import/collections/common.ts +++ b/packages/old-import/src/import/collections/common.ts @@ -1,6 +1,6 @@ import { objectEntries } from "@homarr/common"; import type { Database, InferInsertModel } from "@homarr/db"; -import { schema } from "@homarr/db"; +import * as schema from "@homarr/db/schema"; type TableKey = { [K in keyof typeof schema]: (typeof schema)[K] extends { _: { brand: "Table" } } ? K : never; diff --git a/packages/old-import/src/import/import-single-oldmarr.ts b/packages/old-import/src/import/import-single-oldmarr.ts index 568595929..42bcc5c15 100644 --- a/packages/old-import/src/import/import-single-oldmarr.ts +++ b/packages/old-import/src/import/import-single-oldmarr.ts @@ -1,6 +1,6 @@ import { inArray } from "@homarr/db"; import type { Database } from "@homarr/db"; -import { apps } from "@homarr/db/schema/sqlite"; +import { apps } from "@homarr/db/schema"; import type { OldmarrConfig } from "@homarr/old-schema"; import { doAppsMatch } from "../prepare/prepare-apps"; diff --git a/packages/old-import/src/mappers/map-app.ts b/packages/old-import/src/mappers/map-app.ts index 0232edc50..3b0bc095e 100644 --- a/packages/old-import/src/mappers/map-app.ts +++ b/packages/old-import/src/mappers/map-app.ts @@ -1,5 +1,5 @@ import type { InferSelectModel } from "@homarr/db"; -import type { apps } from "@homarr/db/schema/sqlite"; +import type { apps } from "@homarr/db/schema"; import type { OldmarrApp } from "@homarr/old-schema"; import type { OldmarrBookmarkDefinition } from "../widgets/definitions/bookmark"; diff --git a/packages/old-import/src/mappers/map-board.ts b/packages/old-import/src/mappers/map-board.ts index a11b84cbd..28a9dfa26 100644 --- a/packages/old-import/src/mappers/map-board.ts +++ b/packages/old-import/src/mappers/map-board.ts @@ -1,6 +1,6 @@ import type { InferInsertModel } from "@homarr/db"; import { createId } from "@homarr/db"; -import type { boards } from "@homarr/db/schema/sqlite"; +import type { boards } from "@homarr/db/schema"; import type { prepareMultipleImports } from "../prepare/prepare-multiple"; import { mapColor } from "./map-colors"; diff --git a/packages/old-import/src/mappers/map-item.ts b/packages/old-import/src/mappers/map-item.ts index f24fdfb37..1262e0e4d 100644 --- a/packages/old-import/src/mappers/map-item.ts +++ b/packages/old-import/src/mappers/map-item.ts @@ -2,7 +2,7 @@ import SuperJSON from "superjson"; import type { InferInsertModel } from "@homarr/db"; import { createId } from "@homarr/db"; -import type { items } from "@homarr/db/schema/sqlite"; +import type { items } from "@homarr/db/schema"; import { logger } from "@homarr/log"; import type { BoardSize, OldmarrApp, OldmarrWidget } from "@homarr/old-schema"; diff --git a/packages/old-import/src/mappers/map-section.ts b/packages/old-import/src/mappers/map-section.ts index 10bf47ac8..e80b8969a 100644 --- a/packages/old-import/src/mappers/map-section.ts +++ b/packages/old-import/src/mappers/map-section.ts @@ -1,6 +1,6 @@ import type { InferInsertModel } from "@homarr/db"; import { createId } from "@homarr/db"; -import type { sections } from "@homarr/db/schema/sqlite"; +import type { sections } from "@homarr/db/schema"; import type { OldmarrCategorySection, OldmarrEmptySection } from "@homarr/old-schema"; export const mapCategorySection = ( diff --git a/packages/old-import/src/mappers/map-user.ts b/packages/old-import/src/mappers/map-user.ts index 465eae455..ffa4c3509 100644 --- a/packages/old-import/src/mappers/map-user.ts +++ b/packages/old-import/src/mappers/map-user.ts @@ -1,7 +1,7 @@ import { decryptSecretWithKey } from "@homarr/common/server"; import type { InferInsertModel } from "@homarr/db"; import { createId } from "@homarr/db"; -import type { users } from "@homarr/db/schema/sqlite"; +import type { users } from "@homarr/db/schema"; import type { OldmarrImportUser } from "../user-schema"; diff --git a/packages/old-import/src/prepare/prepare-apps.ts b/packages/old-import/src/prepare/prepare-apps.ts index d38820102..973ea3653 100644 --- a/packages/old-import/src/prepare/prepare-apps.ts +++ b/packages/old-import/src/prepare/prepare-apps.ts @@ -1,5 +1,5 @@ import type { InferSelectModel } from "@homarr/db"; -import type { apps } from "@homarr/db/schema/sqlite"; +import type { apps } from "@homarr/db/schema"; import type { OldmarrConfig } from "@homarr/old-schema"; import type { ValidAnalyseConfig } from "../analyse/types"; diff --git a/packages/request-handler/src/lib/cached-integration-request-handler.ts b/packages/request-handler/src/lib/cached-integration-request-handler.ts index 437e7117c..b5d25decc 100644 --- a/packages/request-handler/src/lib/cached-integration-request-handler.ts +++ b/packages/request-handler/src/lib/cached-integration-request-handler.ts @@ -1,7 +1,7 @@ import type { Duration } from "dayjs/plugin/duration"; import type { Modify } from "@homarr/common/types"; -import type { Integration, IntegrationSecret } from "@homarr/db/schema/sqlite"; +import type { Integration, IntegrationSecret } from "@homarr/db/schema"; import type { IntegrationKind } from "@homarr/definitions"; import { createIntegrationOptionsChannel } from "@homarr/redis";