fix(postgresqldatabase): Avoid alters on tables & types when owner is already the right one

Author: oxyno-zeta

internal/controller/postgresql/postgres/database.go

@@ -21,11 +21,11 @@ const (
 	GrantUsageSchemaSQLTemplate    = `GRANT USAGE ON SCHEMA "%s" TO "%s"`
 	GrantAllTablesSQLTemplate      = `GRANT %s ON ALL TABLES IN SCHEMA "%s" TO "%s"`
 	DefaultPrivsSchemaSQLTemplate  = `ALTER DEFAULT PRIVILEGES FOR ROLE "%s" IN SCHEMA "%s" GRANT %s ON TABLES TO "%s"`
-	GetTablesFromSchemaSQLTemplate = `SELECT table_name FROM information_schema.tables WHERE table_schema = '%s'`
+	GetTablesFromSchemaSQLTemplate = `SELECT tablename,tableowner FROM pg_tables WHERE schemaname = '%s'`
 	ChangeTableOwnerSQLTemplate    = `ALTER TABLE IF EXISTS "%s" OWNER TO "%s"`
 	ChangeTypeOwnerSQLTemplate     = `ALTER TYPE "%s"."%s" OWNER TO "%s"`
 	// Got and edited from : https://stackoverflow.com/questions/3660787/how-to-list-custom-types-using-postgres-information-schema
-	GetTypesFromSchemaSQLTemplate = `SELECT      t.typname as type
+	GetTypesFromSchemaSQLTemplate = `SELECT      t.typname as type, pg_catalog.pg_get_userbyid(t.typowner) as owner
 FROM        pg_type t
 LEFT JOIN   pg_catalog.pg_namespace n ON n.oid = t.typnamespace
 WHERE       (t.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid))
@@ -34,6 +34,16 @@ AND     n.nspname = '%s';`
 	DuplicateDatabaseErrorCode = "42P04"
 )
 
+type TableOwnership struct {
+	TableName string
+	Owner     string
+}
+
+type TypeOwnership struct {
+	TypeName string
+	Owner    string
+}
+
 func (c *pg) IsDatabaseExist(dbname string) (bool, error) {
 	err := c.connect(c.defaultDatabase)
 	if err != nil {
@@ -114,7 +124,7 @@ func (c *pg) CreateSchema(db, role, schema string) error {
 	return nil
 }
 
-func (c *pg) GetTablesInSchema(db, schema string) ([]string, error) {
+func (c *pg) GetTablesInSchema(db, schema string) ([]*TableOwnership, error) {
 	err := c.connect(db)
 	if err != nil {
 		return nil, err
@@ -127,18 +137,18 @@ func (c *pg) GetTablesInSchema(db, schema string) ([]string, error) {
 
 	defer rows.Close()
 
-	res := []string{}
+	res := []*TableOwnership{}
 
 	for rows.Next() {
-		tableName := ""
+		it := &TableOwnership{}
 		// Scan
-		err = rows.Scan(&tableName)
+		err = rows.Scan(&it.TableName, &it.Owner)
 		// Check error
 		if err != nil {
 			return nil, err
 		}
 		// Save
-		res = append(res, tableName)
+		res = append(res, it)
 	}
 
 	// Rows error
@@ -165,7 +175,7 @@ func (c *pg) ChangeTableOwner(db, table, owner string) error {
 	return nil
 }
 
-func (c *pg) GetTypesInSchema(db, schema string) ([]string, error) {
+func (c *pg) GetTypesInSchema(db, schema string) ([]*TypeOwnership, error) {
 	err := c.connect(db)
 	if err != nil {
 		return nil, err
@@ -178,18 +188,18 @@ func (c *pg) GetTypesInSchema(db, schema string) ([]string, error) {
 
 	defer rows.Close()
 
-	res := []string{}
+	res := []*TypeOwnership{}
 
 	for rows.Next() {
-		typeName := ""
+		it := &TypeOwnership{}
 		// Scan
-		err = rows.Scan(&typeName)
+		err = rows.Scan(&it.TypeName, &it.Owner)
 		// Check error
 		if err != nil {
 			return nil, err
 		}
 		// Save
-		res = append(res, typeName)
+		res = append(res, it)
 	}
 
 	// Rows error

internal/controller/postgresql/postgres/postgres.go

@@ -44,9 +44,9 @@ type PG interface { //nolint:interfacebloat // This is needed
 	DropSchema(database, schema string, cascade bool) error
 	DropExtension(database, extension string, cascade bool) error
 	GetRoleMembership(role string) ([]string, error)
-	GetTablesInSchema(db, schema string) ([]string, error)
+	GetTablesInSchema(db, schema string) ([]*TableOwnership, error)
 	ChangeTableOwner(db, table, owner string) error
-	GetTypesInSchema(db, schema string) ([]string, error)
+	GetTypesInSchema(db, schema string) ([]*TypeOwnership, error)
 	ChangeTypeOwnerInSchema(db, schema, typeName, owner string) error
 	DropPublication(dbname, name string) error
 	RenamePublication(dbname, oldname, newname string) error

internal/controller/postgresql/postgresqldatabase_controller.go

@@ -512,32 +512,38 @@ func (*PostgresqlDatabaseReconciler) manageSchemas(pg postgres.PG, instance *pos
 		}
 
 		// Get list of tables inside schema
-		tableNames, err := pg.GetTablesInSchema(instance.Spec.Database, schema)
+		tableOwnerships, err := pg.GetTablesInSchema(instance.Spec.Database, schema)
 		if err != nil {
 			return err
 		}
 
 		// Loop over all tables to force owner
-		for _, tableName := range tableNames {
-			// Force table owner
-			err = pg.ChangeTableOwner(instance.Spec.Database, tableName, owner)
-			if err != nil {
-				return err
+		for _, tableOwnershipItem := range tableOwnerships {
+			// Check if it is needed to patch owner
+			if tableOwnershipItem.Owner != owner {
+				// Force table owner
+				err = pg.ChangeTableOwner(instance.Spec.Database, tableOwnershipItem.TableName, owner)
+				if err != nil {
+					return err
+				}
 			}
 		}
 
-		// Get list of types inside schema
-		types, err := pg.GetTypesInSchema(instance.Spec.Database, schema)
+		// Get list of typeOwnerships inside schema
+		typeOwnerships, err := pg.GetTypesInSchema(instance.Spec.Database, schema)
 		if err != nil {
 			return err
 		}
 
 		// Loop over all types to force owner
-		for _, typeName := range types {
-			// Force table owner
-			err = pg.ChangeTypeOwnerInSchema(instance.Spec.Database, schema, typeName, owner)
-			if err != nil {
-				return err
+		for _, typeOwnershipItem := range typeOwnerships {
+			// Check if it is needed to patch owner
+			if typeOwnershipItem.Owner != owner {
+				// Force table owner
+				err = pg.ChangeTypeOwnerInSchema(instance.Spec.Database, schema, typeOwnershipItem.TypeName, owner)
+				if err != nil {
+					return err
+				}
 			}
 		}