chore: misc cleanup (#261)

Author: bplunkett-stripe

cmd/pg-schema-diff/datastructs.go

@@ -2,9 +2,6 @@ package main
 
 import (
 	"fmt"
-	"sort"
-
-	"github.com/stripe/pg-schema-diff/internal/util"
 )
 
 func mustGetAndDeleteKey(m map[string]string, key string) (string, error) {
@@ -15,9 +12,3 @@ func mustGetAndDeleteKey(m map[string]string, key string) (string, error) {
 	delete(m, key)
 	return val, nil
 }
-
-func keys(m map[string]string) []string {
-	vals := util.Keys(m)
-	sort.Strings(vals)
-	return vals
-}

cmd/pg-schema-diff/plan_cmd.go

@@ -6,7 +6,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -382,7 +384,7 @@ func parseTimeoutModifier(val string) (timeoutModifier, error) {
 	}
 
 	if len(fm) > 0 {
-		return timeoutModifier{}, fmt.Errorf("unknown keys %s", keys(fm))
+		return timeoutModifier{}, fmt.Errorf("unknown keys %s", slices.Sorted(maps.Keys(fm)))
 	}
 
 	duration, err := time.ParseDuration(timeoutStr)
@@ -428,7 +430,7 @@ func parseInsertStatementStr(val string) (insertStatement, error) {
 	}
 
 	if len(fm) > 0 {
-		return insertStatement{}, fmt.Errorf("unknown keys %s", keys(fm))
+		return insertStatement{}, fmt.Errorf("unknown keys %s", slices.Sorted(maps.Keys(fm)))
 	}
 
 	index, err := strconv.Atoi(indexStr)

internal/util/map.go

@@ -3,12 +3,12 @@ package diff
 import (
 	"errors"
 	"fmt"
-	"sort"
+	"maps"
+	"slices"
 	"strings"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/stripe/pg-schema-diff/internal/schema"
-	"github.com/stripe/pg-schema-diff/internal/util"
 )
 
 type materializedViewDiff struct {
@@ -45,7 +45,9 @@ func buildMaterializedViewDiff(
 		// It's possible a dependent column was deleted (or recreated).
 		td, ok := tableDiffsByName[t.GetName()]
 		if !ok {
-			return materializedViewDiff{}, false, fmt.Errorf("processing materialized view table dependencies: expected a table diff to exist for %q. have=\n%s", t.GetName(), util.Keys(tableDiffsByName))
+			return materializedViewDiff{}, false, fmt.Errorf("processing materialized view table dependencies: expected a table diff to exist for %q. have=\n%s", t.GetName(),
+				slices.Sorted(maps.Keys(tableDiffsByName)),
+			)
 		}
 		deletedColumnsByName := buildSchemaObjByNameMap(td.columnsDiff.deletes)
 		for _, c := range t.Columns {
@@ -85,8 +87,7 @@ func (mvsg *materializedViewSQLGenerator) Add(mv schema.MaterializedView) (parti
 		}
 		// Sort kvs so the generated DDL is deterministic. This is unnecessarily verbose because the slices
 		// package is not yet available.
-		// // TODO(https://github.com/stripe/pg-schema-diff/issues/227) - Remove this
-		sort.Strings(kvs)
+		slices.Sort(kvs)
 		materializedViewSb.WriteString(fmt.Sprintf(" WITH (%s)", strings.Join(kvs, ", ")))
 	}
 	if len(mv.Tablespace) > 0 {

internal/util/map_test.go

@@ -3,12 +3,12 @@ package diff
 import (
 	"errors"
 	"fmt"
-	"sort"
+	"maps"
+	"slices"
 	"strings"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/stripe/pg-schema-diff/internal/schema"
-	"github.com/stripe/pg-schema-diff/internal/util"
 )
 
 type viewDiff struct {
@@ -45,7 +45,7 @@ func buildViewDiff(
 		// It's possible a dependent column was deleted (or recreated).
 		td, ok := tableDiffsByName[t.GetName()]
 		if !ok {
-			return viewDiff{}, false, fmt.Errorf("processing view table dependencies: expected a table diff to exist for %q. have=\n%s", t.GetName(), util.Keys(tableDiffsByName))
+			return viewDiff{}, false, fmt.Errorf("processing view table dependencies: expected a table diff to exist for %q. have=\n%s", t.GetName(), slices.Sorted(maps.Keys(tableDiffsByName)))
 		}
 		deletedColumnsByName := buildSchemaObjByNameMap(td.columnsDiff.deletes)
 		for _, c := range t.Columns {
@@ -85,8 +85,7 @@ func (vsg *viewSQLGenerator) Add(v schema.View) (partialSQLGraph, error) {
 		}
 		// Sort kvs so the generated DDL is deterministic. This is unnecessarily verbose because the slices
 		// package is not yet available.
-		// // TODO(https://github.com/stripe/pg-schema-diff/issues/227) - Remove this
-		sort.Strings(kvs)
+		slices.Sort(kvs)
 		viewSb.WriteString(fmt.Sprintf(" WITH (%s)", strings.Join(kvs, ", ")))
 	}
 	viewSb.WriteString(" AS\n")