fix(db): remove bulk drizzle-orm export

packages/api/package.json

@@ -46,6 +46,7 @@
     "@trpc/react-query": "^11.8.0",
     "@trpc/server": "^11.8.0",
     "@trpc/tanstack-react-query": "^11.8.0",
+    "drizzle-orm": "^0.45.1",
     "lodash.clonedeep": "^4.5.0",
     "next": "16.0.10",
     "react": "19.2.3",

packages/api/src/middlewares/integration.ts

@@ -1,4 +1,5 @@
 import { TRPCError } from "@trpc/server";
+import { and, eq, inArray } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import type { Session } from "@homarr/auth";
@@ -7,7 +8,6 @@ import { constructIntegrationPermissions } from "@homarr/auth/shared";
 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";
 import type { IntegrationKind } from "@homarr/definitions";
 

packages/api/src/middlewares/item.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from "@trpc/server";
+import { and, eq } from "drizzle-orm";
 import { z } from "zod/v4";
 
-import { and, eq } from "@homarr/db";
 import { items } from "@homarr/db/schema";
 import type { WidgetKind } from "@homarr/definitions";
 

packages/api/src/router/apiKeys.ts

@@ -1,9 +1,10 @@
+import { eq } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import { generateSecureRandomToken } from "@homarr/common/server";
-import { db, eq } from "@homarr/db";
+import { db } from "@homarr/db";
 import { apiKeys } from "@homarr/db/schema";
 
 import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";

packages/api/src/router/app.ts

@@ -1,8 +1,8 @@
 import { TRPCError } from "@trpc/server";
+import { asc, eq, inArray, like } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createId } from "@homarr/common";
-import { asc, eq, inArray, like } from "@homarr/db";
 import { apps } from "@homarr/db/schema";
 import { selectAppSchema } from "@homarr/db/validationSchemas";
 import { getIconForName } from "@homarr/icons";

packages/api/src/router/app/app-access-control.ts

@@ -1,7 +1,8 @@
+import { eq, or } from "drizzle-orm";
 import SuperJSON from "superjson";
 
 import type { Session } from "@homarr/auth";
-import { db, eq, or } from "@homarr/db";
+import { db } from "@homarr/db";
 import { items } from "@homarr/db/schema";
 
 import type { WidgetComponentProps } from "../../../../widgets/src";

packages/api/src/router/board.ts

@@ -1,12 +1,14 @@
 import { TRPCError } from "@trpc/server";
+import type { InferInsertModel, InferSelectModel, SQL } from "drizzle-orm";
+import { and, asc, eq, inArray, isNull, like, not, or, sql } from "drizzle-orm";
 import superjson from "superjson";
 import { z } from "zod/v4";
 
 import { constructBoardPermissions } from "@homarr/auth/shared";
 import { createId } from "@homarr/common";
 import type { DeviceType } from "@homarr/common/server";
-import type { Database, InferInsertModel, InferSelectModel, SQL } from "@homarr/db";
-import { and, asc, eq, handleTransactionsAsync, inArray, isNull, like, not, or, sql } from "@homarr/db";
+import type { Database } from "@homarr/db";
+import { handleTransactionsAsync } from "@homarr/db";
 import { createDbInsertCollectionWithoutTransaction } from "@homarr/db/collection";
 import { getServerSettingByKeyAsync } from "@homarr/db/queries";
 import {

packages/api/src/router/board/board-access.ts

@@ -1,9 +1,10 @@
 import { TRPCError } from "@trpc/server";
+import type { SQL } from "drizzle-orm";
+import { eq, inArray } from "drizzle-orm";
 
 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 type { Database } from "@homarr/db";
 import { boardGroupPermissions, boardUserPermissions, groupMembers } from "@homarr/db/schema";
 import type { BoardPermission } from "@homarr/definitions";
 

packages/api/src/router/certificates/certificate-router.ts

@@ -1,5 +1,6 @@
 import { X509Certificate } from "node:crypto";
 import { TRPCError } from "@trpc/server";
+import { and, eq } from "drizzle-orm";
 import { zfd } from "zod-form-data";
 import { z } from "zod/v4";
 
@@ -8,7 +9,6 @@ import {
   removeCustomRootCertificateAsync,
 } from "@homarr/core/infrastructure/certificates";
 import { createLogger } from "@homarr/core/infrastructure/logs";
-import { and, eq } from "@homarr/db";
 import { trustedCertificateHostnames } from "@homarr/db/schema";
 import { certificateValidFileNameSchema, checkCertificateFile } from "@homarr/validation/certificates";
 

packages/api/src/router/group.ts

@@ -1,9 +1,10 @@
 import { TRPCError } from "@trpc/server";
+import { and, eq, like, not } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createId } from "@homarr/common";
 import type { Database } from "@homarr/db";
