Moved some common SQL function to public utils as they are used in plugins (#26412)

* Moved some common SQL function tu public utls as they are used in plugins

* goimported file

* Added tests

* Created sub-package

* MOved SetupConnection to public sql utils
Этот коммит содержится в:
Harshil Sharma
2024-03-11 09:54:23 +05:30
коммит произвёл GitHub
родитель f34445a6f4
Коммит 4fda7e6f34
7 изменённых файлов: 253 добавлений и 191 удалений

Просмотреть файл

@@ -12,6 +12,8 @@ import (
"strconv"
"sync"
sqlUtils "github.com/mattermost/mattermost/server/public/utils/sql"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/v8/channels/db"
@@ -119,16 +121,16 @@ func (ss *SqlStore) initMorph(dryRun bool) (*morph.Morph, error) {
var driver drivers.Driver
switch ss.DriverName() {
case model.DatabaseDriverMysql:
dataSource, rErr := ResetReadTimeout(*ss.settings.DataSource)
dataSource, rErr := sqlUtils.ResetReadTimeout(*ss.settings.DataSource)
if rErr != nil {
mlog.Fatal("Failed to reset read timeout from datasource.", mlog.Err(rErr), mlog.String("src", *ss.settings.DataSource))
return nil, rErr
}
dataSource, err = AppendMultipleStatementsFlag(dataSource)
dataSource, err = sqlUtils.AppendMultipleStatementsFlag(dataSource)
if err != nil {
return nil, err
}
db, err2 := SetupConnection(ss.Logger(), "master", dataSource, ss.settings, DBPingAttempts)
db, err2 := sqlUtils.SetupConnection(ss.Logger(), "master", dataSource, ss.settings, DBPingAttempts)
if err2 != nil {
return nil, err2
}