From 8802604568926cb5175d893191b86350e1c720a0 Mon Sep 17 00:00:00 2001
From: root <root@minecraft-server>
Date: Thu, 30 Apr 2026 08:41:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSQLite=20UPDATE/DELETE?=
 =?UTF-8?q?=E5=88=AB=E5=90=8D=E8=AF=AD=E6=B3=95=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?near=20'r'=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/embedded_db.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/core/embedded_db.py b/core/embedded_db.py
index 669a0e2..0600a47 100644
--- a/core/embedded_db.py
+++ b/core/embedded_db.py
@@ -464,7 +464,6 @@ class EmbeddedGraphDB:
         # 构建查询条件
         conditions = []
         params = []
-        joins = []
         
         relation_type = criteria.get('relation') or criteria.get('relation_type', '')
         
@@ -472,18 +471,18 @@ class EmbeddedGraphDB:
             cursor.execute("SELECT id FROM entities WHERE name = ?", (criteria['source'],))
             row = cursor.fetchone()
             if row:
-                conditions.append("r.source_id = ?")
+                conditions.append("source_id = ?")
                 params.append(row['id'])
         
         if criteria.get('target'):
             cursor.execute("SELECT id FROM entities WHERE name = ?", (criteria['target'],))
             row = cursor.fetchone()
             if row:
-                conditions.append("r.target_id = ?")
+                conditions.append("target_id = ?")
                 params.append(row['id'])
         
         if relation_type:
-            conditions.append("r.relation_type = ?")
+            conditions.append("relation_type = ?")
             params.append(relation_type)
         
         # 通过子查询支持实体属性过滤
@@ -493,7 +492,7 @@ class EmbeddedGraphDB:
             ids = [row['id'] for row in cursor.fetchall()]
             if ids:
                 placeholders = ','.join(['?'] * len(ids))
-                conditions.append(f"r.source_id IN ({placeholders})")
+                conditions.append(f"source_id IN ({placeholders})")
                 params.extend(ids)
         
         if criteria.get('target_contains'):
@@ -502,7 +501,7 @@ class EmbeddedGraphDB:
             ids = [row['id'] for row in cursor.fetchall()]
             if ids:
                 placeholders = ','.join(['?'] * len(ids))
-                conditions.append(f"r.target_id IN ({placeholders})")
+                conditions.append(f"target_id IN ({placeholders})")
                 params.extend(ids)
         
         # 源实体类型过滤
@@ -512,7 +511,7 @@ class EmbeddedGraphDB:
             ids = [row['id'] for row in cursor.fetchall()]
             if ids:
                 placeholders = ','.join(['?'] * len(ids))
-                conditions.append(f"r.source_id IN ({placeholders})")
+                conditions.append(f"source_id IN ({placeholders})")
                 params.extend(ids)
         
         # 目标实体类型过滤
@@ -522,36 +521,35 @@ class EmbeddedGraphDB:
             ids = [row['id'] for row in cursor.fetchall()]
             if ids:
                 placeholders = ','.join(['?'] * len(ids))
-                conditions.append(f"r.target_id IN ({placeholders})")
+                conditions.append(f"target_id IN ({placeholders})")
                 params.extend(ids)
         
-        # 源实体状态过滤（检查 entity name 是否以特定后缀结尾等）
+        # 源实体状态过滤
         if criteria.get('source_has_status'):
             status = criteria['source_has_status']
-            # 匹配 entities 表中 type 字段包含状态信息的节点
             cursor.execute("SELECT id FROM entities WHERE type LIKE ?",
                           (f'%{status}%',))
             ids = [row['id'] for row in cursor.fetchall()]
             if ids:
                 placeholders = ','.join(['?'] * len(ids))
-                conditions.append(f"r.source_id IN ({placeholders})")
+                conditions.append(f"source_id IN ({placeholders})")
                 params.extend(ids)
         
         if not conditions:
             return {"deleted": 0, "message": "无删除条件"}
         
-        conditions.append("r.status = 'active'")
+        conditions.append("status = 'active'")
         where_clause = " AND ".join(conditions)
         
         if mode == "soft":
             cursor.execute(f"""
-                UPDATE relations r
+                UPDATE relations
                 SET status = 'deleted', updated_at = CURRENT_TIMESTAMP
                 WHERE {where_clause}
             """, params)
         else:
             cursor.execute(f"""
-                DELETE FROM relations r
+                DELETE FROM relations
                 WHERE {where_clause}
             """, params)