From 9653f1541a5ec99acd409415fd5c5bca5a1052ad Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Tue, 25 Aug 2026 19:02:25 -0600
Subject: [PATCH] =?UTF-8?q?refactor(=E5=A5=91=E7=BA=A6):=20SQL=20=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=E8=BF=9B=E5=A5=91=E7=BA=A6=EF=BC=8C?=
 =?UTF-8?q?topReaction=20=E6=94=B6=E6=88=90=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

d3b05b8 把 SQLDisplay* 列进「保留不动的窄化」，理由是契约那边就是
Record<string, unknown>。这次把那个碗底扫了 —— 因为「契约说不知道形状、
前端手抄一份来渲染」正是那个 commit 修的五处分歧的同一个模子。

SQL 题两个 JSONB 列现在有精确 schema：sqlConfigSchema、sqlDisplaySchema、
sqlDisplayTableSchema、sqlDisplayColumnSchema。键名保持 snake_case，是
problem.sql_config / sql_display 的原文，回滚时旧后端要读同一份。前端
utils/types.ts 里手抄的 SQLConfig / SQLDisplay / SQLDisplayTable /
SQLDisplayColumn 共 30 行删掉改成 re-export，Problem 和 AdminProblem 的
Omit 列表各短两项。手抄那份把 SQLDisplayColumn.type 写成了可选，后端一直
是必有的空串。

后端跟着收紧：commonChecks / generateSqlDisplay 的 Record<string, unknown>
换成 SqlConfig，`sqlConfig.mode === "modify" ? "modify" : "query"` 这句防御
删了 —— 现在类型上就只有那两个值。请求侧 createProblemRequestSchema.sqlConfig
也不再是 record：mode 是枚举、order_sensitive 缺省补 false，正好是旧后端
SQLConfigSerializer 的口径（新后端之前反而比旧的松，什么都收）。

顺带修 adminProblemListItemSchema.topReaction 的注释：写着「当前后端恒传
null，get_top_reactions 没跟着迁过来」，但 admin/problem.ts:257 早就在调了，
只有比赛题列表恒 null。这条注释会骗人去补一个已经存在的实现。类型同时从
z.string() 收成 reactionKeySchema —— getTopReactions 本来就把库里认不出的
类型滤掉了，只是类型上没体现，前端因此得在 transforms.ts 写
`as AdminProblemFiltered["topReaction"]`，现在那个强转和 `?? null` 一起没了。
服务层里的 `as ReactionKey` 换成 isReactionKey 类型守卫。

**收紧 JSONB 的 schema 会把「存量数据形状不对」从静默降级变成 500，所以实打了：**

- 从生产库备份捞出 9 道 SQL 题的 sql_config / sql_display 原文，逐条过新
  schema，9/9 通过；键集与旧后端 judge/sql_runner.py:build_display 的产出
  逐字一致（columns/name/rows/total_rows/truncated，expected 两形态）。
- 把其中 query 形态、modify 形态各一条种进本地库，起 API 打 oj 详情和后台
  详情共四个端点，全 200，expected 两种分支都正确解析。
- topReaction：插两条并列票，按 reactionKeySchema 顺序正确取到 confusing；
  再插一条库里已下掉的类型，被守卫滤掉返回 null。

另：`bunx vue-tsc --noEmit` 不带 -p 是**无效的**，根 tsconfig.json 是
"files": []，塞个类型错误进去照样 exit 0。要跑 `bun run type-check`
（-p tsconfig.app.json），这次的结论出自它。tsc(apps/api) 0 error、
check:routes 168 条无遮蔽、vite build 通过。

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 apps/api/src/routes/admin/problem.ts          |  8 +--
 apps/api/src/services/reaction.ts             | 13 ++--
 apps/web/src/admin/api.ts                     |  4 +-
 .../problem/components/SQLTestcaseEditor.vue  |  8 +--
 apps/web/src/admin/transforms.ts              |  4 +-
 .../oj/problem/components/SQLDataTable.vue    |  4 +-
 apps/web/src/utils/types.ts                   | 59 +++++--------------
 packages/contract/src/admin.ts                | 20 ++++---
 packages/contract/src/problem.ts              | 55 ++++++++++++++++-
 9 files changed, 103 insertions(+), 72 deletions(-)

