From 800ea2bbab77b2e18ffc980efa4f06d92ed174e2 Mon Sep 17 00:00:00 2001
From: mikemherron <15673068+mikemherron@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:51:41 +0000
Subject: [PATCH] Minor code tidy up

---
 internal/sql/catalog/types.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/internal/sql/catalog/types.go b/internal/sql/catalog/types.go
index 9f1b7f54d7..186b8d1f01 100644
--- a/internal/sql/catalog/types.go
+++ b/internal/sql/catalog/types.go
@@ -211,8 +211,9 @@ func (c *Catalog) alterTypeAddValue(stmt *ast.AlterTypeAddValueStmt) error {
 		}
 	}
 
+	insertIndex := len(enum.Vals)
 	if stmt.NewValHasNeighbor {
-		insertIndex := -1
+		foundNeighbor := false
 		for i, val := range enum.Vals {
 			if val == *stmt.NewValNeighbor {
 				if stmt.NewValIsAfter {
@@ -220,21 +221,21 @@ func (c *Catalog) alterTypeAddValue(stmt *ast.AlterTypeAddValueStmt) error {
 				} else {
 					insertIndex = i
 				}
+				foundNeighbor = true
+				break
 			}
 		}
 
-		if insertIndex == -1 {
+		if !foundNeighbor {
 			return fmt.Errorf("enum %s unable to find existing neighbor value %s for new value %s", enum.Name, *stmt.NewValNeighbor, *stmt.NewValue)
 		}
+	}
 
-		if insertIndex == len(enum.Vals) {
-			enum.Vals = append(enum.Vals, *stmt.NewValue)
-		} else {
-			enum.Vals = append(enum.Vals[:insertIndex+1], enum.Vals[insertIndex:]...)
-			enum.Vals[insertIndex] = *stmt.NewValue
-		}
-	} else {
+	if insertIndex == len(enum.Vals) {
 		enum.Vals = append(enum.Vals, *stmt.NewValue)
+	} else {
+		enum.Vals = append(enum.Vals[:insertIndex+1], enum.Vals[insertIndex:]...)
+		enum.Vals[insertIndex] = *stmt.NewValue
 	}
 
 	return nil