Merge pull request #9 from codingwithmanny/feat/drizzle-update-postgr…

…es-docker

feat: 🎸 Updated drizzle, fixed studio, added docker

.env.example

@@ -1,7 +1,7 @@
 # The database URL is used to connect to your database.
 DB_HOST='localhost'
 DB_PORT=5432
-DB_NAME='turbo_stack'
+DB_NAME='turbo_stack_db'
 DB_USERNAME='turbo_stack'
 DB_PASSWORD='turbo_stack'
 

docker-compose.yml

@@ -0,0 +1,11 @@
+services:
+  db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_DB: turbo_stack_db
+      POSTGRES_USER: turbo_stack
+      POSTGRES_PASSWORD: turbo_stack
+    ports:
+      - "5432:5432"
+    expose:
+      - "5432"

package.json

@@ -11,6 +11,8 @@
     "dev:next": "turbo watch dev -F @acme/nextjs...",
     "clean": "git clean -xdf node_modules",
     "clean:workspaces": "turbo run clean",
+    "db:up": "docker compose -p turbo up -d ",
+    "db:down": "docker compose -p turbo down --remove-orphans -v",
     "db:generate": "pnpm -F db generate",
     "db:migrate": "pnpm -F db migrate",
     "db:push": "turbo -F @acme/db push",

packages/db/src/schema.ts

@@ -1,13 +1,5 @@
 import { relations, sql } from "drizzle-orm"
-import {
-  index,
-  pgTable,
-  primaryKey,
-  text,
-  timestamp,
-  uuid,
-  varchar,
-} from "drizzle-orm/pg-core"
+import { pgTable, text, timestamp, uuid, varchar } from "drizzle-orm/pg-core"
 import { createInsertSchema } from "drizzle-zod"
 import { z } from "zod"
 
@@ -60,24 +52,15 @@ export const Session = pgTable("session", {
   userAgent: text("user_agent"),
 })
 
-export const Account = pgTable(
-  "account",
-  {
-    providerId: varchar("provider_id", { length: 255 }).notNull(),
-    providerUserId: varchar("provider_user_id", { length: 255 }).notNull(),
-    userId: varchar("user_id", {
-      length: 255,
-    })
-      .notNull()
-      .references(() => User.id),
-  },
-  (account) => ({
-    compoundKey: primaryKey({
-      columns: [account.providerId, account.providerUserId],
-    }),
-    userIdIdx: index("userId_idx").on(account.userId),
-  }),
-)
+export const Account = pgTable("account", {
+  providerId: varchar("provider_id", { length: 255 }).notNull(),
+  providerUserId: varchar("provider_user_id", { length: 255 }).notNull(),
+  userId: varchar("user_id", {
+    length: 255,
+  })
+    .notNull()
+    .references(() => User.id),
+})
 
 export const SessionRelations = relations(Session, ({ one }) => ({
   user: one(User, {
@@ -86,6 +69,9 @@ export const SessionRelations = relations(Session, ({ one }) => ({
   }),
 }))
 
-export const UserRelations = relations(User, ({ many }) => ({
-  accounts: many(Account),
+export const AccountRelations = relations(Account, ({ one }) => ({
+  user: one(User, {
+    fields: [Account.userId],
+    references: [User.id],
+  }),
 }))