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

🎨 Kernel API /api/query/sql support || operator https://github.com/siyuan-note/siyuan/issues/9662

Browse source
This commit is contained in:
Daniel 2023-11-15 23:46:51 +08:00
parent 87032626e2
commit c65c32caf9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

57
kernel/sql/block_query.go
View file

@ -27,6 +27,7 @@ import (
"github.com/88250/lute/ast"
"github.com/88250/vitess-sqlparser/sqlparser"
"github.com/emirpasic/gods/sets/hashset"
sqlparser2 "github.com/rqlite/sql"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
@ -384,24 +385,48 @@ func QueryNoLimit(stmt string) (ret []map[string]interface{}, err error) {
}
func Query(stmt string, limit int) (ret []map[string]interface{}, err error) {
parsedStmt, err := sqlparser.Parse(stmt)
// 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
// 考虑到 UNION 的使用场景不多，这里还是以支持 || 操作符为主
p := sqlparser2.NewParser(strings.NewReader(stmt))
parsedStmt2, err := p.ParseStatement()
if nil != err {
return queryRawStmt(stmt, limit)
}
if !strings.Contains(stmt, "||") {
// 这个解析器无法处理 || 连接字符串操作符
parsedStmt, err2 := sqlparser.Parse(stmt)
if nil != err2 {
return queryRawStmt(stmt, limit)
}
switch parsedStmt.(type) {
case *sqlparser.Select:
limitClause := getLimitClause(parsedStmt, limit)
slct := parsedStmt.(*sqlparser.Select)
slct.Limit = limitClause
stmt = sqlparser.String(slct)
case *sqlparser.Union:
limitClause := getLimitClause(parsedStmt, limit)
union := parsedStmt.(*sqlparser.Union)
union.Limit = limitClause
stmt = sqlparser.String(union)
default:
return queryRawStmt(stmt, limit)
switch parsedStmt.(type) {
case *sqlparser.Select:
limitClause := getLimitClause(parsedStmt, limit)
slct := parsedStmt.(*sqlparser.Select)
slct.Limit = limitClause
stmt = sqlparser.String(slct)
case *sqlparser.Union:
// Kernel API `/api/query/sql` support `UNION` statement https://github.com/siyuan-note/siyuan/issues/8226
limitClause := getLimitClause(parsedStmt, limit)
union := parsedStmt.(*sqlparser.Union)
union.Limit = limitClause
stmt = sqlparser.String(union)
default:
return queryRawStmt(stmt, limit)
}
} else {
return queryRawStmt(stmt, limit)
}
} else {
switch parsedStmt2.(type) {
case *sqlparser2.SelectStatement:
slct := parsedStmt2.(*sqlparser2.SelectStatement)
if nil == slct.LimitExpr {
slct.LimitExpr = &sqlparser2.NumberLit{Value: strconv.Itoa(limit)}
}
stmt = slct.String()
default:
return queryRawStmt(stmt, limit)
}
}
ret = []map[string]interface{}{}