# HG changeset patch # User Florent Aide <florent.aide@gmail.com> # Date 1641944024 -3600 # Wed Jan 12 00:33:44 2022 +0100 # Node ID 88cf4ccfe86f10bd51f8b659695a3d61b297e971 # Parent ce59b9e7b7bc10768f4e8be7267d7303fe7b4658 ArrayContains.ToSQL -> ToSql to implement proper interface diff --git a/database/array_contains.go b/database/array_contains.go --- a/database/array_contains.go +++ b/database/array_contains.go @@ -11,7 +11,7 @@ type ArrayContains map[string]interface{} -func (ac ArrayContains) ToSQL() (sql string, args []interface{}, err error) { +func (ac ArrayContains) ToSql() (sql string, args []interface{}, err error) { if len(ac) == 0 { // Empty Sql{} evaluates to true. sql = "(1=1)" diff --git a/database/sql_helper.go b/database/sql_helper.go --- a/database/sql_helper.go +++ b/database/sql_helper.go @@ -105,7 +105,7 @@ return nil } -// Upsert upserts a Mapped into the db +// UpsertColumns upserts a Mapped into the db using only the given columns as update source func (h *SQLHelper) UpsertColumns(insertColumns, updateColumns []string, instances ...Mapped) error { for _, instance := range instances { query := SQLUpsertColumns(instance, insertColumns, updateColumns)