SWREI/switched
0
0
Fork 0
Code

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse Source
This commit is contained in:
syuilo 2023-02-07 19:59:00 +09:00
commit 5ac9d13516
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/ormconfig.js
View File

@ -1,6 +1,6 @@
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import { loadConfig } from './built/config.js'; import { loadConfig } from './built/config.js';
import { entities } from './built/postgre.js'; import { entities } from './built/postgres.js';
const config = loadConfig(); const config = loadConfig();

4
packages/backend/src/GlobalModule.ts
View File

@ -4,7 +4,7 @@ import { DataSource } from 'typeorm';
import { createRedisConnection } from '@/redis.js'; import { createRedisConnection } from '@/redis.js';
import { DI } from './di-symbols.js'; import { DI } from './di-symbols.js';
import { loadConfig } from './config.js'; import { loadConfig } from './config.js';
import { createPostgreDataSource } from './postgre.js'; import { createPostgresDataSource } from './postgres.js';
import { RepositoryModule } from './models/RepositoryModule.js'; import { RepositoryModule } from './models/RepositoryModule.js';
import type { Provider, OnApplicationShutdown } from '@nestjs/common'; import type { Provider, OnApplicationShutdown } from '@nestjs/common';
@ -18,7 +18,7 @@ const $config: Provider = {
const $db: Provider = { const $db: Provider = {
provide: DI.db, provide: DI.db,
useFactory: async (config) => { useFactory: async (config) => {
const db = createPostgreDataSource(config); const db = createPostgresDataSource(config);
return await db.initialize(); return await db.initialize();
}, },
inject: [DI.config], inject: [DI.config],

2
packages/backend/src/postgre.ts → packages/backend/src/postgres.ts
View File

@ -197,7 +197,7 @@ export const entities = [
const log = process.env.NODE_ENV !== 'production'; const log = process.env.NODE_ENV !== 'production';
export function createPostgreDataSource(config: Config) { export function createPostgresDataSource(config: Config) {
return new DataSource({ return new DataSource({
type: 'postgres', type: 'postgres',
host: config.db.host, host: config.db.host,

2
packages/backend/test/utils.ts
View File

@ -11,7 +11,7 @@ import FormData from 'form-data';
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import got, { RequestError } from 'got'; import got, { RequestError } from 'got';
import loadConfig from '../src/config/load.js'; import loadConfig from '../src/config/load.js';
import { entities } from '../src/postgre.js'; import { entities } from '@/postgres.js';
import type * as misskey from 'misskey-js'; import type * as misskey from 'misskey-js';
const _filename = fileURLToPath(import.meta.url); const _filename = fileURLToPath(import.meta.url);