Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Fix https://github.com/siyuan-note/siyuan/issues/16475

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-02 12:33:01 +08:00
parent e3d1d2dbf0
commit 4de0be0bc1
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/sql/block_query.go
View file

@ -379,6 +379,7 @@ func QueryNoLimit(stmt string) (ret []map[string]interface{}, err error) {
} }
func Query(stmt string, limit int) (ret []map[string]interface{}, err error) { func Query(stmt string, limit int) (ret []map[string]interface{}, err error) {
originalStmt := stmt
// Kernel API `/api/query/sql` support `||` operator https://github.com/siyuan-note/siyuan/issues/9662 // Kernel API `/api/query/sql` support `||` operator https://github.com/siyuan-note/siyuan/issues/9662
// 这里为了支持 || 操作符，使用了另一个 sql 解析器，但是这个解析器无法处理 UNION https://github.com/siyuan-note/siyuan/issues/8226 // 这里为了支持 || 操作符，使用了另一个 sql 解析器，但是这个解析器无法处理 UNION https://github.com/siyuan-note/siyuan/issues/8226
// 考虑到 UNION 的使用场景不多，这里还是以支持 || 操作符为主 // 考虑到 UNION 的使用场景不多，这里还是以支持 || 操作符为主
@ -425,10 +426,13 @@ func Query(stmt string, limit int) (ret []map[string]interface{}, err error) {
ret = []map[string]interface{}{} ret = []map[string]interface{}{}
rows, err := query(stmt) rows, err := query(stmt)
if err != nil {
rows, err = query(originalStmt + " LIMIT " + strconv.Itoa(limit))
if err != nil { if err != nil {
logging.LogWarnf("sql query [%s] failed: %s", stmt, err) logging.LogWarnf("sql query [%s] failed: %s", stmt, err)
return return
} }
}
defer rows.Close() defer rows.Close()
cols, _ := rows.Columns() cols, _ := rows.Columns()