usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(backend): position

This commit is contained in:
Acid Chicken (硫酸鶏) 2024-05-29 16:51:33 +09:00
parent 55ce6f831a
commit 3bb8b6fc69
No known key found for this signature in database
GPG Key ID: 3E87B98A3F6BAB99
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/backend/src/models/_.ts
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { FindOneOptions, InsertQueryBuilder, ObjectLiteral, Repository } from 'typeorm'; import { FindOneOptions, InsertQueryBuilder, ObjectLiteral, Repository, SelectQueryBuilder } from 'typeorm';
import { MiAbuseUserReport } from '@/models/AbuseUserReport.js'; import { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
import { MiAccessToken } from '@/models/AccessToken.js'; import { MiAccessToken } from '@/models/AccessToken.js';
import { MiAd } from '@/models/Ad.js'; import { MiAd } from '@/models/Ad.js';
@ -74,16 +74,12 @@ import { MiReversiGame } from '@/models/ReversiGame.js';
import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js'; import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js';
export interface MiRepository<T extends ObjectLiteral> { export interface MiRepository<T extends ObjectLiteral> {
createAliasColumnNames(this: Repository<T> & MiRepository<T>, queryBuilder: InsertQueryBuilder<T>): string[];
createTableColumnNames(this: Repository<T> & MiRepository<T>, queryBuilder: InsertQueryBuilder<T>): string[]; createTableColumnNames(this: Repository<T> & MiRepository<T>, queryBuilder: InsertQueryBuilder<T>): string[];
insertOne(this: Repository<T> & MiRepository<T>, entity: QueryDeepPartialEntity<T>, findOptions?: Pick<FindOneOptions<T>, 'relations'>): Promise<T>; insertOne(this: Repository<T> & MiRepository<T>, entity: QueryDeepPartialEntity<T>, findOptions?: Pick<FindOneOptions<T>, 'relations'>): Promise<T>;
selectAliasColumnNames(this: Repository<T> & MiRepository<T>, queryBuilder: InsertQueryBuilder<T>, builder: SelectQueryBuilder<T>): void;
} }
export const miRepository = { export const miRepository = {
createAliasColumnNames(queryBuilder) {
const tableColumnNames = this.createTableColumnNames(queryBuilder);
return tableColumnNames.map(columnName => `${queryBuilder.alias}_${columnName}`);
},
createTableColumnNames(queryBuilder) { createTableColumnNames(queryBuilder) {
// @ts-expect-error -- protected // @ts-expect-error -- protected
const insertedColumns = queryBuilder.getInsertedColumns(); const insertedColumns = queryBuilder.getInsertedColumns();
@ -101,18 +97,28 @@ export const miRepository = {
}, },
async insertOne(entity, findOptions?) { async insertOne(entity, findOptions?) {
const queryBuilder = this.createQueryBuilder().insert().values(entity).returning('*'); const queryBuilder = this.createQueryBuilder().insert().values(entity).returning('*');
const columnNames = this.createAliasColumnNames(queryBuilder); const columnNames = this.createTableColumnNames(queryBuilder);
const builder = this.createQueryBuilder() const builder = this.createQueryBuilder()
.addCommonTableExpression(queryBuilder, this.metadata.tableName, { columnNames }) .addCommonTableExpression(queryBuilder, this.metadata.tableName, { columnNames })
.select('*') .select('*')
.from<ObjectLiteral>(this.metadata.tableName, this.metadata.tableName); .from<ObjectLiteral>(this.metadata.tableName, this.metadata.tableName);
builder.expressionMap.aliases.splice(1, 1); builder.expressionMap.aliases.splice(1, 1);
this.selectAliasColumnNames(queryBuilder, builder);
console.log(builder.getQueryAndParameters()); console.log(builder.getQueryAndParameters());
if (findOptions) { if (findOptions) {
return await builder.setFindOptions(findOptions).getOneOrFail(); return await builder.setFindOptions(findOptions).getOneOrFail();
} }
return await builder.getOneOrFail(); return await builder.getOneOrFail();
}, },
selectAliasColumnNames(queryBuilder, builder) {
let selectOrAddSelect = (selection: string, selectionAliasName?: string) => {
selectOrAddSelect = (selection, selectionAliasName) => builder.addSelect(selection, selectionAliasName);
return builder.select(selection, selectionAliasName);
};
for (const columnName of this.createTableColumnNames(queryBuilder)) {
selectOrAddSelect(columnName, `${queryBuilder.alias}_${columnName}`);
}
},
} satisfies MiRepository<ObjectLiteral>; } satisfies MiRepository<ObjectLiteral>;
export { export {