Remove duplicate database code in provider logic

Author: pcallewaert

pkg/postgres/aws.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	"github.com/lib/pq"
 )
 
 const (
@@ -29,20 +28,21 @@ const (
 )
 
 func (c *pg) CreateDB(dbname, role string) error {
-	_, err := c.db.Exec(fmt.Sprintf(CREATE_DB, dbname))
+	// Create database
+	err := c.execute(fmt.Sprintf(CREATE_DB, dbname))
 	if err != nil {
 		// eat DUPLICATE DATABASE ERROR
-		if err.(*pq.Error).Code != "42P04" {
+		if !isPgError(err, "42P04") {
 			return err
 		}
 	}
 
-	_, err = c.db.Exec(fmt.Sprintf(ALTER_DB_OWNER, dbname, role))
+	err = c.execute(fmt.Sprintf(ALTER_DB_OWNER, dbname, role))
 	if err != nil {
 		return err
 	}
 
-	_, err = c.db.Exec(fmt.Sprintf(GRANT_CREATE_SCHEMA, dbname, role))
+	err = c.execute(fmt.Sprintf(GRANT_CREATE_SCHEMA, dbname, role))
 	if err != nil {
 		return err
 	}
@@ -54,8 +54,7 @@ func (c *pg) AlterDatabaseOwner(dbname, owner string) error {
 	if owner == "" {
 		return nil
 	}
-	_, err := c.db.Exec(fmt.Sprintf(ALTER_DB_OWNER, dbname, owner))
-	return err
+	return c.execute(fmt.Sprintf(ALTER_DB_OWNER, dbname, owner))
 }
 
 func (c *pg) ReassignDatabaseOwner(dbName, currentOwner, newOwner string, logger logr.Logger) error {
@@ -71,7 +70,7 @@ func (c *pg) ReassignDatabaseOwner(dbName, currentOwner, newOwner string, logger
 
 	_, err = tmpDb.Exec(fmt.Sprintf(REASSIGN_DB_OWNER, currentOwner, newOwner))
 	if err != nil {
-		if pqErr, ok := err.(*pq.Error); ok && pqErr.Code == "42704" {
+		if isPgError(err, "42704") {
 			return nil
 		}
 		return err
@@ -94,20 +93,20 @@ func (c *pg) CreateSchema(db, role, schema string, logger logr.Logger) error {
 }
 
 func (c *pg) DropDatabase(database string, logger logr.Logger) error {
-	_, err := c.db.Exec(fmt.Sprintf(REVOKE_CONNECT, database))
+	err := c.execute(fmt.Sprintf(REVOKE_CONNECT, database))
 	// Error code 3D000 is returned if database doesn't exist
-	if err != nil && err.(*pq.Error).Code != "3D000" {
+	if err != nil && !isPgError(err, "3D000") {
 		return err
 	}
 
-	_, err = c.db.Exec(fmt.Sprintf(TERMINATE_BACKEND, database))
+	err = c.execute(fmt.Sprintf(TERMINATE_BACKEND, database))
 	// Error code 3D000 is returned if database doesn't exist
-	if err != nil && err.(*pq.Error).Code != "3D000" {
+	if err != nil && !isPgError(err, "3D000") {
 		return err
 	}
-	_, err = c.db.Exec(fmt.Sprintf(DROP_DATABASE, database))
+	err = c.execute(fmt.Sprintf(DROP_DATABASE, database))
 	// Error code 3D000 is returned if database doesn't exist
-	if err != nil && err.(*pq.Error).Code != "3D000" {
+	if err != nil && !isPgError(err, "3D000") {
 		return err
 	}