feat: support postgres

apps/backend/drizzle/postgres/meta/_journal.json

@@ -0,0 +1,13 @@
+{
+  "version": "7",
+  "dialect": "postgresql",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "7",
+      "when": 1736487832119,
+      "tag": "0000_low_jimmy_woo",
+      "breakpoints": true
+    }
+  ]
+}

apps/backend/package.json

@@ -20,8 +20,11 @@
     "@elysiajs/trpc": "^1.1.0",
     "@json2csv/plainjs": "^7.0.6",
     "@kitajs/ts-html-plugin": "latest",
+    "@lucia-auth/adapter-drizzle": "^1.1.0",
+    "@lucia-auth/adapter-postgresql": "^3.1.2",
     "@lucia-auth/adapter-sqlite": "^3.0.2",
     "@oslojs/otp": "^1.1.0",
+    "@types/pg": "^8.11.10",
     "@undb/audit": "workspace:*",
     "@undb/authz": "workspace:*",
     "@undb/base": "workspace:*",
@@ -54,6 +57,7 @@
     "nanoid": "^5.0.9",
     "nodemailer": "^6.9.16",
     "oslo": "^1.2.1",
+    "pg": "^8.13.1",
     "radash": "^12.1.0",
     "reflect-metadata": "^0.2.2",
     "uuid": "^11.0.5",

apps/backend/src/modules/auth/auth.provider.ts

@@ -1,9 +1,11 @@
+import { DrizzlePostgreSQLAdapter } from "@lucia-auth/adapter-drizzle"
 import { BunSQLiteAdapter, LibSQLAdapter } from "@lucia-auth/adapter-sqlite"
 import { container, inject, instanceCachingFactory } from "@undb/di"
-import { env } from "@undb/env"
-import { Client, DATABASE_CLIENT } from "@undb/persistence/server"
+import { Client, DATABASE_CLIENT, DB_PROVIDER, pgSessionTable, pgUsers } from "@undb/persistence/server"
 import Database from "bun:sqlite"
+import { drizzle } from "drizzle-orm/node-postgres"
 import { Adapter, Lucia } from "lucia"
+import pg from "pg"
 
 export const LUCIA_PROVIDER = Symbol.for("LUCIA_PROVIDER")
 export const injectLucia = () => inject(LUCIA_PROVIDER)
