fix: mysql operations not working (#1728)

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";
 

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";
 

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";
 

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";
 

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";
 

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";

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";
 
 /**

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";

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";
 

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";
 

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";

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";
 
 /**

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,

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";

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";
 

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";

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";
 

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";
 

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";

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";
 

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";
 

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";

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";
 

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";

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";
 

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";

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";
 

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]);

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<z.infer<typeof validati
   const username = input.username.toLowerCase();
 
   const userId = createId();
-  await db.insert(schema.users).values({
+  await db.insert(users).values({
     id: userId,
     name: username,
     email: input.email,

packages/api/src/router/widgets/dns-hole.ts

@@ -1,7 +1,7 @@
 import { observable } from "@trpc/server/observable";
 
 import type { Modify } from "@homarr/common/types";
-import type { Integration } from "@homarr/db/schema/sqlite";
+import type { Integration } from "@homarr/db/schema";
 import type { IntegrationKindByCategory } from "@homarr/definitions";
 import { getIntegrationKindsByCategory } from "@homarr/definitions";
 import { integrationCreator } from "@homarr/integrations";

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

@@ -1,7 +1,7 @@
 import { observable } from "@trpc/server/observable";
 
 import type { Modify } from "@homarr/common/types";
-import type { Integration } from "@homarr/db/schema/sqlite";
+import type { Integration } from "@homarr/db/schema";
 import type { IntegrationKindByCategory } from "@homarr/definitions";
 import { getIntegrationKindsByCategory } from "@homarr/definitions";
 import type { DownloadClientJobsAndStatus } from "@homarr/integrations";

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

@@ -2,7 +2,7 @@ import { TRPCError } from "@trpc/server";
 import SuperJSON from "superjson";
 
 import { eq } from "@homarr/db";
-import { items } from "@homarr/db/schema/sqlite";
+import { items } from "@homarr/db/schema";
 import { z } from "@homarr/validation";
 
 import { createTRPCRouter, protectedProcedure } from "../../trpc";