alikia2x/cvsa
1
0
Fork 0
Code

fix: drizzle generating malformed SQL causing getVideosNearMilestone() crash

Browse Source
This commit is contained in:
alikia2x (寒寒) 2025-11-18 20:34:33 +08:00
parent 5560f5d705
commit 05de9dda5b
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: 56209E0CCD8420C6
1 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
packages/crawler/db/snapshot.ts
View File

@ -1,17 +1,7 @@
import { LatestSnapshotType } from "@core/db/schema";
import { SnapshotNumber } from "mq/task/getVideoStats";
import type { Psql } from "@core/db/psql.d";
import {
db,
eta,
latestVideoSnapshot as lv,
songs,
videoSnapshot,
VideoSnapshotType
} from "@core/drizzle";
import { db, LatestVideoSnapshotType, videoSnapshot, VideoSnapshotType } from "@core/drizzle";
import { PartialBy } from "@core/lib";
import { and, eq, getTableColumns, gte, lte, lt, or } from "drizzle-orm";
import { union } from "drizzle-orm/pg-core";
import { sql } from "drizzle-orm";
export async function insertVideoSnapshot(data: PartialBy<VideoSnapshotType, "id">) {
@ -19,37 +9,28 @@ export async function insertVideoSnapshot(data: PartialBy<VideoSnapshotType, "id
}
export async function getVideosNearMilestone() {
const results = await union(
db
.select({ ...getTableColumns(lv) })
.from(lv)
.rightJoin(songs, eq(lv.aid, songs.aid))
.where(
or(
and(gte(lv.views, 60000), lt(lv.views, 100000)),
and(gte(lv.views, 900000), lt(lv.views, 1000000)),
gte(lv.views, 1000000)
)
),
db
.select({ ...getTableColumns(lv) })
.from(lv)
.where(
or(
and(gte(lv.views, 60000), lt(lv.views, 100000)),
and(gte(lv.views, 900000), lt(lv.views, 1000000)),
and(
sql`views >= CEIL(views::float/1000000::float)*1000000-100000`,
sql`views < CEIL(views::float/1000000::float)*1000000)`
)
)
),
db
.select({ ...getTableColumns(lv) })
.from(lv)
.innerJoin(eta, eq(lv.aid, eta.aid))
.where(lte(eta.eta, 2300))
);
const results = await db.execute<LatestVideoSnapshotType>(sql`
SELECT ls.*
FROM latest_video_snapshot ls
RIGHT JOIN songs ON songs.aid = ls.aid
WHERE
(views >= 60000 AND views < 100000) OR
(views >= 900000 AND views < 1000000) OR
views > 1000000
UNION
SELECT ls.*
FROM latest_video_snapshot ls
WHERE
(views >= 90000 AND views < 100000) OR
(views >= 900000 AND views < 1000000) OR
(views >= CEIL(views::float/1000000::float)*1000000-100000 AND views < CEIL(views::float/1000000::float)*1000000)
UNION
SELECT ls.*
FROM latest_video_snapshot ls
JOIN eta ON eta.aid = ls.aid
WHERE eta.eta < 2300
`);
return results.map((row) => {
return {
...row,
@ -62,7 +43,7 @@ export async function getLatestVideoSnapshot(
sql: Psql,
aid: number
): Promise<null | SnapshotNumber> {
const queryResult = await sql<LatestSnapshotType[]>`
const queryResult = await sql<LatestVideoSnapshotType[]>`
SELECT *
FROM latest_video_snapshot
WHERE aid = ${aid}