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

4 files changed, 5 insertions, 5 deletions

diff --git a/packages/backend/ormconfig.js b/packages/backend/ormconfig.js
index 32c26f7b67..229e5bf1fe 100644
--- a/packages/backend/ormconfig.js
+++ b/packages/backend/ormconfig.js
@@ -1,6 +1,6 @@
 import { DataSource } from 'typeorm';
 import { loadConfig } from './built/config.js';
-import { entities } from './built/postgre.js';
+import { entities } from './built/postgres.js';
 
 const config = loadConfig();
 
diff --git a/packages/backend/src/GlobalModule.ts b/packages/backend/src/GlobalModule.ts
index 8a70129eb9..35416209a0 100644
--- a/packages/backend/src/GlobalModule.ts
+++ b/packages/backend/src/GlobalModule.ts
@@ -4,7 +4,7 @@ import { DataSource } from 'typeorm';
 import { createRedisConnection } from '@/redis.js';
 import { DI } from './di-symbols.js';
 import { loadConfig } from './config.js';
-import { createPostgreDataSource } from './postgre.js';
+import { createPostgresDataSource } from './postgres.js';
 import { RepositoryModule } from './models/RepositoryModule.js';
 import type { Provider, OnApplicationShutdown } from '@nestjs/common';
 
@@ -18,7 +18,7 @@ const $config: Provider = {
 const $db: Provider = {
 	provide: DI.db,
 	useFactory: async (config) => {
-		const db = createPostgreDataSource(config);
+		const db = createPostgresDataSource(config);
 		return await db.initialize();
 	},
 	inject: [DI.config],
diff --git a/packages/backend/src/postgre.ts b/packages/backend/src/postgres.ts
index c55cb78a6a..33b924e776 100644
--- a/packages/backend/src/postgre.ts
+++ b/packages/backend/src/postgres.ts
@@ -197,7 +197,7 @@ export const entities = [
 
 const log = process.env.NODE_ENV !== 'production';
 
-export function createPostgreDataSource(config: Config) {
+export function createPostgresDataSource(config: Config) {
 	return new DataSource({
 		type: 'postgres',
 		host: config.db.host,
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index c8fd41e1d3..50988939aa 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -11,7 +11,7 @@ import FormData from 'form-data';
 import { DataSource } from 'typeorm';
 import got, { RequestError } from 'got';
 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';
 
 const _filename = fileURLToPath(import.meta.url);