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

🎨 API /api/query/sql support UNION statement https://github.com/siyuan-note/siyuan/issues/8226

Browse source
This commit is contained in:
Liang Ding 2023-05-10 15:30:25 +08:00
parent cfdea78c1e
commit 3fdf00bbbd
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

55
kernel/sql/block_query.go
View file

@ -391,31 +391,17 @@ func Query(stmt string, limit int) (ret []map[string]interface{}, err error) {
switch parsedStmt.(type) { switch parsedStmt.(type) {
case *sqlparser.Select: case *sqlparser.Select:
limitClause := getLimitClause(parsedStmt, limit)
slct := parsedStmt.(*sqlparser.Select) slct := parsedStmt.(*sqlparser.Select)
if nil == slct.Limit { slct.Limit = limitClause
slct.Limit = &sqlparser.Limit{
Rowcount: &sqlparser.SQLVal{
Type: sqlparser.IntVal,
Val: []byte(strconv.Itoa(limit)),
},
}
} else {
if nil != slct.Limit.Rowcount && 0 < len(slct.Limit.Rowcount.(*sqlparser.SQLVal).Val) {
limit, _ = strconv.Atoi(string(slct.Limit.Rowcount.(*sqlparser.SQLVal).Val))
if 0 >= limit {
limit = 32
}
}
slct.Limit.Rowcount = &sqlparser.SQLVal{
Type: sqlparser.IntVal,
Val: []byte(strconv.Itoa(limit)),
}
}
stmt = sqlparser.String(slct) stmt = sqlparser.String(slct)
case *sqlparser.Union:
limitClause := getLimitClause(parsedStmt, limit)
union := parsedStmt.(*sqlparser.Union)
union.Limit = limitClause
stmt = sqlparser.String(union)
default: default:
return return queryRawStmt(stmt, limit)
} }
ret = []map[string]interface{}{} ret = []map[string]interface{}{}
@ -452,6 +438,31 @@ func Query(stmt string, limit int) (ret []map[string]interface{}, err error) {
return return
} }
func getLimitClause(parsedStmt sqlparser.Statement, limit int) (ret *sqlparser.Limit) {
switch parsedStmt.(type) {
case *sqlparser.Select:
slct := parsedStmt.(*sqlparser.Select)
if nil != slct.Limit {
ret = slct.Limit
}
case *sqlparser.Union:
union := parsedStmt.(*sqlparser.Union)
if nil != union.Limit {
ret = union.Limit
}
}
if nil == ret || nil == ret.Rowcount {
ret = &sqlparser.Limit{
Rowcount: &sqlparser.SQLVal{
Type: sqlparser.IntVal,
Val: []byte(strconv.Itoa(limit)),
},
}
}
return
}
func queryRawStmt(stmt string, limit int) (ret []map[string]interface{}, err error) { func queryRawStmt(stmt string, limit int) (ret []map[string]interface{}, err error) {
rows, err := query(stmt) rows, err := query(stmt)
if nil != err { if nil != err {