Fix #4926

src/db/postgre.ts

@@ -80,6 +80,51 @@ class MyCustomLogger implements Logger {
 	}
 }
 
+export const entities = [
+	Meta,
+	Instance,
+	App,
+	AuthSession,
+	AccessToken,
+	User,
+	UserProfile,
+	UserKeypair,
+	UserPublickey,
+	UserList,
+	UserListJoining,
+	UserGroup,
+	UserGroupJoining,
+	UserGroupInvite,
+	UserNotePining,
+	Following,
+	FollowRequest,
+	Muting,
+	Blocking,
+	Note,
+	NoteFavorite,
+	NoteReaction,
+	NoteWatching,
+	NoteUnread,
+	Page,
+	PageLike,
+	Log,
+	DriveFile,
+	DriveFolder,
+	Poll,
+	PollVote,
+	Notification,
+	Emoji,
+	Hashtag,
+	SwSubscription,
+	AbuseUserReport,
+	RegistrationTicket,
+	MessagingMessage,
+	Signin,
+	ReversiGame,
+	ReversiMatching,
+	...charts as any
+];
+
 export function initDb(justBorrow = false, sync = false, log = false) {
 	try {
 		const conn = getConnection();
@@ -110,49 +155,6 @@ export function initDb(justBorrow = false, sync = false, log = false) {
 		} : false,
 		logging: log,
 		logger: log ? new MyCustomLogger() : undefined,
-		entities: [
-			Meta,
-			Instance,
-			App,
-			AuthSession,
-			AccessToken,
-			User,
-			UserProfile,
-			UserKeypair,
-			UserPublickey,
-			UserList,
-			UserListJoining,
-			UserGroup,
-			UserGroupJoining,
-			UserGroupInvite,
-			UserNotePining,
-			Following,
-			FollowRequest,
-			Muting,
-			Blocking,
-			Note,
-			NoteFavorite,
-			NoteReaction,
-			NoteWatching,
-			NoteUnread,
-			Page,
-			PageLike,
-			Log,
-			DriveFile,
-			DriveFolder,
-			Poll,
-			PollVote,
-			Notification,
-			Emoji,
-			Hashtag,
-			SwSubscription,
-			AbuseUserReport,
-			RegistrationTicket,
-			MessagingMessage,
-			Signin,
-			ReversiGame,
-			ReversiMatching,
-			...charts as any
-		]
+		entities: entities
 	});
 }

src/ormconfig.ts

@@ -1,19 +0,0 @@
-import * as fs from 'fs';
-import config from './config';
-
-const json = {
-	type: 'postgres',
-	host: config.db.host,
-	port: config.db.port,
-	username: config.db.user,
-	password: config.db.pass,
-	database: config.db.db,
-	extra: config.db.extra,
-	entities: ['src/models/entities/*.ts'],
-	migrations: ['migration/*.ts'],
-	cli: {
-		migrationsDir: 'migration'
-	}
-};
-
-fs.writeFileSync('ormconfig.json', JSON.stringify(json));