-import { and, eq, handleTransactionsAsync, like, not } from "@homarr/db";
+import { handleTransactionsAsync } from "@homarr/db";
 import { getMaxGroupPositionAsync } from "@homarr/db/queries";
 import { groupMembers, groupPermissions, groups } from "@homarr/db/schema";
 import { everyoneGroup } from "@homarr/definitions";

packages/api/src/router/home.ts

@@ -1,5 +1,7 @@
+import { eq, inArray, or } from "drizzle-orm";
+
 import { isProviderEnabled } from "@homarr/auth/server";
-import { db, eq, inArray, or } from "@homarr/db";
+import { db } from "@homarr/db";
 import {
   apps,
   boards,

packages/api/src/router/icons.ts

@@ -1,4 +1,5 @@
-import { and, like } from "@homarr/db";
+import { and, like } from "drizzle-orm";
+
 import { icons } from "@homarr/db/schema";
 import { iconsFindSchema } from "@homarr/validation/icons";
 

packages/api/src/router/integration/integration-access.ts

@@ -1,9 +1,10 @@
 import { TRPCError } from "@trpc/server";
+import type { SQL } from "drizzle-orm";
+import { eq, inArray } from "drizzle-orm";
 
 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 type { Database } from "@homarr/db";
 import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema";
 import type { IntegrationPermission } from "@homarr/definitions";
 

packages/api/src/router/integration/integration-router.ts

@@ -1,11 +1,12 @@
 import { TRPCError } from "@trpc/server";
+import { and, asc, eq, inArray, like, or } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createId, objectEntries } from "@homarr/common";
 import { decryptSecret, encryptSecret } from "@homarr/common/server";
 import { createLogger } from "@homarr/core/infrastructure/logs";
+import { handleTransactionsAsync } from "@homarr/db";
 import type { Database } from "@homarr/db";
-import { and, asc, eq, handleTransactionsAsync, inArray, like, or } from "@homarr/db";
 import {
   apps,
   groupMembers,

packages/api/src/router/invite.ts

@@ -1,9 +1,9 @@
 import { randomBytes } from "crypto";
 import { TRPCError } from "@trpc/server";
+import { asc, eq } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createId } from "@homarr/common";
-import { asc, eq } from "@homarr/db";
 import { invites } from "@homarr/db/schema";
 import { selectInviteSchema } from "@homarr/db/validationSchemas";
 

packages/api/src/router/medias/media-router.ts

@@ -1,9 +1,9 @@
 import { TRPCError } from "@trpc/server";
+import type { InferInsertModel } from "drizzle-orm";
+import { and, desc, eq, like } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createId } from "@homarr/common";
-import type { InferInsertModel } from "@homarr/db";
-import { and, desc, eq, like } from "@homarr/db";
 import { iconRepositories, icons, medias } from "@homarr/db/schema";
 import { createLocalImageUrl, LOCAL_ICON_REPOSITORY_SLUG, mapMediaToIcon } from "@homarr/icons/local";
 import { byIdSchema, paginatedSchema } from "@homarr/validation/common";

packages/api/src/router/onboard/onboard-queries.ts

@@ -1,8 +1,9 @@
+import { eq } from "drizzle-orm";
+
 import { isProviderEnabled } from "@homarr/auth/server";
 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";
 import type { OnboardingStep } from "@homarr/definitions";
 import { credentialsAdminGroup } from "@homarr/definitions";

packages/api/src/router/search-engine/search-engine-router.ts

@@ -1,9 +1,9 @@
 import { TRPCError } from "@trpc/server";
