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

fix(backend): column names

This commit is contained in:
Acid Chicken (硫酸鶏) 2024-05-29 16:29:39 +09:00
parent 6304c4259a
commit 47278d3f6d
No known key found for this signature in database
GPG Key ID: 3E87B98A3F6BAB99
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,12 +74,17 @@ 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> {
createColumnNames(this: Repository<T> & MiRepository<T>, queryBuilder: InsertQueryBuilder<T>): string[]; createAliasColumnNames(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>;
} }
export const miRepository = { export const miRepository = {
createColumnNames(queryBuilder) { createAliasColumnNames(queryBuilder) {
const tableColumnNames = this.createTableColumnNames(queryBuilder);
return tableColumnNames.map(columnName => `${queryBuilder.alias}_${columnName}`);
},
createTableColumnNames(queryBuilder) {
// @ts-expect-error -- protected // @ts-expect-error -- protected
const insertedColumns = queryBuilder.getInsertedColumns(); const insertedColumns = queryBuilder.getInsertedColumns();
if (insertedColumns.length) { if (insertedColumns.length) {
@ -96,7 +101,7 @@ 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.createColumnNames(queryBuilder); const columnNames = this.createAliasColumnNames(queryBuilder);
const builder = this.createQueryBuilder() const builder = this.createQueryBuilder()
.addCommonTableExpression(queryBuilder, this.metadata.tableName, { columnNames }) .addCommonTableExpression(queryBuilder, this.metadata.tableName, { columnNames })
.select('*') .select('*')