From 80eacdbfac7eb769ad98d5daaa1936360f976737 Mon Sep 17 00:00:00 2001 From: Mosen Date: Sun, 26 Jun 2016 23:05:34 +1000 Subject: [PATCH] Add parameter "separator" to addWhereFilters() --- device/datastore.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device/datastore.go b/device/datastore.go index 6bb0c68d..0c565a1f 100644 --- a/device/datastore.go +++ b/device/datastore.go @@ -177,7 +177,7 @@ func (store pgStore) New(src string, d *Device) (string, error) { func (store pgStore) Devices(params ...interface{}) ([]Device, error) { stmt := selectDevicesStmt - stmt = addWhereFilters(stmt, params...) + stmt = addWhereFilters(stmt, "OR", params...) var devices []Device err := store.Select(&devices, stmt) if err != nil { @@ -229,7 +229,7 @@ type whereer interface { } // add WHERE clause from params -func addWhereFilters(stmt string, params ...interface{}) string { +func addWhereFilters(stmt string, separator string, params ...interface{}) string { var where []string for _, param := range params { if f, ok := param.(whereer); ok { @@ -238,7 +238,7 @@ func addWhereFilters(stmt string, params ...interface{}) string { } if len(where) != 0 { - whereFilter := strings.Join(where, " OR ") + whereFilter := strings.Join(where, " "+separator+" ") stmt = fmt.Sprintf("%s WHERE %s", stmt, whereFilter) } return stmt