mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

s/Get(Master|Replica)X/Get\1/g (#29520)

Просмотр исходного кода 
Drop the legacy `X` suffix from `GetMasterX` and `GetReplicaX`. The
presence of the suffix suggests there's a `non-X` version: but in fact
we migrated these away a long time ago, so remove the cognitive
overhead.

As an aside, this additionally helps avoid trip up LLMs that interpret
this as "something to fix".
Этот коммит содержится в:
Jesse Hallam
2024-12-10 09:57:19 -04:00
коммит произвёл GitHub
родитель 8b86e1276e
Коммит 5369f8b36b
77 изменённых файлов: 892 добавлений и 892 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
server/channels/app/channel_category_test.go
Просмотреть файл

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

6
server/channels/app/config_test.go
Просмотреть файл

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

12
server/channels/app/helper_test.go
Просмотреть файл

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

8
server/channels/app/platform/service_test.go
Просмотреть файл

@@ -40,7 +40,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
ConfigStore(configStore),
)
require.NoError(t, err)
require.Same(t, ps.sqlStore.GetMasterX(), ps.sqlStore.GetReplicaX())
require.Same(t, ps.sqlStore.GetMaster(), ps.sqlStore.GetReplica())
require.Len(t, ps.Config().SqlSettings.DataSourceReplicas, 1)
})
@@ -56,7 +56,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
},
)
require.NoError(t, err)
require.NotSame(t, ps.sqlStore.GetMasterX(), ps.sqlStore.GetReplicaX())
require.NotSame(t, ps.sqlStore.GetMaster(), ps.sqlStore.GetReplica())
require.Len(t, ps.Config().SqlSettings.DataSourceReplicas, 1)
})
@@ -68,7 +68,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
ConfigStore(configStore),
)
require.NoError(t, err)
require.Same(t, ps.sqlStore.GetMasterX(), ps.sqlStore.GetSearchReplicaX())
require.Same(t, ps.sqlStore.GetMaster(), ps.sqlStore.GetSearchReplicaX())
require.Len(t, ps.Config().SqlSettings.DataSourceSearchReplicas, 1)
})
@@ -84,7 +84,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
},
)
require.NoError(t, err)
require.NotSame(t, ps.sqlStore.GetMasterX(), ps.sqlStore.GetSearchReplicaX())
require.NotSame(t, ps.sqlStore.GetMaster(), ps.sqlStore.GetSearchReplicaX())
require.Len(t, ps.Config().SqlSettings.DataSourceSearchReplicas, 1)
})
}

4
server/channels/app/plugin_api_tests/test_db_driver/main.go
Просмотреть файл

@@ -37,7 +37,7 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model
if err != nil {
panic(err)
}
store.GetMasterX().Close()
store.GetMaster().Close()
for _, isMaster := range []bool{true, false} {
handle := sql.OpenDB(driver.NewConnector(p.Driver, isMaster))
@@ -51,7 +51,7 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model
storetest.TestChannelStore(p.t, rctx, store, wrapper)
storetest.TestBotStore(p.t, rctx, store, wrapper)
store.GetMasterX().Close()
store.GetMaster().Close()
}
// Use the API to instantiate the driver

2
server/channels/app/post_test.go
Просмотреть файл

@@ -982,7 +982,7 @@ 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)
var val int64
err2 := sqlStore.GetMasterX().Get(&val, sql)
err2 := sqlStore.GetMaster().Get(&val, sql)
require.NoError(t, err2)
require.EqualValues(t, int64(1), val)

4
server/channels/app/user_test.go
Просмотреть файл

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