@@ -19,12 +21,12 @@ const createLuciaWithAdapter = (adapter: Adapter) => {
     },
     getSessionAttributes: (attributes) => {
       return {
-        spaceId: attributes.space_id,
+        spaceId: attributes.space_id ?? attributes.spaceId,
       }
     },
     getUserAttributes: (attributes) => {
       return {
-        emailVerified: Boolean(attributes.email_verified),
+        emailVerified: Boolean(attributes.email_verified || attributes.emailVerified),
         email: attributes.email,
         username: attributes.username,
         avatar: attributes.avatar,
@@ -53,28 +55,43 @@ const createSqliteLucia = (sqlite: Database) => {
   return createLuciaWithAdapter(adapter)
 }
 
+const createPostgresLucia = (pool: pg.Pool) => {
+  const db = drizzle(pool)
+
+  const adapter = new DrizzlePostgreSQLAdapter(db, pgSessionTable, pgUsers)
+
+  return createLuciaWithAdapter(adapter)
+}
+
 declare module "lucia" {
   interface Register {
     Lucia: ReturnType<typeof createTursoLucia>
     DatabaseSessionAttributes: DatabaseSessionAttributes
     DatabaseUserAttributes: {
       email: string
       email_verified: boolean
+      emailVerified: boolean
       username: string
       avatar?: string
     }
   }
   interface DatabaseSessionAttributes {
     space_id: string
+    spaceId: string
   }
 }
 
 container.register(LUCIA_PROVIDER, {
   useFactory: instanceCachingFactory((c) => {
-    if (env.UNDB_DB_PROVIDER === "sqlite" || !env.UNDB_DB_PROVIDER) {
+    const dbProvider = c.resolve<string>(DB_PROVIDER)
+    if (dbProvider === "sqlite" || !dbProvider) {
       const sqlite = c.resolve<Database>(DATABASE_CLIENT)
       return createSqliteLucia(sqlite)
+    } else if (dbProvider === "postgres") {
+      const pool = c.resolve<pg.Pool>(DATABASE_CLIENT)
+      return createPostgresLucia(pool)
     }
+
     const sqlite = c.resolve<Client>(DATABASE_CLIENT)
     return createTursoLucia(sqlite)
   }),

apps/backend/src/modules/auth/auth.ts

@@ -379,7 +379,7 @@ export class Auth {
             })
           }
 
-          const session = await this.lucia.createSession(userId, { space_id: spaceId })
+          const session = await this.lucia.createSession(userId, { space_id: spaceId, spaceId })
           const sessionCookie = this.lucia.createSessionCookie(session.id)
 
           response.headers.set("Set-Cookie", sessionCookie.serialize())
@@ -434,7 +434,8 @@ export class Auth {
             space = Some(await this.spaceService.createSpace({ name: user.username }))
             await this.spaceMemberService.createMember(user.id, space.unwrap().id.value, "owner")
           }
-          const session = await this.lucia.createSession(user.id, { space_id: space.unwrap().id.value })
+          const spaceId = space.unwrap().id.value
+          const session = await this.lucia.createSession(user.id, { space_id: spaceId, spaceId })
           const sessionCookie = this.lucia.createSessionCookie(session.id)
 
           return new Response(null, {
@@ -548,7 +549,8 @@ export class Auth {
               "User should have a space",
             )
 
-            const session = await this.lucia.createSession(token.user_id, { space_id: space.id.value })
+            const spaceId = space.id.value
+            const session = await this.lucia.createSession(token.user_id, { space_id: spaceId, spaceId })
             const sessionCookie = this.lucia.createSessionCookie(session.id)
             return new Response(null, {
               status: 302,
@@ -609,7 +611,8 @@ export class Auth {
             .where("id", "=", user.id)
             .execute()
 
-          const session = await this.lucia.createSession(user.id, { space_id: validatedSession.spaceId })
+          const spaceId = validatedSession.spaceId
+          const session = await this.lucia.createSession(user.id, { space_id: spaceId, spaceId })
           const sessionCookie = this.lucia.createSessionCookie(session.id)
           return new Response(null, {
             status: 302,
@@ -666,7 +669,7 @@ export class Auth {
               return redirectToSignupOrLogin("signup", email)
             } else {
               await this.spaceMemberService.createMember(user.id, spaceId, role)
-              const session = await this.lucia.createSession(user.id, { space_id: spaceId })
+              const session = await this.lucia.createSession(user.id, { space_id: spaceId, spaceId })
               const sessionCookie = this.lucia.createSessionCookie(session.id)
               return redirectToSignupOrLogin("login", email, sessionCookie)
             }

apps/backend/src/modules/auth/oauth/github.ts

@@ -88,7 +88,8 @@ export class GithubOAuth {
 
           if (existingUser) {
             const space = (await this.spaceService.getSpace({ userId: existingUser.user_id })).expect("space not found")
-            const session = await this.lucia.createSession(existingUser.user_id, { space_id: space.id.value })
+            const spaceId = space.id.value
+            const session = await this.lucia.createSession(existingUser.user_id, { space_id: spaceId, spaceId })
             const sessionCookie = this.lucia.createSessionCookie(session.id)
             return new Response(null, {
               status: 302,
@@ -136,7 +137,8 @@ export class GithubOAuth {
               })
               .execute()
 
-            const session = await this.lucia.createSession(existingGithubUser.id, { space_id: space.id.value })
+            const spaceId = space.id.value
+            const session = await this.lucia.createSession(existingGithubUser.id, { space_id: spaceId, spaceId })
             const sessionCookie = this.lucia.createSessionCookie(session.id)
             return new Response(null, {
               status: 302,
@@ -182,7 +184,9 @@ export class GithubOAuth {
 
             return space
           })
-          const session = await this.lucia.createSession(userId, { space_id: space.id.value })
+
+          const spaceId = space.id.value
+          const session = await this.lucia.createSession(userId, { space_id: spaceId, spaceId })
           const sessionCookie = this.lucia.createSessionCookie(session.id)
           return new Response(null, {
             status: 302,

apps/backend/src/modules/auth/oauth/google.ts

@@ -96,7 +96,9 @@ export class GoogleOAuth {
 
           if (existingUser) {
             const space = (await this.spaceService.getSpace({ userId: existingUser.user_id })).expect("Space not found")
-            const session = await this.lucia.createSession(existingUser.user_id, { space_id: space.id.value })
+
+            const spaceId = space.id.value
+            const session = await this.lucia.createSession(existingUser.user_id, { space_id: spaceId, spaceId })
             const sessionCookie = this.lucia.createSessionCookie(session.id)
             return new Response(null, {
               status: 302,
@@ -124,7 +126,8 @@ export class GoogleOAuth {
               })
               .execute()
 
-            const session = await this.lucia.createSession(existingGoogleUser.id, { space_id: space.id.value })
+            const spaceId = space.id.value
+            const session = await this.lucia.createSession(existingGoogleUser.id, { space_id: spaceId, spaceId })
             const sessionCookie = this.lucia.createSessionCookie(session.id)
             return new Response(null, {
               status: 302,
@@ -170,7 +173,8 @@ export class GoogleOAuth {
 
             return space
           })
-          const session = await this.lucia.createSession(userId, { space_id: space.id.value })
+          const spaceId = space.id.value
+          const session = await this.lucia.createSession(userId, { space_id: spaceId, spaceId })
           const sessionCookie = this.lucia.createSessionCookie(session.id)
           return new Response(null, {
             status: 302,

apps/backend/src/modules/auth/otp.service.ts

@@ -107,7 +107,8 @@ export class OtpService implements IOtpService {
 
     await this.qb.updateTable("undb_user").set({ otp_secret: null }).where("undb_user.email", "=", email).execute()
 
-    const session = await this.lucia.createSession(id, { space_id: space.unwrap().id.value })
+    const spaceId = space.unwrap().id.value
+    const session = await this.lucia.createSession(id, { space_id: spaceId, spaceId })
     const sessionCookie = this.lucia.createSessionCookie(session.id)
 
     return sessionCookie.serialize()

apps/backend/src/modules/space/space.module.ts

@@ -47,7 +47,8 @@ export class SpaceModule {
             })
           }
           await this.lucia.invalidateUserSessions(user.id)
-          const updatedSession = await this.lucia.createSession(user.id, { space_id: space.id.value })
+          const sid = space.id.value
+          const updatedSession = await this.lucia.createSession(user.id, { space_id: sid, spaceId: sid })
           const sessionCookie = this.lucia.createSessionCookie(updatedSession.id)
           return new Response(null, {
             status: 302,
@@ -74,7 +75,8 @@ export class SpaceModule {
             await this.lucia.invalidateSession(userId)
             const space = (await this.spaceService.getSpace({ userId })).expect("Space not found")
 
-            const updatedSession = await this.lucia.createSession(userId, { space_id: space.id.value })
+            const sid = space.id.value
+            const updatedSession = await this.lucia.createSession(userId, { space_id: sid, spaceId: sid })
             const sessionCookie = this.lucia.createSessionCookie(updatedSession.id)
             return new Response(null, {
               status: 200,

apps/backend/src/registry/db.registry.ts

@@ -23,6 +23,8 @@ import {
   BaseQueryRepository,
   BaseRepository,
   Client,
+  createPostgresClient,
+  createPostgresQueryBuilder,
   createSqliteClient,
   createSqliteQueryBuilder,
   createTursoClient,
@@ -32,6 +34,7 @@ import {
   DashboardQueryRepository,
   DashboardRepository,
   DATABASE_CLIENT,
+  DB_PROVIDER,
   InvitationQueryRepository,
   InvitationRepository,
   QUERY_BUILDER,
@@ -71,31 +74,41 @@ import { USER_QUERY_REPOSITORY, USER_REPOSITORY, USER_SERVICE, UserService } fro
 import { WEBHOOK_QUERY_REPOSITORY, WEBHOOK_REPOSITORY } from "@undb/webhook"
 import Database from "bun:sqlite"
 import { AsyncLocalStorage } from "node:async_hooks"
+import pg from "pg"
 
 const txContext = new AsyncLocalStorage<TxContext>()
 
 export const registerDb = () => {
+  container.register(DB_PROVIDER, { useValue: env.UNDB_DB_PROVIDER || "sqlite" })
   container.register(CTX, { useValue: txContext })
-  container.register(TX_CTX, TxContextImpl)
-
   container.register(DATABASE_CLIENT, {
     useFactory: instanceCachingFactory(() => {
-      if (env.UNDB_DB_PROVIDER === "sqlite" || !env.UNDB_DB_PROVIDER) {
+      const dbProvider = container.resolve<string>(DB_PROVIDER)
+      if (dbProvider === "sqlite" || !dbProvider) {
         return createSqliteClient("undb.sqlite")
       }
+      if (dbProvider === "postgres") {
+        return createPostgresClient(env.UNDB_DB_POSTGRES_URL!)
+      }
       return createTursoClient(env.UNDB_DB_TURSO_URL!, env.UNDB_DB_TURSO_AUTH_TOKEN)
     }),
   })
   container.register(QUERY_BUILDER, {
     useFactory: instanceCachingFactory((c) => {
-      if (env.UNDB_DB_PROVIDER === "sqlite" || !env.UNDB_DB_PROVIDER) {
+      const dbProvider = container.resolve<string>(DB_PROVIDER)
+      if (dbProvider === "sqlite" || !dbProvider) {
         const sqlite = c.resolve<Database>(DATABASE_CLIENT)
         return createSqliteQueryBuilder(sqlite)
+      } else if (dbProvider === "postgres") {
+        const pg = c.resolve<pg.Pool>(DATABASE_CLIENT)
+        return createPostgresQueryBuilder(pg)
       }
+
       const sqlite = c.resolve<Client>(DATABASE_CLIENT)
       return createTursoQueryBuilder(sqlite)
     }),
   })
+  container.register(TX_CTX, TxContextImpl)
 
   container.register(CONTEXT_TOKEN, ServerContext)
   container.register(SPACE_REPOSITORY, SpaceRepostitory)

apps/frontend/src/lib/registry.svelte.ts

@@ -1,4 +1,4 @@
-import { ISpaceMemberService,SPACE_MEMBER_SERVICE } from "@undb/authz"
+import { ISpaceMemberService, SPACE_MEMBER_SERVICE } from "@undb/authz"
 import {
   AddDashboardWidgetCommandHandler,
   BulkDeleteRecordsCommandHandler,
@@ -27,10 +27,11 @@ import {
   UpdateTableFieldCommandHandler,
   UpdateViewCommandHandler,
 } from "@undb/command-handlers"
-import { CONTEXT_TOKEN,IContext } from "@undb/context"
-import { CommandBus,QueryBus } from "@undb/cqrs"
-import { DataService,registerDataService,TRPC_CLIENT } from "@undb/data-service"
+import { CONTEXT_TOKEN, IContext } from "@undb/context"
+import { CommandBus, QueryBus } from "@undb/cqrs"
+import { DataService, registerDataService, TRPC_CLIENT } from "@undb/data-service"
 import { container } from "@undb/di"
+import { DB_PROVIDER } from "@undb/persistence/client"
 import {
   GetAggregatesQueryHandler,
   GetBaseQueryHandler,
@@ -91,6 +92,7 @@ export class Registry {
   async register(isLocal: boolean, isPlayground: boolean): Promise<DataService> {
     const childContainer = container.createChildContainer()
 
+    childContainer.register(DB_PROVIDER, { useValue: "sqlite" })
     childContainer.register(TRPC_CLIENT, { useValue: trpc })
     await registerDataService(childContainer, isLocal, isPlayground)
 

drizzle.postgres.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from "drizzle-kit"
+
+export default defineConfig({
+  schema: "./packages/persistence/src/schema/postgres.ts",
+  out: "./apps/backend/drizzle/postgres",
+  dialect: "postgresql",
+  tablesFilter: ["undb_*"],
+})

drizzle.config.ts → drizzle.sqlite.config.ts

@@ -1,8 +1,8 @@
 import { defineConfig } from "drizzle-kit"
 
 export default defineConfig({
-  schema: "./packages/persistence/src/tables.ts",
-  out: "./apps/backend/drizzle",
+  schema: "./packages/persistence/src/schema/sqlite.ts",
+  out: "./apps/backend/drizzle/sqlite",
   dialect: "sqlite",
   tablesFilter: ["undb_*"],
   dbCredentials: {

drizzle.turso.config.ts

@@ -1,8 +1,8 @@
 import { defineConfig } from "drizzle-kit"
 
 export default defineConfig({
-  schema: "./packages/persistence/src/tables.ts",
-  out: "./apps/backend/drizzle",
+  schema: "./packages/persistence/src/schema/sqlite.ts",
+  out: "./apps/backend/drizzle/sqlite",
   dialect: "turso",
   tablesFilter: ["undb_*"],
   dbCredentials: {

package.json

@@ -13,11 +13,13 @@
     "dev": "bun --bun turbo dev",
     "lint": "turbo lint",
     "format": "prettier --write \"**/*.{ts,tsx,md,svelte}\"",
-    "studio": "drizzle-kit studio --config drizzle.config.ts",
+    "studio": "drizzle-kit studio --config drizzle.sqlite.config.ts",
     "studio:turso": "drizzle-kit studio --config drizzle.turso.config.ts",
     "generate": "run-s generate:db migrate:deploy",
-    "generate:db": "drizzle-kit generate --config drizzle.config.ts",
-    "migrate:db": "drizzle-kit push --config drizzle.config.ts",
+    "generate:db": "run-p generate:db:*",
+    "generate:db:postgres": "drizzle-kit generate --config drizzle.postgres.config.ts",
+    "generate:db:sqlite": "drizzle-kit generate --config drizzle.sqlite.config.ts",
+    "migrate:db": "drizzle-kit push --config drizzle.sqlite.config.ts",
     "move-assets": "bun run ./scripts/move-assets.ts",
     "migrate:deploy": "bun run ./scripts/migrate.ts",
     "prepare": "husky || echo 1",