From cdfb7c846d0df4ef28a18286804511a3e13fcb3a Mon Sep 17 00:00:00 2001 From: Janaina <jsk22@inf.ufpr.br> Date: Thu, 27 Mar 2025 10:15:56 -0300 Subject: [PATCH] Issue#61-Comparing-SQL-Schemas --- ...ser-collection.relation.ts => user-collections.relation.ts} | 2 +- src/db/repo/user-collection.repo.ts | 2 +- src/db/schema/collections.schema.ts | 3 +-- src/db/schema/index.ts | 2 +- src/db/seeds/user-collection.seed.ts | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) rename src/db/relations/{user-collection.relation.ts => user-collections.relation.ts} (96%) diff --git a/src/db/relations/user-collection.relation.ts b/src/db/relations/user-collections.relation.ts similarity index 96% rename from src/db/relations/user-collection.relation.ts rename to src/db/relations/user-collections.relation.ts index 9e63a6d..dd3c3dc 100644 --- a/src/db/relations/user-collection.relation.ts +++ b/src/db/relations/user-collections.relation.ts @@ -4,7 +4,7 @@ import { relations } from "drizzle-orm"; import { createInsertSchema, createSelectSchema } from "drizzle-zod"; import type { z } from "zod"; -const userCollectionTable = pgTable('userCollections', { +const userCollectionTable = pgTable('user_collections', { id: serial('id').primaryKey() .unique() .notNull(), diff --git a/src/db/repo/user-collection.repo.ts b/src/db/repo/user-collection.repo.ts index 636da33..618f26e 100644 --- a/src/db/repo/user-collection.repo.ts +++ b/src/db/repo/user-collection.repo.ts @@ -2,7 +2,7 @@ import { Service } from "typedi"; import type { UserModel } from "../schema/user.schema"; import type { CollectionModel } from "../schema/collections.schema"; import db from ".."; -import userCollectionTable from "../relations/user-collection.relation"; +import userCollectionTable from "../relations/user-collections.relation"; import { and, eq, inArray } from "drizzle-orm"; import collectionTable from "../schema/collections.schema"; import userTable from "../schema/user.schema"; diff --git a/src/db/schema/collections.schema.ts b/src/db/schema/collections.schema.ts index 4a71b94..64bfca0 100644 --- a/src/db/schema/collections.schema.ts +++ b/src/db/schema/collections.schema.ts @@ -21,8 +21,7 @@ const collectionTable = pgTable('collections', { description: text('description'), is_private: boolean('is_private') .default(false), - is_active: boolean('is_active') - .default(true), + is_active: boolean('is_active'), created_at: timestamp('created_at', { mode: 'string' }) .notNull() .defaultNow(), diff --git a/src/db/schema/index.ts b/src/db/schema/index.ts index aef7b5e..cf1f335 100644 --- a/src/db/schema/index.ts +++ b/src/db/schema/index.ts @@ -32,7 +32,7 @@ import stateEnum from './state-enum.schema' import resourceEnum from './resource-enum.schema' import commentsTable from './comments.schema' import commentReplyTable from './comment-reply.schema' -import userCollectionTable from '../relations/user-collection.relation' +import userCollectionTable from '../relations/user-collections.relation' export { userTable, diff --git a/src/db/seeds/user-collection.seed.ts b/src/db/seeds/user-collection.seed.ts index 6333dcd..935d268 100644 --- a/src/db/seeds/user-collection.seed.ts +++ b/src/db/seeds/user-collection.seed.ts @@ -1,5 +1,5 @@ import type db from '@/db' -import userCollectionTable, { type userCollectionsInput } from '../relations/user-collection.relation' +import userCollectionTable, { type userCollectionsInput } from '../relations/user-collections.relation' export default async function seed(db: db) { -- GitLab