fix: correct database close calls

Author: anbraten

controllers/database_controller.go

@@ -57,6 +57,8 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		return ctrl.Result{}, err
 	}
 
+	defer db.Close()
+
 	log.Info("Connected to database server")
 
 	hasDatabase, err := db.HasDatabase(database.Spec.Database)
@@ -87,11 +89,6 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		}
 	}
 
-	err = db.Close()
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-
 	log.Info("Created database and user with full access to it")
 
 	// Check if the Database instance is marked to be deleted, which is
@@ -171,6 +168,8 @@ func (r *DatabaseReconciler) finalizeDatabase(log logr.Logger, database *anbrate
 		return err
 	}
 
+	defer db.Close()
+
 	hasDatabaseUserWithAccess, err := db.HasDatabaseUserWithAccess(database.Spec.Username, database.Spec.Database)
 	if err != nil {
 		return err
@@ -204,11 +203,6 @@ func (r *DatabaseReconciler) finalizeDatabase(log logr.Logger, database *anbrate
 		return err
 	}
 
-	err = db.Close()
-	if err != nil {
-		return err
-	}
-
 	log.Info("Database: '" + database.Spec.Database + "' and user: '" + database.Spec.Username + "' removed")
 	return nil
 }