Skip to content

Commit 463db23

Browse files
committed
refactor: Small refactor
1 parent 83241bf commit 463db23

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

internal/controller/postgresql/postgres/database.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ AND n.nspname = '%s';`
3434
DuplicateDatabaseErrorCode = "42P04"
3535
)
3636

37-
type TableOwnership struct {
38-
TableName string
39-
Owner string
40-
}
41-
42-
type TypeOwnership struct {
43-
TypeName string
44-
Owner string
45-
}
46-
4737
func (c *pg) IsDatabaseExist(dbname string) (bool, error) {
4838
err := c.connect(c.defaultDatabase)
4939
if err != nil {

internal/controller/postgresql/postgres/postgres.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ type SetRoleOnDatabaseRoleSetting struct {
1515
Database string
1616
}
1717

18+
type TableOwnership struct {
19+
TableName string
20+
Owner string
21+
}
22+
23+
type TypeOwnership struct {
24+
TypeName string
25+
Owner string
26+
}
27+
1828
type PG interface { //nolint:interfacebloat // This is needed
1929
CreateDB(dbname, username string) error
2030
ChangeDBOwner(dbname, owner string) error

internal/controller/postgresql/postgresqldatabase_controller.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,12 @@ func (r *PostgresqlDatabaseReconciler) manageDropDatabase(
311311

312312
// Drop roles first
313313

314+
// Init variable
315+
var exists bool
316+
314317
// Drop owner
315318
if instance.Status.Roles.Owner != "" {
316-
exists, err := pg.IsRoleExist(instance.Status.Roles.Owner)
319+
exists, err = pg.IsRoleExist(instance.Status.Roles.Owner)
317320
// Check error
318321
if err != nil {
319322
return err
@@ -331,7 +334,7 @@ func (r *PostgresqlDatabaseReconciler) manageDropDatabase(
331334
}
332335
// Drop writer
333336
if instance.Status.Roles.Writer != "" {
334-
exists, err := pg.IsRoleExist(instance.Status.Roles.Writer)
337+
exists, err = pg.IsRoleExist(instance.Status.Roles.Writer)
335338
// Check error
336339
if err != nil {
337340
return err
@@ -349,7 +352,7 @@ func (r *PostgresqlDatabaseReconciler) manageDropDatabase(
349352
}
350353
// Drop reader
351354
if instance.Status.Roles.Reader != "" {
352-
exists, err := pg.IsRoleExist(instance.Status.Roles.Reader)
355+
exists, err = pg.IsRoleExist(instance.Status.Roles.Reader)
353356
// Check error
354357
if err != nil {
355358
return err

0 commit comments

Comments
 (0)