From 73a57cd2cf2bc762e89abfaf68b5dc8e8af9e617 Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Thu, 10 Nov 2022 11:08:40 -0800 Subject: [PATCH 1/2] fix casing --- db/postgresql/schema.prisma | 89 +++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma index 93b18608..3a7b77b1 100644 --- a/db/postgresql/schema.prisma +++ b/db/postgresql/schema.prisma @@ -7,23 +7,23 @@ datasource db { url = env("DATABASE_URL") } -model user { +model User { id String @id @unique @map("user_id") @db.Uuid username String @unique @db.VarChar(255) password String @db.VarChar(60) isAdmin Boolean @default(false) @map("is_admin") createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) - groupRole groupRole[] - groupUser groupUser[] - userRole userRole[] - teamWebsite teamWebsite[] - teamUser teamUser[] - userWebsite userWebsite[] - website website[] + groupRole GroupRole[] + groupUser GroupUser[] + userRole UserRole[] + teamWebsite TeamWebsite[] + teamUser TeamUser[] + userWebsite UserWebsite[] + website Website[] } -model session { +model Session { id String @id @unique @map("session_id") @db.Uuid websiteId String @map("website_id") @db.Uuid hostname String? @db.VarChar(100) @@ -39,7 +39,7 @@ model session { @@index([websiteId]) } -model website { +model Website { id String @id @unique @map("website_id") @db.Uuid userId String @map("user_id") @db.Uuid name String @db.VarChar(100) @@ -49,16 +49,16 @@ model website { createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - user user @relation(fields: [userId], references: [id]) - teamWebsite teamWebsite[] - userWebsite userWebsite[] + user User @relation(fields: [userId], references: [id]) + teamWebsite TeamWebsite[] + userWebsite UserWebsite[] @@index([userId]) @@index([createdAt]) @@index([shareId]) } -model websiteEvent { +model WebsiteEvent { id String @id() @map("event_id") @db.Uuid websiteId String @map("website_id") @db.Uuid sessionId String @map("session_id") @db.Uuid @@ -73,48 +73,49 @@ model websiteEvent { @@index([websiteId]) @@index([websiteId, createdAt]) @@index([websiteId, sessionId, createdAt]) + @@map("website_event") } -model group { +model Group { id String @id() @unique() @map("group_id") @db.Uuid name String @unique() @db.VarChar(255) description String? @db.VarChar(255) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - groupRoles groupRole[] - groupUsers groupUser[] + groupRoles GroupRole[] + groupUsers GroupUser[] } -model groupRole { +model GroupRole { id String @id() @unique() @map("group_role_id") @db.Uuid groupId String @map("group_id") @db.Uuid roleId String @map("role_id") @db.Uuid createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - group group @relation(fields: [groupId], references: [id]) - role role @relation(fields: [roleId], references: [id]) - user user? @relation(fields: [userId], references: [id]) + group Group @relation(fields: [groupId], references: [id]) + role Role @relation(fields: [roleId], references: [id]) + user User? @relation(fields: [userId], references: [id]) userId String? @db.Uuid @@map("group_role") } -model groupUser { +model GroupUser { id String @id() @unique() @map("group_user_id") @db.Uuid groupId String @map("group_id") @db.Uuid userId String @map("user_id") @db.Uuid createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - group group @relation(fields: [groupId], references: [id]) - user user @relation(fields: [userId], references: [id]) + group Group @relation(fields: [groupId], references: [id]) + User User @relation(fields: [userId], references: [id]) @@map("group_user") } -model permission { +model Permission { id String @id() @unique() @map("permission_id") @db.Uuid name String @unique() @db.VarChar(255) description String? @db.VarChar(255) @@ -122,76 +123,76 @@ model permission { isDeleted Boolean @default(false) @map("is_deleted") } -model role { +model Role { id String @id() @unique() @map("role_id") @db.Uuid name String @unique() @db.VarChar(255) description String? @db.VarChar(255) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - groupRoles groupRole[] - userRoles userRole[] + groupRoles GroupRole[] + userRoles UserRole[] } -model userRole { +model UserRole { id String @id() @unique() @map("user_role_id") @db.Uuid roleId String @map("role_id") @db.Uuid userId String @map("user_id") @db.Uuid createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - role role @relation(fields: [roleId], references: [id]) - user user @relation(fields: [userId], references: [id]) + role Role @relation(fields: [roleId], references: [id]) + user User @relation(fields: [userId], references: [id]) @@map("user_role") } -model team { +model Team { id String @id() @unique() @map("team_id") @db.Uuid name String @unique() @db.VarChar(50) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - teamWebsites teamWebsite[] - teamUsers teamUser[] + teamWebsites TeamWebsite[] + teamUsers TeamUser[] } -model teamWebsite { +model TeamWebsite { id String @id() @unique() @map("team_website_id") @db.Uuid teamId String @map("team_id") @db.Uuid websiteId String @map("website_id") @db.Uuid createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - website website @relation(fields: [websiteId], references: [id]) - team team @relation(fields: [teamId], references: [id]) - user user? @relation(fields: [userId], references: [id]) + website Website @relation(fields: [websiteId], references: [id]) + team Team @relation(fields: [teamId], references: [id]) + user User? @relation(fields: [userId], references: [id]) userId String? @db.Uuid @@map("team_website") } -model teamUser { +model TeamUser { id String @id() @unique() @map("team_user_id") @db.Uuid teamId String @map("team_id") @db.Uuid userId String @map("user_id") @db.Uuid createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") - team team @relation(fields: [teamId], references: [id]) - user user @relation(fields: [userId], references: [id]) + team Team @relation(fields: [teamId], references: [id]) + user User @relation(fields: [userId], references: [id]) @@map("team_user") } -model userWebsite { +model UserWebsite { id String @id() @unique() @map("user_website_id") @db.Uuid userId String @map("user_id") @db.Uuid websiteId String @map("website_id") @db.Uuid createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) - website website @relation(fields: [websiteId], references: [id]) - user user @relation(fields: [userId], references: [id]) + website Website @relation(fields: [websiteId], references: [id]) + user User @relation(fields: [userId], references: [id]) @@map("user_website") } From 563589393ab3ea6027b9190d8a5a213ab3b262b5 Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Thu, 10 Nov 2022 11:58:43 -0800 Subject: [PATCH 2/2] Update schema table names. --- db/postgresql/schema.prisma | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma index 3a7b77b1..58b28a8b 100644 --- a/db/postgresql/schema.prisma +++ b/db/postgresql/schema.prisma @@ -21,6 +21,8 @@ model User { teamUser TeamUser[] userWebsite UserWebsite[] website Website[] + + @@map("user") } model Session { @@ -37,6 +39,7 @@ model Session { @@index([createdAt]) @@index([websiteId]) + @@map("session") } model Website { @@ -56,6 +59,7 @@ model Website { @@index([userId]) @@index([createdAt]) @@index([shareId]) + @@map("website") } model WebsiteEvent { @@ -85,6 +89,8 @@ model Group { groupRoles GroupRole[] groupUsers GroupUser[] + + @@map("group") } model GroupRole { @@ -121,6 +127,8 @@ model Permission { description String? @db.VarChar(255) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) isDeleted Boolean @default(false) @map("is_deleted") + + @@map("permission") } model Role { @@ -132,6 +140,8 @@ model Role { groupRoles GroupRole[] userRoles UserRole[] + + @@map("role") } model UserRole { @@ -155,6 +165,8 @@ model Team { teamWebsites TeamWebsite[] teamUsers TeamUser[] + + @@map("team") } model TeamWebsite {