update code level
This commit is contained in:
@@ -74,7 +74,7 @@ impl Database {
|
||||
rows.iter().map(|r| {
|
||||
let pid = r.get::<i64, _>("id");
|
||||
PersonWithCounts {
|
||||
id: pid, name: r.get("name"), display_name: r.get("display_name"),
|
||||
id: pid.to_string(), name: r.get("name"), display_name: r.get("display_name"),
|
||||
total_albums: r.get("total_albums"), total_images: r.get("total_images"),
|
||||
aliases: aliases.get(&pid).cloned().unwrap_or_default(),
|
||||
}
|
||||
@@ -91,7 +91,7 @@ impl Database {
|
||||
rows.iter().map(|r| {
|
||||
let pid = r.get::<i64, _>("id");
|
||||
PersonWithCounts {
|
||||
id: pid, name: r.get("name"), display_name: r.get("display_name"),
|
||||
id: pid.to_string(), name: r.get("name"), display_name: r.get("display_name"),
|
||||
total_albums: r.get("total_albums"), total_images: r.get("total_images"),
|
||||
aliases: aliases.get(&pid).cloned().unwrap_or_default(),
|
||||
}
|
||||
@@ -226,10 +226,16 @@ impl Database {
|
||||
// ── 写入 ──
|
||||
|
||||
pub async fn insert_person(&self, name: &str, display_name: Option<&str>) -> i64 {
|
||||
if let Some(p) = self.get_person_by_name(name).await { return p.id; }
|
||||
if let Some(p) = self.get_person_by_name_internal(name).await { return p; }
|
||||
sqlx::query("INSERT OR IGNORE INTO persons (name, display_name) VALUES (?, ?)")
|
||||
.bind(name).bind(display_name).execute(&self.pool).await.ok();
|
||||
self.get_person_by_name(name).await.map(|p| p.id).unwrap_or(0)
|
||||
self.get_person_by_name_internal(name).await.unwrap_or(0)
|
||||
}
|
||||
|
||||
/// 内部方法:按名称查找人员,直接返回 i64 id(避免 String 转换开销)
|
||||
async fn get_person_by_name_internal(&self, name: &str) -> Option<i64> {
|
||||
sqlx::query_scalar::<_, i64>("SELECT id FROM persons WHERE name = ?")
|
||||
.bind(name).fetch_optional(&self.pool).await.ok().flatten()
|
||||
}
|
||||
|
||||
/// 与 insert_person 相同,但使用已有的事务
|
||||
@@ -349,8 +355,9 @@ impl Database {
|
||||
|
||||
pub async fn get_person_by_id(&self, id: i64) -> Option<Person> {
|
||||
let r = sqlx::query("SELECT * FROM persons WHERE id = ?").bind(id).fetch_optional(&self.pool).await.ok()??;
|
||||
let db_id: i64 = r.get("id");
|
||||
Some(Person {
|
||||
id: r.get("id"), name: r.get("name"), display_name: r.get("display_name"),
|
||||
id: db_id.to_string(), name: r.get("name"), display_name: r.get("display_name"),
|
||||
total_albums: r.get("total_albums"), total_images: r.get("total_images"),
|
||||
original_names: r.get("original_names"), created_at: r.get("created_at"), updated_at: r.get("updated_at"),
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user