diff --git a/delete_batch.go b/delete_batch.go index 2ffb764..5fb49c7 100644 --- a/delete_batch.go +++ b/delete_batch.go @@ -22,10 +22,15 @@ import ( "yunion.io/x/log" ) -func getSQLFilters(filter map[string]interface{}, qChar string) ([]string, []interface{}) { +func (ts *STableSpec) getSQLFilters(filter map[string]interface{}, qChar string) ([]string, []interface{}) { conds := make([]string, 0, len(filter)) params := make([]interface{}, 0, len(filter)) for k, v := range filter { + col := ts.ColumnSpec(k) + if col == nil { + log.Warningf("getSQLFilters: column %s not found", k) + continue + } if reflect.TypeOf(v).Kind() == reflect.Slice || reflect.TypeOf(v).Kind() == reflect.Array { value := reflect.ValueOf(v) if value.Len() == 0 { @@ -34,12 +39,12 @@ func getSQLFilters(filter map[string]interface{}, qChar string) ([]string, []int arr := make([]string, value.Len()) for i := 0; i < value.Len(); i++ { arr[i] = "?" - params = append(params, value.Index(i).Interface()) + params = append(params, col.ConvertFromValue(value.Index(i).Interface())) } conds = append(conds, fmt.Sprintf("%s%s%s in (%s)", qChar, k, qChar, strings.Join(arr, ", "))) } else { conds = append(conds, fmt.Sprintf("%s%s%s = ?", qChar, k, qChar)) - params = append(params, v) + params = append(params, col.ConvertFromValue(v)) } } return conds, params @@ -55,7 +60,7 @@ func (ts *STableSpec) DeleteFrom(filters map[string]interface{}) error { buf.WriteString(ts.Name()) buf.WriteString(qChar) - conds, params := getSQLFilters(filters, qChar) + conds, params := ts.getSQLFilters(filters, qChar) if len(conds) > 0 { buf.WriteString(" WHERE ") diff --git a/filter.go b/filter.go index b4d2763..da431e7 100644 --- a/filter.go +++ b/filter.go @@ -61,6 +61,12 @@ func (tq *SQuery) Contains(f string, v string) *SQuery { return tq.Filter(cond) } +// Contains filters query with a contains condition +func (tq *SQuery) ContainsAny(f string, v []string) *SQuery { + cond := ContainsAny(tq.Field(f), v) + return tq.Filter(cond) +} + // Startswith filters query with a startswith condition func (tq *SQuery) Startswith(f string, v string) *SQuery { cond := Startswith(tq.Field(f), v) diff --git a/update_batch.go b/update_batch.go index 0ae7d3a..82359c1 100644 --- a/update_batch.go +++ b/update_batch.go @@ -31,10 +31,15 @@ func (ts *STableSpec) UpdateBatch(data map[string]interface{}, filter map[string params := make([]interface{}, 0, len(data)) setter := make([]string, 0, len(data)) for k, v := range data { + col := ts.ColumnSpec(k) + if col == nil { + log.Warningf("UpdateBatch: column %s not found", k) + continue + } setter = append(setter, fmt.Sprintf("%s%s%s = ?", qChar, k, qChar)) - params = append(params, v) + params = append(params, col.ConvertFromValue(v)) } - conds, condparams := getSQLFilters(filter, qChar) + conds, condparams := ts.getSQLFilters(filter, qChar) params = append(params, condparams...) buf := strings.Builder{} @@ -52,7 +57,7 @@ func (ts *STableSpec) UpdateBatch(data map[string]interface{}, filter map[string } if DEBUG_SQLCHEMY { - log.Infof("Update: %s %s", buf.String(), params) + log.Infof("UpdateBATCH: %s %s", buf.String(), params) } _, err := ts.Database().Exec(buf.String(), params...)