diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-17 02:58:09 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-17 02:58:09 +0900 |
| commit | 532ef744f45ef56dcdd14f068c3232393f12e7f9 (patch) | |
| tree | e44cf59e20901f3395f97f1b4d55b4774f731911 /src/services | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.1.4 (diff) | |
| download | misskey-532ef744f45ef56dcdd14f068c3232393f12e7f9.tar.gz misskey-532ef744f45ef56dcdd14f068c3232393f12e7f9.tar.bz2 misskey-532ef744f45ef56dcdd14f068c3232393f12e7f9.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/chart/core.ts | 2 | ||||
| -rw-r--r-- | src/services/drive/delete-file.ts | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/services/chart/core.ts b/src/services/chart/core.ts index 0a9ec8dae0..fe762f2b24 100644 --- a/src/services/chart/core.ts +++ b/src/services/chart/core.ts @@ -79,7 +79,7 @@ export default abstract class Chart<T extends Record<string, any>> { flatColumns(v.properties, p); } else { columns[this.columnPrefix + p] = { - type: 'integer', + type: 'bigint', }; } } diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index bba453b982..f1280822a4 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -2,7 +2,7 @@ import * as Minio from 'minio'; import config from '../../config'; import { DriveFile } from '../../models/entities/drive-file'; import { InternalStorage } from './internal-storage'; -import { DriveFiles, Instances } from '../../models'; +import { DriveFiles, Instances, Notes } from '../../models'; import { driveChart, perUserDriveChart, instanceChart } from '../chart'; export default async function(file: DriveFile, isExpired = false) { @@ -40,6 +40,11 @@ export default async function(file: DriveFile, isExpired = false) { }); } else { DriveFiles.delete(file.id); + + // TODO: トランザクション + Notes.createQueryBuilder().delete() + .where(':id = ANY(fileIds)', { id: file.id }) + .execute(); } // 統計を更新 |