diff --git a/apps/api/src/routes/admin/problem.ts b/apps/api/src/routes/admin/problem.ts
index e595d54..25c3d59 100644
--- a/apps/api/src/routes/admin/problem.ts
+++ b/apps/api/src/routes/admin/problem.ts
@@ -11,6 +11,7 @@ import {
   sqlPreviewRequestSchema,
   sqlTestCaseScriptSchema,
   uploadTestCaseResponseSchema,
+  type SqlConfig,
 } from "@oj2/contract"
 import { and, count, desc, eq, ilike, inArray, isNull, ne, or, sql } from "drizzle-orm"
 import { Hono } from "hono"
@@ -138,7 +139,7 @@ function commonChecks(data: {
   inputDescription: string
   outputDescription: string
   samples: unknown[]
-  sqlConfig: Record<string, unknown> | null
+  sqlConfig: SqlConfig | null
   answers: Record<string, unknown>[]
 }): { error: string } | { sql: boolean } {
   if (data.languages.includes("SQL")) {
@@ -164,7 +165,7 @@ function commonChecks(data: {
 async function generateSqlDisplay(
   testCaseId: string,
   answers: Record<string, unknown>[],
-  sqlConfig: Record<string, unknown>,
+  sqlConfig: SqlConfig,
 ): Promise<{ error: string } | { display: unknown }> {
   const info = await readInfo(testCaseId)
   if (!info) return { error: "测试点信息读取失败，请重新上传测试点" }
@@ -183,8 +184,7 @@ async function generateSqlDisplay(
     (item) => item.language === "SQL" && typeof item.code === "string" && item.code.trim(),
   )?.code
   if (typeof refSql !== "string") return { error: "题目缺少 SQL 标准答案" }
-  const mode = sqlConfig.mode === "modify" ? "modify" as const : "query" as const
-  const outcome = await buildSqlDisplay(initSql, refSql, mode)
+  const outcome = await buildSqlDisplay(initSql, refSql, sqlConfig.mode)
   if (!outcome.ok) return { error: `SQL 展示数据生成失败: ${outcome.message}` }
   return { display: outcome.value }
 }
diff --git a/apps/api/src/services/reaction.ts b/apps/api/src/services/reaction.ts
index 7b640eb..7e9d7d7 100644
--- a/apps/api/src/services/reaction.ts
+++ b/apps/api/src/services/reaction.ts
@@ -1,4 +1,4 @@
-import { reactionKeySchema } from "@oj2/contract"
+import { reactionKeySchema, type ReactionKey } from "@oj2/contract"
 import { count, inArray } from "drizzle-orm"
 
 import { db, schema } from "../db"
@@ -12,8 +12,13 @@ const TYPE_ORDER = new Map<string, number>(
   reactionKeySchema.options.map((key, index) => [key, index]),
 )
 
+/** 库里的 type 是裸字符串；在 TYPE_ORDER 里就等价于「契约认得的类型」。 */
+function isReactionKey(value: string): value is ReactionKey {
+  return TYPE_ORDER.has(value)
+}
+
 export interface TopReaction {
-  type: string
+  type: ReactionKey
   count: number
 }
 
@@ -38,10 +43,10 @@ export async function getTopReactions(problemIds: number[]) {
     .groupBy(schema.reaction.problemId, schema.reaction.type)
 
   for (const row of rows) {
-    const order = TYPE_ORDER.get(row.type)
     // 库里可能残留前端已经下掉的旧类型。跳过而不是当成并列最优 ——
     // 否则一个已经不展示的类型会把真正的最高票挤掉。
-    if (order === undefined) continue
+    if (!isReactionKey(row.type)) continue
+    const order = TYPE_ORDER.get(row.type)!
     const current = top.get(row.problemId)
     if (
       !current ||
diff --git a/apps/web/src/admin/api.ts b/apps/web/src/admin/api.ts
index 49ab240..307e902 100644
--- a/apps/web/src/admin/api.ts
+++ b/apps/web/src/admin/api.ts
@@ -29,7 +29,7 @@ import type {
   Contest,
   Exercise,
   ExerciseType,
-  SQLDisplay,
+  SqlDisplay,
   TestcaseUploadedReturns,
   Tutorial,
   User,
@@ -237,7 +237,7 @@ export function previewSQLTestcase(data: {
   refSql: string
   mode: "query" | "modify"
 }) {
-  return api2.post<SQLDisplay>("admin/sql-test-cases/preview", data)
+  return api2.post<SqlDisplay>("admin/sql-test-cases/preview", data)
 }
 
 // 回显已上传的 SQL 测试点脚本内容（按 1.sql, 2.sql... 排序）
diff --git a/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue b/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue
index 7263f43..c13d61c 100644
--- a/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue
+++ b/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { LANGUAGE, SQLDisplay, Testcase } from "utils/types"
+import type { LANGUAGE, SqlDisplay, Testcase } from "utils/types"
 import { createZipBlob } from "utils/functions"
 import SQLDataTable from "oj/problem/components/SQLDataTable.vue"
 import {
@@ -12,7 +12,7 @@ import {
 interface ScriptEntry {
   id: number
   sql: string
-  display: SQLDisplay | null
+  display: SqlDisplay | null
   error: string
   // 标准答案或题型改过之后，旧预览结果作废，需重新预览才能上传
   stale: boolean
@@ -109,11 +109,11 @@ function reset() {
   scripts.value = [blankEntry(), blankEntry(), blankEntry()]
 }
 
-function expectedQuery(d: SQLDisplay) {
+function expectedQuery(d: SqlDisplay) {
   return "columns" in d.expected ? d.expected : null
 }
 
-function changedTables(d: SQLDisplay) {
+function changedTables(d: SqlDisplay) {
   return "changed_tables" in d.expected ? d.expected.changed_tables : []
 }
 
diff --git a/apps/web/src/admin/transforms.ts b/apps/web/src/admin/transforms.ts
index 03e8176..36482ab 100644
--- a/apps/web/src/admin/transforms.ts
+++ b/apps/web/src/admin/transforms.ts
@@ -16,8 +16,6 @@ export function toProblemListItem(
     hasAstRules: result.hasAstRules,
     allowFlowchart: result.allowFlowchart,
     showFlowchart: result.showFlowchart,
-    // 比赛题目列表接口不返回这个字段
-    topReaction: (result.topReaction ??
-      null) as AdminProblemFiltered["topReaction"],
+    topReaction: result.topReaction,
   }
 }
diff --git a/apps/web/src/oj/problem/components/SQLDataTable.vue b/apps/web/src/oj/problem/components/SQLDataTable.vue
index 8330664..4234bbd 100644
--- a/apps/web/src/oj/problem/components/SQLDataTable.vue
+++ b/apps/web/src/oj/problem/components/SQLDataTable.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { SQLDisplayColumn } from "utils/types"
+import type { SqlDisplayColumn } from "utils/types"
 
 defineProps<{
-  columns: SQLDisplayColumn[]
+  columns: SqlDisplayColumn[]
   rows: (string | number | null)[][]
   totalRows?: number
   truncated?: boolean
diff --git a/apps/web/src/utils/types.ts b/apps/web/src/utils/types.ts
index 364a479..725d2df 100644
--- a/apps/web/src/utils/types.ts
+++ b/apps/web/src/utils/types.ts
@@ -52,36 +52,17 @@ export type LANGUAGE =
   | "Flowchart"
   | "SQL"
 
-export interface SQLConfig {
-  mode: "query" | "modify"
-  order_sensitive: boolean
-}
-
-export interface SQLDisplayColumn {
-  name: string
-  type?: string
-}
-
-export interface SQLDisplayTable {
-  name: string
-  columns: SQLDisplayColumn[]
-  rows: (string | number | null)[][]
-  total_rows: number
-  truncated: boolean
-  dropped?: boolean
-}
-
-export interface SQLDisplay {
-  tables: SQLDisplayTable[]
-  expected:
-    | {
-        columns: SQLDisplayColumn[]
-        rows: (string | number | null)[][]
-        total_rows: number
-        truncated: boolean
-      }
-    | { changed_tables: SQLDisplayTable[] }
-}
+/**
+ * SQL 题的配置与展示数据。形状在契约里 —— 原来这里手抄了一份，
+ * 而契约那边是 `Record<string, unknown>`，等于渲染表格的那段代码全靠手抄件兜底。
+ * 键名的 snake_case 是 JSONB 原文，见契约 sqlDisplaySchema 的注释。
+ */
+export type {
+  SqlConfig,
+  SqlDisplay,
+  SqlDisplayTable,
+  SqlDisplayColumn,
+} from "@oj2/contract"
 
 export type SUBMISSION_RESULT =
   -2 | -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10
@@ -119,17 +100,11 @@ export type Testcase = TestCaseEntry & { score: string }
 /**
  * 题目详情。以契约的 ProblemDetail 为准，只在这里补两处前端自己的窄化：
  * - `languages` / `template` 的键窄化成 LANGUAGE，组件按语言查模板要靠它
- * - `astRules` / `sqlConfig` / `sqlDisplay` 契约里是 Record<string, unknown>，
- *   这里给出组件实际读的形状
+ * - `astRules` 契约里是 unknown，这里给出组件实际读的形状
  */
-export type Problem = Omit<
-  ProblemDetail,
-  "languages" | "template" | "sqlConfig" | "sqlDisplay"
-> & {
+export type Problem = Omit<ProblemDetail, "languages" | "template"> & {
   languages: LANGUAGE[]
   template: { [key in LANGUAGE]?: string }
-  sqlConfig?: SQLConfig | null
-  sqlDisplay?: SQLDisplay | null
   astRules?: AstRules | null
   hasAstRules?: boolean
   visible?: boolean
@@ -159,8 +134,6 @@ export type AdminProblem = Omit<
   | "languages"
   | "template"
   | "testCaseScore"
-  | "sqlConfig"
-  | "sqlDisplay"
   | "samples"
   | "answers"
   | "astRules"
@@ -171,8 +144,6 @@ export type AdminProblem = Omit<
   testCaseScore: Testcase[]
   samples: { input: string; output: string }[]
   answers: { language: LANGUAGE; code: string }[]
-  sqlConfig?: SQLConfig | null
-  sqlDisplay?: SQLDisplay | null
   astRules?: AstRules | null
 }
 
@@ -227,8 +198,8 @@ export interface AdminProblemFiltered {
   hasAstRules: boolean
   allowFlowchart: boolean
   showFlowchart: boolean
-  // 比赛题目列表接口不返回这个字段
-  topReaction?: { type: ReactionKey; count: number } | null
+  // 比赛题目列表恒为 null —— 只有公开题列表下发最高票评价
+  topReaction: { type: ReactionKey; count: number } | null
 }
 
 // 题单相关类型
diff --git a/packages/contract/src/admin.ts b/packages/contract/src/admin.ts
index a2db80a..060f8f3 100644
--- a/packages/contract/src/admin.ts
+++ b/packages/contract/src/admin.ts
@@ -3,7 +3,8 @@ import { z } from "zod"
 import { achievementRaritySchema } from "./achievement"
 import { rankProfileSchema } from "./account"
 import { paginatedSchema, sampleUserSchema } from "./common"
-import { problemDifficultySchema } from "./problem"
+import { reactionKeySchema } from "./content"
+import { problemDifficultySchema, sqlConfigSchema, sqlDisplaySchema } from "./problem"
 
 /**
  * 后台侧的契约。与 oj 侧分开放：同一张表在两侧下发的字段集通常不同
@@ -513,10 +514,10 @@ export const adminProblemListItemSchema = z.object({
   hasAstRules: z.boolean(),
   allowFlowchart: z.boolean(),
   showFlowchart: z.boolean(),
-  // 最高票评价 {type, count}。**当前后端恒传 null** —— 旧后端的
-  // reaction/services.py:get_top_reactions 没有跟着迁过来，这一列现在是空的。
+  // 最高票评价 {type, count}。**只有公开题列表下发**，比赛题列表恒传 null ——
+  // 与旧后端 reaction/services.py:get_top_reactions 的口径一致。
   topReaction: z
-    .object({ type: z.string(), count: z.number().int() })
+    .object({ type: reactionKeySchema, count: z.number().int() })
     .nullable(),
 })
 
@@ -558,8 +559,8 @@ export const adminProblemSchema = z.object({
   astRules: z.unknown(),
   answers: z.array(z.record(z.string(), z.unknown())),
   prompt: z.string().nullable(),
-  sqlConfig: z.record(z.string(), z.unknown()).nullable(),
-  sqlDisplay: z.record(z.string(), z.unknown()).nullable(),
+  sqlConfig: sqlConfigSchema.nullable(),
+  sqlDisplay: sqlDisplaySchema.nullable(),
 })
 
 export const createProblemRequestSchema = z.object({
@@ -588,7 +589,12 @@ export const createProblemRequestSchema = z.object({
   mermaidCode: z.string().nullable().default(null),
   flowchartHint: z.string().nullable().default(null),
   astRules: z.unknown().default(null),
-  sqlConfig: z.record(z.string(), z.unknown()).nullable().default(null),
+  // order_sensitive 缺省补 false —— 与旧后端 SQLConfigSerializer 的
+  // `BooleanField(default=False)` 一致
+  sqlConfig: sqlConfigSchema
+    .extend({ order_sensitive: z.boolean().default(false) })
+    .nullable()
+    .default(null),
 })
 
 export const updateProblemRequestSchema = createProblemRequestSchema
diff --git a/packages/contract/src/problem.ts b/packages/contract/src/problem.ts
index ed18e35..7e261de 100644
--- a/packages/contract/src/problem.ts
+++ b/packages/contract/src/problem.ts
@@ -8,6 +8,53 @@ import { paginatedSchema, sampleUserSchema } from "./common"
  * 多出来的值会静默渲染成 undefined。
  */
 export const problemDifficultySchema = z.enum(["Low", "Mid", "High"])
+
+/**
+ * SQL 题配置与展示数据。两者都是 `problem.sql_config` / `problem.sql_display`
+ * 的 **JSONB 原文**，所以键名保持 snake_case —— 回滚时旧后端要读同一份，
+ * 且旧后端 `judge/sql_runner.py:build_display` 产出的就是这个形状
+ * （生产库 9 道 SQL 题逐条比对过，键集完全一致）。
+ *
+ * 写成精确 schema 而不是 `z.record(z.unknown())`：前端原来得自己手抄一份
+ * SQLDisplay 接口才能渲染表格，抄错了没人拦得住。
+ */
+export const sqlConfigSchema = z.object({
+  mode: z.enum(["query", "modify"]),
+  order_sensitive: z.boolean(),
+})
+
+/** 表格里的单元格。SQLite 只会给出这三种；BLOB 在落库前已转成十六进制字符串 */
+const sqlCellSchema = z.union([z.string(), z.number(), z.null()])
+
+const sqlDisplayColumnSchema = z.object({
+  name: z.string(),
+  /** 表达式/聚合列（COUNT(*)、别名）在数据表里无同名列，类型为空串，前端据此隐藏 */
+  type: z.string(),
+})
+
+const sqlResultSetSchema = z.object({
+  columns: z.array(sqlDisplayColumnSchema),
+  rows: z.array(z.array(sqlCellSchema)),
+  total_rows: z.number().int().nonnegative(),
+  truncated: z.boolean(),
+})
+
+export const sqlDisplayTableSchema = sqlResultSetSchema.extend({
+  name: z.string(),
+  /** 被标准答案 DROP 的表：条目用初始数据补齐、rows 清空，前端提示「表已删除」 */
+  dropped: z.boolean().optional(),
+})
+
+export const sqlDisplaySchema = z.object({
+  tables: z.array(sqlDisplayTableSchema),
+  // query 题给结果集，modify 题给改动后的表 —— 两种形态，前端按有没有
+  // changed_tables 分支
+  expected: z.union([
+    sqlResultSetSchema,
+    z.object({ changed_tables: z.array(sqlDisplayTableSchema) }),
+  ]),
+})
+
 export const problemDetailSchema = z.object({
   id: z.number().int(),
   _id: z.string(),
@@ -49,8 +96,8 @@ export const problemDetailSchema = z.object({
   mermaidCode: z.string().nullable(),
   flowchartData: z.record(z.string(), z.unknown()).nullable(),
   flowchartHint: z.string().nullable(),
-  sqlConfig: z.record(z.string(), z.unknown()).nullable(),
-  sqlDisplay: z.record(z.string(), z.unknown()).nullable(),
+  sqlConfig: sqlConfigSchema.nullable(),
+  sqlDisplay: sqlDisplaySchema.nullable(),
 })
 
 export type ProblemDetail = z.infer<typeof problemDetailSchema>
@@ -96,4 +143,8 @@ export type ProblemListItem = z.infer<typeof problemListItemSchema>
 export type ProblemList = z.infer<typeof problemListSchema>
 export type Tag = z.infer<typeof tagSchema>
 export type ProblemAuthor = z.infer<typeof problemAuthorSchema>
+export type SqlConfig = z.infer<typeof sqlConfigSchema>
+export type SqlDisplay = z.infer<typeof sqlDisplaySchema>
+export type SqlDisplayTable = z.infer<typeof sqlDisplayTableSchema>
+export type SqlDisplayColumn = z.infer<typeof sqlDisplayColumnSchema>
 export type YearlyAc = z.infer<typeof yearlyAcSchema>