Skip to content

Commit f20aef6

Browse files
committed
Merge remote-tracking branch 'origin/main' into miello/feat/request-context-per-request
2 parents 9f669a8 + 21c96a5 commit f20aef6

30 files changed

Lines changed: 1537 additions & 197 deletions

.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/kind-rivers-obey.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@kivotos/react-query': minor
3+
---
4+
5+
[[DRIZZ-41] React Query](https://app.plane.so/softnetics/browse/DRIZZ-41/)

.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
@@ -7,7 +7,7 @@ const timestamps = {
77
deletedAt: timestamp(),
88
}
99

10-
export const users = pgTable('users', {
10+
export const user = pgTable('user', {
1111
id: uuid('id').primaryKey().defaultRandom(),
1212
name: text('name').notNull(),
1313
email: text('email').notNull().unique(),
@@ -16,25 +16,25 @@ export const users = pgTable('users', {
1616
...timestamps,
1717
})
1818

19-
export const sessions = pgTable('session', {
19+
export const session = pgTable('session', {
2020
id: uuid('id').primaryKey().defaultRandom(),
2121
expiresAt: timestamp('expires_at').notNull(),
2222
token: text('token').notNull().unique(),
2323
ipAddress: text('ip_address'),
2424
userAgent: text('user_agent'),
2525
userId: uuid('user_id')
2626
.notNull()
27-
.references(() => users.id, { onDelete: 'cascade' }),
27+
.references(() => user.id, { onDelete: 'cascade' }),
2828
...timestamps,
2929
})
3030

31-
export const accounts = pgTable('account', {
31+
export const account = pgTable('account', {
3232
id: uuid('id').primaryKey().defaultRandom(),
3333
accountId: text('account_id').notNull(),
3434
providerId: text('provider_id').notNull(),
3535
userId: uuid('user_id')
3636
.notNull()
37-
.references(() => users.id, { onDelete: 'cascade' }),
37+
.references(() => user.id, { onDelete: 'cascade' }),
3838
accessToken: text('access_token'),
3939
refreshToken: text('refresh_token'),
4040
idToken: text('id_token'),
@@ -45,7 +45,7 @@ export const accounts = pgTable('account', {
4545
...timestamps,
4646
})
4747

48-
export const verifications = pgTable('verification', {
48+
export const verification = pgTable('verification', {
4949
id: uuid('id').primaryKey().defaultRandom(),
5050
identifier: text('identifier').notNull(),
5151
value: text('value').notNull(),
@@ -57,30 +57,30 @@ export const posts = pgTable('posts', {
5757
id: uuid('id').primaryKey().defaultRandom(),
5858
title: varchar(),
5959
content: text(),
60-
authorId: uuid().references(() => users.id),
60+
authorId: uuid().references(() => user.id),
6161
categoryId: uuid().references(() => categories.id),
6262
...timestamps,
6363
})
6464

65-
export const usersRelations = relations(users, ({ many }) => ({
65+
export const usersRelations = relations(user, ({ many }) => ({
6666
posts: many(posts),
6767
}))
6868

6969
export const postsRelations = relations(posts, ({ one }) => ({
70-
author: one(users, { fields: [posts.authorId], references: [users.id] }),
70+
author: one(user, { fields: [posts.authorId], references: [user.id] }),
7171
category: one(categories, { fields: [posts.categoryId], references: [categories.id] }),
7272
}))
7373

7474
export const categories = pgTable('categories', {
7575
id: uuid('id').primaryKey().defaultRandom(),
7676
name: varchar().notNull(),
77-
ownerId: uuid().references(() => users.id),
77+
ownerId: uuid().references(() => user.id),
7878
...timestamps,
7979
})
8080

8181
export const categoriesRelations = relations(categories, ({ many, one }) => ({
8282
posts: many(posts),
83-
owner: one(users, { fields: [categories.ownerId], references: [users.id] }),
83+
owner: one(user, { fields: [categories.ownerId], references: [user.id] }),
8484
tags: many(categoryTags),
8585
}))
8686

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)