twhelp
/
dataupdater
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename two functions in the postgres package (CreateSchema -> CreateServerSchema, createSchema -> createServerSchema)

This commit is contained in:
Dawid Wysokiński 2021-07-11 08:27:31 +02:00
parent 37955cfebf
commit f2b6bbcbc4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cron/queue/task_load_servers_and_update_data.go
View File

@ -50,7 +50,7 @@ func (t *taskLoadServersAndUpdateData) execute(version *twmodel.Version) error {
VersionCode: version.Code,
Version: version,
}
if err := postgres.CreateSchema(t.db, server); err != nil {
if err := postgres.CreateServerSchema(t.db, server); err != nil {
logrus.Warn(errors.Wrapf(err, "taskLoadServersAndUpdateData.execute: %s: Couldn't create the schema", server.Key))
continue
}

12
pkg/postgres/postgres.go
View File

@ -110,7 +110,7 @@ func prepareDB(db *pg.DB) error {
}
for _, server := range servers {
if err := createSchema(db, server, true); err != nil {
if err := createServerSchema(db, server, true); err != nil {
return err
}
}
@ -118,11 +118,11 @@ func prepareDB(db *pg.DB) error {
return nil
}
func CreateSchema(db *pg.DB, server *twmodel.Server) error {
return createSchema(db, server, false)
func CreateServerSchema(db *pg.DB, server *twmodel.Server) error {
return createServerSchema(db, server, false)
}
func SchemaExists(db *pg.DB, schemaName string) bool {
func SchemaExists(db pg.DBI, schemaName string) bool {
exists, err := db.
Model().
Table("information_schema.schemata").
@ -134,7 +134,7 @@ func SchemaExists(db *pg.DB, schemaName string) bool {
return exists
}
func createSchema(db *pg.DB, server *twmodel.Server, init bool) error {
func createServerSchema(db *pg.DB, server *twmodel.Server, init bool) error {
if !init && SchemaExists(db, server.Key) {
return nil
}
@ -145,7 +145,7 @@ func createSchema(db *pg.DB, server *twmodel.Server, init bool) error {
}
defer func() {
if err := tx.Close(); err != nil {
log.Warn(errors.Wrap(err, "createSchema: Couldn't rollback the transaction"))
log.Warn(errors.Wrap(err, "createServerSchema: Couldn't rollback the transaction"))
}
}()