Skip to content

Commit 4b21bc4

Browse files
added envConfig instead of process.env
1 parent 3529c04 commit 4b21bc4

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

src/lib/db.ts

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
import dotenv from "dotenv";
21
import { drizzle } from "drizzle-orm/postgres-js";
32
import postgres from "postgres";
4-
dotenv.config();
3+
import { EnvConfig, envConfigSchema, envSchemaAjv } from "../envConfigSchema";
4+
import envSchema from "env-schema";
55

6-
const DATABASE_URL = `postgres://${process.env.API_POSTGRES_USER}:${process.env.API_POSTGRES_PASSWORD}@${process.env.API_POSTGRES_HOST}:${process.env.API_POSTGRES_PORT}/${process.env.API_POSTGRES_DATABASE}`;
6+
const envConfig = envSchema<EnvConfig>({
7+
ajv: envSchemaAjv,
8+
dotenv: true,
9+
schema: envConfigSchema,
10+
});
11+
12+
const DATABASE_URL = `postgres://${envConfig.API_POSTGRES_USER}:${envConfig.API_POSTGRES_PASSWORD}@${envConfig.API_POSTGRES_HOST}:${envConfig.API_POSTGRES_PORT}/${envConfig.API_POSTGRES_DATABASE}`;
13+
console.log('DATABASE_URL',DATABASE_URL);
714

815
let client: postgres.Sql;
916

@@ -12,8 +19,8 @@ try {
1219
prepare: false,
1320
max: 10,
1421
idle_timeout: 30,
15-
ssl: process.env.API_POSTGRES_SSL_MODE === "true" ? "allow" : undefined,
16-
...(process.env.NODE_ENV === "development" && {
22+
ssl: envConfig.API_POSTGRES_SSL_MODE === true ? "allow" : undefined,
23+
...(envConfig.NODE_ENV === "development" && {
1724
debug: (connection, query, params) => {
1825
console.log("Running SQL Query:", query);
1926
console.log("Query Parameters:", params);

0 commit comments

Comments
 (0)