wpetit/super-graph
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add query support for ts_rank and ts_headline

Browse Source
This commit is contained in:
Vikram Rangnekar
2019-04-06 02:35:08 -04:00
parent d1bf87e19c
commit 6536b12858
4 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qcode/qcode.go
View File

@ -25,6 +25,7 @@ type Column struct {
type Select struct {
ID int16
Args []*Arg
AsList bool
Table string
Singular string
@ -332,12 +333,16 @@ func (com *Compiler) compileQuery(op *Operation) (*Query, error) {
func (com *Compiler) compileArgs(sel *Select, args []*Arg) error {
var err error
ad := make(map[string]struct{})
for i := range args {
if args[i] == nil {
return fmt.Errorf("[Args] unexpected nil argument found")
}
an := strings.ToLower(args[i].Name)
if _, ok := ad[an]; ok {
continue
}
switch an {
case "id":
@ -345,9 +350,7 @@ func (com *Compiler) compileArgs(sel *Select, args []*Arg) error {
err = com.compileArgID(sel, args[i])
}
case "search":
if sel.ID == int16(0) {
err = com.compileArgSearch(sel, args[i])
}
err = com.compileArgSearch(sel, args[i])
case "where":
err = com.compileArgWhere(sel, args[i])
case "orderby", "order_by", "order":
@ -363,6 +366,8 @@ func (com *Compiler) compileArgs(sel *Select, args []*Arg) error {
if err != nil {
return err
}
ad[an] = struct{}{}
}
return nil
@ -446,16 +451,14 @@ func (com *Compiler) compileArgID(sel *Select, arg *Arg) error {
}
func (com *Compiler) compileArgSearch(sel *Select, arg *Arg) error {
if sel.Where != nil && sel.Where.Op == OpTsQuery {
return nil
}
ex := &Exp{
Op: OpTsQuery,
Type: ValStr,
Val: arg.Val.Val,
}
sel.Args = append(sel.Args, arg)
if sel.Where != nil {
sel.Where = &Exp{Op: OpAnd, Children: []*Exp{ex, sel.Where}}
} else {