Skip to content

Enum ordering minor code tidy up #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2023
Merged

Enum ordering minor code tidy up #2126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions internal/sql/catalog/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,30 +211,31 @@ 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 {
insertIndex = i + 1
} 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
Expand Down