Commit 07336f03 authored by johnnyjoy's avatar johnnyjoy

chore: update condition concat check

parent 64dfadb5
...@@ -121,8 +121,11 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo ...@@ -121,8 +121,11 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil { if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil {
return nil, err return nil, err
} }
where = append(where, fmt.Sprintf("(%s)", convertCtx.Buffer.String())) condition := convertCtx.Buffer.String()
args = append(args, convertCtx.Args...) if condition != "" {
where = append(where, fmt.Sprintf("(%s)", condition))
args = append(args, convertCtx.Args...)
}
} }
if find.ExcludeComments { if find.ExcludeComments {
having = append(having, "`parent_id` IS NULL") having = append(having, "`parent_id` IS NULL")
......
...@@ -113,8 +113,11 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo ...@@ -113,8 +113,11 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil { if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil {
return nil, err return nil, err
} }
where = append(where, fmt.Sprintf("(%s)", convertCtx.Buffer.String())) condition := convertCtx.Buffer.String()
args = append(args, convertCtx.Args...) if condition != "" {
where = append(where, fmt.Sprintf("(%s)", condition))
args = append(args, convertCtx.Args...)
}
} }
if find.ExcludeComments { if find.ExcludeComments {
where = append(where, "memo_relation.related_memo_id IS NULL") where = append(where, "memo_relation.related_memo_id IS NULL")
......
...@@ -113,8 +113,11 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo ...@@ -113,8 +113,11 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil { if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil {
return nil, err return nil, err
} }
where = append(where, fmt.Sprintf("(%s)", convertCtx.Buffer.String())) condition := convertCtx.Buffer.String()
args = append(args, convertCtx.Args...) if condition != "" {
where = append(where, fmt.Sprintf("(%s)", condition))
args = append(args, convertCtx.Args...)
}
} }
if find.ExcludeComments { if find.ExcludeComments {
where = append(where, "`parent_id` IS NULL") where = append(where, "`parent_id` IS NULL")
......
...@@ -54,6 +54,11 @@ func TestConvertExprToSQL(t *testing.T) { ...@@ -54,6 +54,11 @@ func TestConvertExprToSQL(t *testing.T) {
want: "(JSON_EXTRACT(`memo`.`payload`, '$.tags') LIKE ? OR `memo`.`content` LIKE ?)", want: "(JSON_EXTRACT(`memo`.`payload`, '$.tags') LIKE ? OR `memo`.`content` LIKE ?)",
args: []any{`%"tag1"%`, "%hello%"}, args: []any{`%"tag1"%`, "%hello%"},
}, },
{
filter: `1`,
want: "",
args: []any{},
},
} }
for _, tt := range tests { for _, tt := range tests {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment