fix: fix datasource

This commit is contained in:
2026-07-08 11:34:44 +03:30
parent 146e598bf0
commit b0c0537e6e
3 changed files with 8 additions and 5 deletions
+1 -1
View File
@@ -18,7 +18,7 @@
"test:cov": "jest --coverage", "test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json", "test:e2e": "jest --config ./test/jest-e2e.json",
"typeorm:dev": "cross-env NODE_ENV=development typeorm-ts-node-commonjs -d src/database/data-source.ts", "typeorm:dev": "cross-env NODE_ENV=development node -r ts-node/register -r tsconfig-paths/register ./node_modules/typeorm/cli.js -d src/database/data-source.ts",
"typeorm:prod": "cross-env NODE_ENV=production typeorm -d dist/database/data-source.js", "typeorm:prod": "cross-env NODE_ENV=production typeorm -d dist/database/data-source.js",
"migration:generate": "npm run typeorm:dev -- migration:generate", "migration:generate": "npm run typeorm:dev -- migration:generate",
"migration:create": "npm run typeorm:dev -- migration:create", "migration:create": "npm run typeorm:dev -- migration:create",
+5 -2
View File
@@ -1,5 +1,6 @@
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import * as dotenv from 'dotenv'; import * as dotenv from 'dotenv';
import * as path from 'path';
const ENV = process.env.NODE_ENV; const ENV = process.env.NODE_ENV;
@@ -7,6 +8,8 @@ dotenv.config({
path: !ENV ? '.env' : `.env.${ENV}`, path: !ENV ? '.env' : `.env.${ENV}`,
}); });
const extension = ENV === 'production' ? 'js' : 'ts';
export default new DataSource({ export default new DataSource({
type: 'postgres', type: 'postgres',
host: process.env.DATABASE_HOST, host: process.env.DATABASE_HOST,
@@ -15,6 +18,6 @@ export default new DataSource({
password: process.env.DATABASE_PASS, password: process.env.DATABASE_PASS,
database: process.env.DATABASE_NAME, database: process.env.DATABASE_NAME,
synchronize: false, synchronize: false,
entities: ['dist/**/*.entity.js'], entities: [path.join(__dirname, `../**/*.entity.${extension}`)],
migrations: ['dist/migrations/*.js'], migrations: [path.join(__dirname, `../migrations/*.${extension}`)],
}); });
@@ -1,7 +1,7 @@
import { MigrationInterface, QueryRunner } from "typeorm"; import { MigrationInterface, QueryRunner } from "typeorm";
export class InitialSchema1783489241015 implements MigrationInterface { export class InitialSchema1783497761523 implements MigrationInterface {
name = 'InitialSchema1783489241015' name = 'InitialSchema1783497761523'
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."user_role_enum" AS ENUM('superuser', 'admin', 'user')`); await queryRunner.query(`CREATE TYPE "public"."user_role_enum" AS ENUM('superuser', 'admin', 'user')`);