Skip to content

Commit 548c96d

Browse files
committed
Merge remote-tracking branch 'origin/main' into yu/feat/integrate-relationship
2 parents 248105a + dd26f26 commit 548c96d

21 files changed

Lines changed: 1157 additions & 154 deletions

File tree

.changeset/blue-seals-care.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@kivotos/core": minor
3+
---
4+
5+
[[DRIZZ-78] Request validation layer](https://app.plane.so/softnetics/browse/DRIZZ-78/)

.changeset/tidy-mice-cheer.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@kivotos/core": minor
3+
---
4+
5+
[[DRIZZ-67] Permission](https://app.plane.so/softnetics/browse/DRIZZ-67)

examples/erp/db/schema/index.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const timestamps = {
1818
deletedAt: timestamp(),
1919
}
2020

21-
export const users = pgTable('users', {
21+
export const user = pgTable('user', {
2222
id: uuid('id').primaryKey().defaultRandom(),
2323
name: text('name').notNull(),
2424
email: text('email').notNull().unique(),
@@ -27,25 +27,25 @@ export const users = pgTable('users', {
2727
...timestamps,
2828
})
2929

30-
export const sessions = pgTable('session', {
30+
export const session = pgTable('session', {
3131
id: uuid('id').primaryKey().defaultRandom(),
3232
expiresAt: timestamp('expires_at').notNull(),
3333
token: text('token').notNull().unique(),
3434
ipAddress: text('ip_address'),
3535
userAgent: text('user_agent'),
3636
userId: uuid('user_id')
3737
.notNull()
38-
.references(() => users.id, { onDelete: 'cascade' }),
38+
.references(() => user.id, { onDelete: 'cascade' }),
3939
...timestamps,
4040
})
4141

42-
export const accounts = pgTable('account', {
42+
export const account = pgTable('account', {
4343
id: uuid('id').primaryKey().defaultRandom(),
4444
accountId: text('account_id').notNull(),
4545
providerId: text('provider_id').notNull(),
4646
userId: uuid('user_id')
4747
.notNull()
48-
.references(() => users.id, { onDelete: 'cascade' }),
48+
.references(() => user.id, { onDelete: 'cascade' }),
4949
accessToken: text('access_token'),
5050
refreshToken: text('refresh_token'),
5151
idToken: text('id_token'),
@@ -56,7 +56,7 @@ export const accounts = pgTable('account', {
5656
...timestamps,
5757
})
5858

59-
export const verifications = pgTable('verification', {
59+
export const verification = pgTable('verification', {
6060
id: uuid('id').primaryKey().defaultRandom(),
6161
identifier: text('identifier').notNull(),
6262
value: text('value').notNull(),
@@ -68,30 +68,30 @@ export const posts = pgTable('posts', {
6868
id: uuid('id').primaryKey().defaultRandom(),
6969
title: varchar(),
7070
content: text(),
71-
authorId: uuid().references(() => users.id),
71+
authorId: uuid().references(() => user.id),
7272
categoryId: uuid().references(() => categories.id),
7373
...timestamps,
7474
})
7575

76-
export const usersRelations = relations(users, ({ many }) => ({
76+
export const usersRelations = relations(user, ({ many }) => ({
7777
posts: many(posts),
7878
}))
7979

8080
export const postsRelations = relations(posts, ({ one }) => ({
81-
author: one(users, { fields: [posts.authorId], references: [users.id] }),
81+
author: one(user, { fields: [posts.authorId], references: [user.id] }),
8282
category: one(categories, { fields: [posts.categoryId], references: [categories.id] }),
8383
}))
8484

8585
export const categories = pgTable('categories', {
8686
id: uuid('id').primaryKey().defaultRandom(),
8787
name: varchar().notNull(),
88-
ownerId: uuid().references(() => users.id),
88+
ownerId: uuid().references(() => user.id),
8989
...timestamps,
9090
})
9191

9292
export const categoriesRelations = relations(categories, ({ many, one }) => ({
9393
posts: many(posts),
94-
owner: one(users, { fields: [categories.ownerId], references: [users.id] }),
94+
owner: one(user, { fields: [categories.ownerId], references: [user.id] }),
9595
tags: many(categoryTags),
9696
}))
9797

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ALTER TABLE "users" RENAME TO "user";--> statement-breakpoint
2+
ALTER TABLE "user" DROP CONSTRAINT "users_email_unique";--> statement-breakpoint
3+
ALTER TABLE "account" DROP CONSTRAINT "account_user_id_users_id_fk";
4+
--> statement-breakpoint
5+
ALTER TABLE "categories" DROP CONSTRAINT "categories_ownerId_users_id_fk";
6+
--> statement-breakpoint
7+
ALTER TABLE "posts" DROP CONSTRAINT "posts_authorId_users_id_fk";
8+
--> statement-breakpoint
9+
ALTER TABLE "session" DROP CONSTRAINT "session_user_id_users_id_fk";
10+
--> statement-breakpoint
11+
ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
12+
ALTER TABLE "categories" ADD CONSTRAINT "categories_ownerId_user_id_fk" FOREIGN KEY ("ownerId") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
13+
ALTER TABLE "posts" ADD CONSTRAINT "posts_authorId_user_id_fk" FOREIGN KEY ("authorId") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
14+
ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
15+
ALTER TABLE "user" ADD CONSTRAINT "user_email_unique" UNIQUE("email");

0 commit comments

Comments
 (0)