improvement(code-structure): move db into separate package (#1364)

* improvement(code-structure): move db into separate package

* make db separate package

* remake bun lock

* update imports to not maintain two separate ones

* fix CI for tests by adding dummy url

* vercel build fix attempt

* update bun lock

* regenerate bun lock

* fix mocks

* remove db commands from apps/sim package json

Author: icecrasher321

.github/workflows/ci.yml

@@ -32,13 +32,15 @@ jobs:
         env:
           NODE_OPTIONS: '--no-warnings'
           NEXT_PUBLIC_APP_URL: 'https://www.sim.ai'
+          DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/simstudio'
           ENCRYPTION_KEY: '7cf672e460e430c1fba707575c2b0e2ad5a99dddf9b7b7e3b5646e630861db1c' # dummy key for CI only
         run: bun run test
 
       - name: Build application
         env:
           NODE_OPTIONS: '--no-warnings'
           NEXT_PUBLIC_APP_URL: 'https://www.sim.ai'
+          DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/simstudio'
           STRIPE_SECRET_KEY: 'dummy_key_for_ci_only'
           STRIPE_WEBHOOK_SECRET: 'dummy_secret_for_ci_only'
           RESEND_API_KEY: 'dummy_key_for_ci_only'
@@ -71,7 +73,7 @@ jobs:
         run: bun install
 
       - name: Apply migrations
-        working-directory: ./apps/sim
+        working-directory: ./packages/db
         env:
           DATABASE_URL: ${{ github.ref == 'refs/heads/main' && secrets.DATABASE_URL || secrets.STAGING_DATABASE_URL }}
-        run: bunx drizzle-kit migrate
+        run: bunx drizzle-kit migrate --config=./drizzle.config.ts

README.md

@@ -125,10 +125,11 @@ Update your `.env` file with the database URL:
 DATABASE_URL="postgresql://postgres:your_password@localhost:5432/simstudio"
 ```
 
-4. Set up the database:
+4. Set up the database (from packages/db):
 
 ```bash
-bunx drizzle-kit migrate 
+cd packages/db
+bunx drizzle-kit migrate --config=./drizzle.config.ts
 ```
 
 5. Start the development servers:

apps/sim/app/api/__test-utils__/utils.ts

@@ -349,7 +349,7 @@ export function mockExecutionDependencies() {
     })),
   }))
 
-  vi.mock('@/db', () => ({
+  vi.mock('@sim/db', () => ({
     db: mockDb,
   }))
 }
@@ -395,7 +395,7 @@ export async function getMockedDependencies() {
   const workflowUtilsModule = await import('@/lib/workflows/utils')
   const executorModule = await import('@/executor')
   const serializerModule = await import('@/serializer')
-  const dbModule = await import('@/db')
+  const dbModule = await import('@sim/db')
 
   return {
     decryptSecret: utilsModule.decryptSecret,
@@ -428,7 +428,7 @@ export function mockScheduleStatusDb({
   schedule?: any[]
   workflow?: any[]
 } = {}) {
-  vi.doMock('@/db', () => {
+  vi.doMock('@sim/db', () => {
     let callCount = 0
 
     const select = vi.fn().mockImplementation(() => ({
@@ -469,7 +469,7 @@ export function mockScheduleExecuteDb({
   workflowRecord?: any
   envRecord?: any
 }): void {
-  vi.doMock('@/db', () => {
+  vi.doMock('@sim/db', () => {
     const select = vi.fn().mockImplementation(() => ({
       from: vi.fn().mockImplementation((table: any) => {
         const tbl = String(table)
@@ -544,7 +544,7 @@ export function mockAuth(user: MockUser = mockUser): MockAuthResult {
  * Mock common schema patterns
  */
 export function mockCommonSchemas() {
-  vi.doMock('@/db/schema', () => ({
+  vi.doMock('@sim/db/schema', () => ({
     workflowFolder: {
       id: 'id',
       userId: 'userId',
@@ -597,7 +597,7 @@ export function mockDrizzleOrm() {
  * Mock knowledge-related database schemas
  */
 export function mockKnowledgeSchemas() {
-  vi.doMock('@/db/schema', () => ({
+  vi.doMock('@sim/db/schema', () => ({
     knowledgeBase: {
       id: 'kb_id',
       userId: 'user_id',
@@ -1091,7 +1091,7 @@ export function createMockDatabase(options: MockDatabaseOptions = {}) {
     transaction: createTransactionMock(),
   }
 
-  vi.doMock('@/db', () => ({ db: mockDb }))
+  vi.doMock('@sim/db', () => ({ db: mockDb }))
 
   return {
     mockDb,

apps/sim/app/api/auth/oauth/connections/route.test.ts

@@ -34,13 +34,11 @@ describe('OAuth Connections API Route', () => {
       getSession: mockGetSession,
     }))
 
-    vi.doMock('@/db', () => ({
+    vi.doMock('@sim/db', () => ({
       db: mockDb,
-    }))
-
-    vi.doMock('@/db/schema', () => ({
       account: { userId: 'userId', providerId: 'providerId' },
       user: { email: 'email', id: 'id' },
+      eq: vi.fn((field, value) => ({ field, value, type: 'eq' })),
     }))
 
     vi.doMock('drizzle-orm', () => ({

apps/sim/app/api/auth/oauth/connections/route.ts

@@ -1,11 +1,10 @@
+import { account, db, user } from '@sim/db'
 import { eq } from 'drizzle-orm'
 import { jwtDecode } from 'jwt-decode'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
 import { generateRequestId } from '@/lib/utils'
-import { db } from '@/db'
-import { account, user } from '@/db/schema'
 
 const logger = createLogger('OAuthConnectionsAPI')
 

apps/sim/app/api/auth/oauth/credentials/route.test.ts

@@ -45,11 +45,11 @@ describe('OAuth Credentials API Route', () => {
       parseProvider: mockParseProvider,
     }))
 
-    vi.doMock('@/db', () => ({
+    vi.doMock('@sim/db', () => ({
       db: mockDb,
     }))
 
-    vi.doMock('@/db/schema', () => ({
+    vi.doMock('@sim/db/schema', () => ({
       account: { userId: 'userId', providerId: 'providerId' },
       user: { email: 'email', id: 'id' },
     }))

apps/sim/app/api/auth/oauth/credentials/route.ts

@@ -1,3 +1,5 @@
+import { db } from '@sim/db'
+import { account, user, workflow } from '@sim/db/schema'
 import { and, eq } from 'drizzle-orm'
 import { jwtDecode } from 'jwt-decode'
 import { type NextRequest, NextResponse } from 'next/server'
@@ -7,8 +9,6 @@ import type { OAuthService } from '@/lib/oauth/oauth'
 import { parseProvider } from '@/lib/oauth/oauth'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { generateRequestId } from '@/lib/utils'
-import { db } from '@/db'
-import { account, user, workflow } from '@/db/schema'
 
 export const dynamic = 'force-dynamic'
 

apps/sim/app/api/auth/oauth/disconnect/route.test.ts

@@ -32,11 +32,11 @@ describe('OAuth Disconnect API Route', () => {
       getSession: mockGetSession,
     }))
 
-    vi.doMock('@/db', () => ({
+    vi.doMock('@sim/db', () => ({
       db: mockDb,
     }))
 
-    vi.doMock('@/db/schema', () => ({
+    vi.doMock('@sim/db/schema', () => ({
       account: { userId: 'userId', providerId: 'providerId' },
     }))
 

apps/sim/app/api/auth/oauth/disconnect/route.ts

@@ -1,10 +1,10 @@
+import { db } from '@sim/db'
+import { account } from '@sim/db/schema'
 import { and, eq, like, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
 import { generateRequestId } from '@/lib/utils'
-import { db } from '@/db'
-import { account } from '@/db/schema'
 
 export const dynamic = 'force-dynamic'
 

apps/sim/app/api/auth/oauth/microsoft/file/route.ts

@@ -1,11 +1,11 @@
+import { db } from '@sim/db'
+import { account } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
 import { generateRequestId } from '@/lib/utils'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
-import { db } from '@/db'
-import { account } from '@/db/schema'
 
 export const dynamic = 'force-dynamic'