+import { asc, eq, like } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createId } from "@homarr/common";
 import { createLogger } from "@homarr/core/infrastructure/logs";
-import { asc, eq, like } from "@homarr/db";
 import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries";
 import { searchEngines, users } from "@homarr/db/schema";
 import { createIntegrationAsync } from "@homarr/integrations";

packages/api/src/router/section/section-router.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from "@trpc/server";
+import { and, eq } from "drizzle-orm";
 import { z } from "zod/v4";
 
-import { and, eq } from "@homarr/db";
 import { sectionCollapseStates, sections } from "@homarr/db/schema";
 
 import { createTRPCRouter, protectedProcedure } from "../../trpc";

packages/api/src/router/test/board.spec.ts

@@ -1,10 +1,11 @@
+import type { InferInsertModel } from "drizzle-orm";
+import { and, eq, not } from "drizzle-orm";
 import SuperJSON from "superjson";
 import { describe, expect, it, test, vi } from "vitest";
 
 import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
-import type { Database, InferInsertModel } from "@homarr/db";
-import { and, eq, not } from "@homarr/db";
+import type { Database } from "@homarr/db";
 import {
   boardGroupPermissions,
   boards,

packages/api/src/router/test/board/board-access.spec.ts

@@ -1,8 +1,8 @@
+import { eq } from "drizzle-orm";
 import { describe, expect, test, vi } from "vitest";
 
 import * as authShared from "@homarr/auth/shared";
 import { createId } from "@homarr/common";
-import { eq } from "@homarr/db";
 import { boards, users } from "@homarr/db/schema";
 import { createDb } from "@homarr/db/test";
 

packages/api/src/router/test/group.spec.ts

@@ -1,9 +1,9 @@
+import { eq } from "drizzle-orm";
 import { describe, expect, test, vi } from "vitest";
 
 import type { Session } from "@homarr/auth";
 import * as env from "@homarr/auth/env";
 import { createId } from "@homarr/common";
-import { eq } from "@homarr/db";
 import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
 import { createDb } from "@homarr/db/test";
 import type { GroupPermissionKey } from "@homarr/definitions";

packages/api/src/router/test/integration/integration-access.spec.ts

@@ -1,8 +1,8 @@
+import { eq } from "drizzle-orm";
 import { describe, expect, test, vi } from "vitest";
 
 import * as authShared from "@homarr/auth/shared";
 import { createId } from "@homarr/common";
-import { eq } from "@homarr/db";
 import { integrations, users } from "@homarr/db/schema";
 import { createDb } from "@homarr/db/test";
 

packages/api/src/router/test/user.spec.ts

@@ -1,9 +1,9 @@
+import { eq } from "drizzle-orm";
 import { describe, expect, it, test, vi } from "vitest";
 
 import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import type { Database } from "@homarr/db";
-import { 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";

packages/api/src/router/user.ts

@@ -1,11 +1,11 @@
 import { TRPCError } from "@trpc/server";
+import { and, eq, like } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import type { Database } from "@homarr/db";
-import { and, eq, like } from "@homarr/db";
 import { getMaxGroupPositionAsync } from "@homarr/db/queries";
 import { boards, groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema";
 import { selectUserSchema } from "@homarr/db/validationSchemas";

packages/api/src/router/user/change-search-preferences.ts

@@ -1,9 +1,9 @@
 import { TRPCError } from "@trpc/server";
+import { eq } from "drizzle-orm";
 import { z } from "zod/v4";
 
 import type { Session } from "@homarr/auth";
 import type { Modify } from "@homarr/common/types";
-import { eq } from "@homarr/db";
 import type { Database } from "@homarr/db";
 import { users } from "@homarr/db/schema";
 import { userChangeSearchPreferencesSchema } from "@homarr/validation/user";

packages/api/src/router/widgets/notebook.ts

@@ -1,8 +1,8 @@
 import { TRPCError } from "@trpc/server";
+import { eq } from "drizzle-orm";
 import SuperJSON from "superjson";
 import { z } from "zod/v4";
 
-import { eq } from "@homarr/db";
 import { boards, items } from "@homarr/db/schema";
 
 import { createTRPCRouter, protectedProcedure } from "../../trpc";