From 6c3199fecc3cc5bc3ef1ffcd4effc7967d2d9042 Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Sat, 1 Mar 2025 15:21:19 -0600 Subject: [PATCH] refactor(database): updated to the schemas --- database/schema/modules.ts | 8 +++++--- database/schema/userRoles.ts | 6 +++--- drizzle.config.js | 12 ++++++++++++ tsconfig.json | 16 ++++++++++++++++ 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 drizzle.config.js create mode 100644 tsconfig.json diff --git a/database/schema/modules.ts b/database/schema/modules.ts index fbd7592..631aa4a 100644 --- a/database/schema/modules.ts +++ b/database/schema/modules.ts @@ -1,6 +1,6 @@ -import {text, pgTable, numeric, index, timestamp, boolean, uuid, uniqueIndex} from "drizzle-orm/pg-core"; -import {createInsertSchema, createSelectSchema} from "drizzle-zod"; -import {z} from "zod"; +import {text, pgTable, timestamp, boolean, uuid, uniqueIndex} from "drizzle-orm/pg-core"; +import {createSelectSchema} from "drizzle-zod"; +//import {z} from "zod"; export const modules = pgTable( "modules", @@ -26,3 +26,5 @@ export const modules = pgTable( // }); // Schema for selecting a Expenses - can be used to validate API responses export const selectModuleSchema = createSelectSchema(modules); + +export type Modules = typeof modules; diff --git a/database/schema/userRoles.ts b/database/schema/userRoles.ts index bd74363..dbd7fdc 100644 --- a/database/schema/userRoles.ts +++ b/database/schema/userRoles.ts @@ -1,9 +1,9 @@ import {text, pgTable, numeric, index, timestamp, boolean, uuid, uniqueIndex} from "drizzle-orm/pg-core"; import {createInsertSchema, createSelectSchema} from "drizzle-zod"; import {z} from "zod"; -import {users} from "./users"; -import {roles} from "./roles"; -import {modules} from "./modules"; +import {users} from "./users.js"; +import {roles} from "./roles.js"; +import {modules} from "./modules.js"; /* we will add the user diff --git a/drizzle.config.js b/drizzle.config.js new file mode 100644 index 0000000..f5dfc85 --- /dev/null +++ b/drizzle.config.js @@ -0,0 +1,12 @@ +import { defineConfig } from "drizzle-kit"; +import dotenv from "dotenv"; +dotenv.config(); +const database = process.env.DATABASE_URL || ""; +export default defineConfig({ + dialect: "postgresql", + schema: "database/schema", + out: "database/migrations", + dbCredentials: { + url: database, + }, +}); diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..f88c3d7 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "NodeNext", + "moduleResolution": "nodenext", + "strict": true, + "verbatimModuleSyntax": true, + "skipLibCheck": true, + "types": ["node"], + "jsx": "react-jsx", + "jsxImportSource": "hono/jsx", + "outDir": "./dist", + "removeComments": true + }, + "exclude": ["node_modules", "frontend"] +}