diff --git a/src/db.rs b/src/db.rs index 2a27a7b..417864d 100644 --- a/src/db.rs +++ b/src/db.rs @@ -326,8 +326,8 @@ pub async fn query_json_params( let wrapped = format!("SELECT row_to_json(q)::text AS _row FROM ({}) AS q", trimmed); let rows = db.query(&wrapped, params).await?; let mut out = Vec::with_capacity(rows.len()); - for i in 0..rows.len() { - let s: Option = rows[i].get(0)?; + for row in &rows { + let s: Option = row.get(0)?; match s { Some(t) => match serde_json::from_str::(&t) { Ok(v) => out.push(v), @@ -349,7 +349,7 @@ pub async fn query_scalar_text( if rows.is_empty() { return Ok(None); } - Ok(rows[0].get::>(0)?) + rows[0].get::>(0) } /// 列名 → PG 类型文本(`character varying(50)` / `bigint` / `timestamp without time zone` …)。 @@ -371,9 +371,9 @@ pub async fn column_types(db: &PGlite, table: &str) -> Result = rows[i].get(0)?; - let ty: Option = rows[i].get(1)?; + for row in &rows { + let name: Option = row.get(0)?; + let ty: Option = row.get(1)?; if let (Some(name), Some(ty)) = (name, ty) { out.insert(name, ty); } diff --git a/src/main.rs b/src/main.rs index 2a17a44..6a73e20 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ //! 本文件里剩下的 `/api/db/*` 与 `/api/ssw/tdc/node/*` 是**旧控制台**的遗留端点, //! Task 10 统一下线。 -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; use axum::{ @@ -74,11 +74,11 @@ fn now_iso() -> String { Utc::now().to_rfc3339() } -fn identity_path(data_dir: &PathBuf) -> PathBuf { +fn identity_path(data_dir: &Path) -> PathBuf { data_dir.join("node-identity.json") } -fn read_identity(data_dir: &PathBuf) -> Option { +fn read_identity(data_dir: &Path) -> Option { let p = identity_path(data_dir); if !p.exists() { return None;