adopt forked squirrel supporting from UPDATE FROM (mattermost#19896)

Fork https://github.com/Masterminds/squirrel as https://github.com/lieut-data/squirrel with the following changes:
* Masterminds/squirrel#256 supporting FROM clause to update builder (Postgres)
* Extension of above to support multiple FROM in UPDATE (Postgres)
* Support for multiple tables in UPDATE (MySQL)

This PR then leverages those changes to simplify a query that previously had to be coded by hand and duplicate for each of MySQL and Postgres.

go.mod

@@ -126,6 +126,8 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
+replace github.com/Masterminds/squirrel v1.5.2 => github.com/lieut-data/squirrel v1.5.4
+
 // Hack to prevent the willf/bitset module from being upgraded to 1.2.0.
 // They changed the module path from github.com/willf/bitset to
 // github.com/bits-and-blooms/bitset and a couple of dependent repos are yet

go.sum

@@ -978,6 +978,10 @@ github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lieut-data/squirrel v1.5.3 h1:c6RI29VQOkUvqjpUsa45HeZ+wShtzDcSrmTUom/F65g=
+github.com/lieut-data/squirrel v1.5.3/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
+github.com/lieut-data/squirrel v1.5.4 h1:OGzJNl0/ZxdjLEHuFzDo797zB2V7i8wQXBVThcOzbHE=
+github.com/lieut-data/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=

store/sqlstore/thread_store.go

@@ -571,36 +571,28 @@ func (s *SqlThreadStore) MarkAllAsReadByChannels(userID string, channelIDs []str
 
 	now := model.GetMillis()
 
-	// TODO: Fork squirrel to include https://github.com/Masterminds/squirrel/pull/256 and
-	// support FROM in an UPDATE query.
-	channelIDsSql, channelIDsArgs := constructArrayArgs(channelIDs)
-
-	var query string
+	var query sq.UpdateBuilder
 	if s.DriverName() == model.DatabaseDriverPostgres {
-		query = `
-			UPDATE ThreadMemberships
-			SET LastViewed = ?, UnreadMentions = ?, LastUpdated = ?
-			FROM Threads
-			WHERE ThreadMemberships.UserId = ?
-			AND Threads.PostId = ThreadMemberships.PostId
-			AND Threads.ChannelID IN ` + channelIDsSql + `
-			AND Threads.LastReplyAt > ThreadMemberships.LastViewed
-		`
+		query = s.getQueryBuilder().Update("ThreadMemberships").From("Threads")
+
 	} else {
-		query = `
-			UPDATE ThreadMemberships, Threads
-			SET ThreadMemberships.LastViewed = ?, ThreadMemberships.UnreadMentions = ?, ThreadMemberships.LastUpdated = ?
-			WHERE ThreadMemberships.UserId = ?
-			AND Threads.PostId = ThreadMemberships.PostId
-			AND Threads.ChannelID IN ` + channelIDsSql + `
-			AND Threads.LastReplyAt > ThreadMemberships.LastViewed
-		`
+		query = s.getQueryBuilder().Update("ThreadMemberships", "Threads")
 	}
 
-	args := []interface{}{now, 0, now, userID}
-	args = append(args, channelIDsArgs...)
+	query = query.Set("LastViewed", now).
+		Set("UnreadMentions", 0).
+		Set("LastUpdated", now).
+		Where(sq.Eq{"ThreadMemberships.UserId": userID}).
+		Where(sq.Expr("Threads.PostId = ThreadMemberships.PostId")).
+		Where(sq.Eq{"Threads.ChannelId": channelIDs}).
+		Where(sq.Expr("Threads.LastReplyAt > ThreadMemberships.LastViewed"))
+
+	sql, args, err := query.ToSql()
+	if err != nil {
+		return errors.Wrapf(err, "failed to build query to mark all as read by %d channels for user id=%s", len(channelIDs), userID)
+	}
 
-	if _, err := s.GetMasterX().Exec(query, args...); err != nil {
+	if _, err := s.GetMasterX().Exec(sql, args...); err != nil {
 		return errors.Wrapf(err, "failed to mark all threads as read by channels for user id=%s", userID)
 	}
 

vendor/modules.txt

@@ -10,7 +10,7 @@ github.com/JalfResi/justext
 # github.com/Masterminds/semver/v3 v3.1.1
 ## explicit
 github.com/Masterminds/semver/v3
-# github.com/Masterminds/squirrel v1.5.2
+# github.com/Masterminds/squirrel v1.5.2 => github.com/lieut-data/squirrel v1.5.4
 ## explicit
 github.com/Masterminds/squirrel
 # github.com/PuerkitoBio/goquery v1.8.0