versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2026-03-13 05:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(database): ♻️ Use new Drizzle count API

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-10-11 15:46:05 +02:00
parent 7f17074d16
commit ce781f3336
No known key found for this signature in database
5 changed files with 43 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/database-interface/instance.ts
View file

@ -10,7 +10,6 @@ import {
type InferInsertModel,
type InferSelectModel,
type SQL,
count,
desc,
eq,
inArray,
@ -340,13 +339,7 @@ export class Instance extends BaseInterface<typeof Instances> {
});
}
static async getCount() {
return (
await db
.select({
count: count(),
})
.from(Instances)
)[0].count;
static getCount(): Promise<number> {
return db.$count(Instances);
}
}

15
packages/database-interface/note.ts
View file

@ -18,7 +18,6 @@ import {
type InferInsertModel,
type SQL,
and,
count,
desc,
eq,
inArray,
@ -349,16 +348,10 @@ export class Note extends BaseInterface<typeof Notes, StatusWithRelations> {
* @returns The number of notes in the database
*/
static async getCount(): Promise<number> {
return (
await db
.select({
count: count(),
})
.from(Notes)
.where(
sql`EXISTS (SELECT 1 FROM "Users" WHERE "Users"."id" = ${Notes.authorId} AND "Users"."instanceId" IS NULL)`,
)
)[0].count;
return await db.$count(
Notes,
sql`EXISTS (SELECT 1 FROM "Users" WHERE "Users"."id" = ${Notes.authorId} AND "Users"."instanceId" IS NULL)`,
);
}
/**

12
packages/database-interface/user.ts
View file

@ -24,7 +24,6 @@ import {
type InferInsertModel,
type SQL,
and,
count,
countDistinct,
desc,
eq,
@ -327,15 +326,8 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
);
}
static async getCount() {
return (
await db
.select({
count: count(),
})
.from(Users)
.where(isNull(Users.instanceId))
)[0].count;
static getCount(): Promise<number> {
return db.$count(Users, isNull(Users.instanceId));
}
static async getActiveInPeriod(milliseconds: number) {