Replace remaining GetMaster() queries (#19545)

There are still some remaining which
access the raw DB struct. There will be
a separate PR to clean those up.

```release-note
NONE
```

app/channel_category_test.go

@@ -124,10 +124,10 @@ func TestGetSidebarCategories(t *testing.T) {
 
 		// Temporarily renaming a table to force a DB error.
 		sqlStore := mainHelper.GetSQLStore()
-		_, err := sqlStore.GetMaster().Exec("ALTER TABLE SidebarCategories RENAME TO SidebarCategoriesTest")
+		_, err := sqlStore.GetMasterX().Exec("ALTER TABLE SidebarCategories RENAME TO SidebarCategoriesTest")
 		require.NoError(t, err)
 		defer func() {
-			_, err := sqlStore.GetMaster().Exec("ALTER TABLE SidebarCategoriesTest RENAME TO SidebarCategories")
+			_, err := sqlStore.GetMasterX().Exec("ALTER TABLE SidebarCategoriesTest RENAME TO SidebarCategories")
 			require.NoError(t, err)
 		}()
 

app/config_test.go

@@ -126,12 +126,12 @@ func TestEnsureInstallationDate(t *testing.T) {
 	for _, tc := range tt {
 		t.Run(tc.Name, func(t *testing.T) {
 			sqlStore := th.GetSqlStore()
-			sqlStore.GetMaster().Exec("DELETE FROM Users")
+			sqlStore.GetMasterX().Exec("DELETE FROM Users")
 
 			for _, createAt := range tc.UsersCreationDates {
 				user := th.CreateUser()
 				user.CreateAt = createAt
-				sqlStore.GetMaster().Exec("UPDATE Users SET CreateAt = :CreateAt WHERE Id = :UserId", map[string]interface{}{"CreateAt": createAt, "UserId": user.Id})
+				sqlStore.GetMasterX().Exec("UPDATE Users SET CreateAt = ? WHERE Id = ?", createAt, user.Id)
 			}
 
 			if tc.PrevInstallationDate == nil {
@@ -156,7 +156,7 @@ func TestEnsureInstallationDate(t *testing.T) {
 				assert.True(t, *tc.ExpectedInstallationDate <= value && *tc.ExpectedInstallationDate+1000 >= value)
 			}
 
-			sqlStore.GetMaster().Exec("DELETE FROM Users")
+			sqlStore.GetMasterX().Exec("DELETE FROM Users")
 		})
 	}
 }

app/helper_test.go

@@ -560,34 +560,34 @@ func (th *TestHelper) ConfigureInbucketMail() {
 
 func (*TestHelper) ResetRoleMigration() {
 	sqlStore := mainHelper.GetSQLStore()
-	if _, err := sqlStore.GetMaster().Exec("DELETE from Roles"); err != nil {
+	if _, err := sqlStore.GetMasterX().Exec("DELETE from Roles"); err != nil {
 		panic(err)
 	}
 
 	mainHelper.GetClusterInterface().SendClearRoleCacheMessage()
 
-	if _, err := sqlStore.GetMaster().Exec("DELETE from Systems where Name = :Name", map[string]interface{}{"Name": model.AdvancedPermissionsMigrationKey}); err != nil {
+	if _, err := sqlStore.GetMasterX().Exec("DELETE from Systems where Name = ?", model.AdvancedPermissionsMigrationKey); err != nil {
 		panic(err)
 	}
 }
 
 func (*TestHelper) ResetEmojisMigration() {
 	sqlStore := mainHelper.GetSQLStore()
-	if _, err := sqlStore.GetMaster().Exec("UPDATE Roles SET Permissions=REPLACE(Permissions, ' create_emojis', '') WHERE builtin=True"); err != nil {
+	if _, err := sqlStore.GetMasterX().Exec("UPDATE Roles SET Permissions=REPLACE(Permissions, ' create_emojis', '') WHERE builtin=True"); err != nil {
 		panic(err)
 	}
 
-	if _, err := sqlStore.GetMaster().Exec("UPDATE Roles SET Permissions=REPLACE(Permissions, ' delete_emojis', '') WHERE builtin=True"); err != nil {
+	if _, err := sqlStore.GetMasterX().Exec("UPDATE Roles SET Permissions=REPLACE(Permissions, ' delete_emojis', '') WHERE builtin=True"); err != nil {
 		panic(err)
 	}
 
-	if _, err := sqlStore.GetMaster().Exec("UPDATE Roles SET Permissions=REPLACE(Permissions, ' delete_others_emojis', '') WHERE builtin=True"); err != nil {
+	if _, err := sqlStore.GetMasterX().Exec("UPDATE Roles SET Permissions=REPLACE(Permissions, ' delete_others_emojis', '') WHERE builtin=True"); err != nil {
 		panic(err)
 	}
 
 	mainHelper.GetClusterInterface().SendClearRoleCacheMessage()
 
-	if _, err := sqlStore.GetMaster().Exec("DELETE from Systems where Name = :Name", map[string]interface{}{"Name": EmojisPermissionsMigrationKey}); err != nil {
+	if _, err := sqlStore.GetMasterX().Exec("DELETE from Systems where Name = ?", EmojisPermissionsMigrationKey); err != nil {
 		panic(err)
 	}
 }

app/plugin_api_tests/test_db_driver/main.go

@@ -41,12 +41,13 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model
 		store.GetMaster().Db = handle
 		store.SetMasterX(handle)
 
+		wrapper := sqlstore.NewStoreTestWrapper(store)
 		// Testing with a handful of stores
-		storetest.TestPostStore(p.t, store, store)
-		storetest.TestUserStore(p.t, store, store)
+		storetest.TestPostStore(p.t, store, wrapper)
+		storetest.TestUserStore(p.t, store, wrapper)
 		storetest.TestTeamStore(p.t, store)
-		storetest.TestChannelStore(p.t, store, store)
-		storetest.TestBotStore(p.t, store, store)
+		storetest.TestChannelStore(p.t, store, wrapper)
+		storetest.TestBotStore(p.t, store, wrapper)
 
 		store.GetMaster().Db.Close()
 	}

app/post_test.go

@@ -821,7 +821,8 @@ func TestCreatePost(t *testing.T) {
 
 		sqlStore := th.GetSqlStore()
 		sql := fmt.Sprintf("select count(*) from Posts where Id = '%[1]s' or OriginalId = '%[1]s';", previewPost.Id)
-		val, err2 := sqlStore.GetMaster().SelectInt(sql)
+		var val int64
+		err2 := sqlStore.GetMasterX().Get(&val, sql)
 		require.NoError(t, err2)
 
 		require.EqualValues(t, int64(1), val)

app/user_test.go

@@ -927,11 +927,11 @@ func TestPermanentDeleteUser(t *testing.T) {
 	})
 	assert.Nil(t, err)
 
-	var bots1 []*model.Bot
-	var bots2 []*model.Bot
+	bots1 := []*model.Bot{}
+	bots2 := []*model.Bot{}
 
 	sqlStore := mainHelper.GetSQLStore()
-	_, err1 := sqlStore.GetMaster().Select(&bots1, "SELECT * FROM Bots")
+	err1 := sqlStore.GetMasterX().Select(&bots1, "SELECT * FROM Bots")
 	assert.NoError(t, err1)
 	assert.Equal(t, 1, len(bots1))
 
@@ -942,7 +942,7 @@ func TestPermanentDeleteUser(t *testing.T) {
 	err = th.App.PermanentDeleteUser(th.Context, retUser1)
 	assert.Nil(t, err)
 
-	_, err1 = sqlStore.GetMaster().Select(&bots2, "SELECT * FROM Bots")
+	err1 = sqlStore.GetMasterX().Select(&bots2, "SELECT * FROM Bots")
 	assert.NoError(t, err1)
 	assert.Equal(t, 0, len(bots2))