fix: do not override collation on pg 15.8 (#3579)

Author: sweatybridge

internal/db/start/start.go

@@ -24,6 +24,7 @@ import (
 	"github.com/supabase/cli/internal/status"
 	"github.com/supabase/cli/internal/utils"
 	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/pkg/config"
 	"github.com/supabase/cli/pkg/migration"
 	"github.com/supabase/cli/pkg/vault"
 )
@@ -75,7 +76,7 @@ func NewContainerConfig() container.Config {
 			"S3_ACCESS_KEY="+utils.Config.Experimental.S3AccessKey,
 			"S3_SECRET_KEY="+utils.Config.Experimental.S3SecretKey,
 		)
-	} else {
+	} else if config.VersionCompare(utils.Config.Db.Image, "15.8.1.005") < 0 {
 		env = append(env, "POSTGRES_INITDB_ARGS=--lc-collate=C.UTF-8")
 	}
 	config := container.Config{

pkg/config/config.go

@@ -607,9 +607,8 @@ func (c *config) Load(path string, fsys fs.FS) error {
 	if c.Db.MajorVersion > 14 {
 		if version, err := fs.ReadFile(fsys, builder.PostgresVersionPath); err == nil {
 			// Only replace image if postgres version is above 15.1.0.55
-			if strings.HasPrefix(string(version), fmt.Sprintf("%d.", c.Db.MajorVersion)) &&
-				(c.Db.MajorVersion != 15 || semver.Compare(string(version[3:]), "1.0.55") >= 0) {
-				c.Db.Image = replaceImageTag(pg15, string(version))
+			if VersionCompare(c.Db.Image, "15.1.0.55") >= 0 {
+				c.Db.Image = replaceImageTag(Images.Pg, string(version))
 			}
 		}
 		if version, err := fs.ReadFile(fsys, builder.RestVersionPath); err == nil && len(version) > 0 {
@@ -647,6 +646,22 @@ func (c *config) Load(path string, fsys fs.FS) error {
 	return c.Validate(fsys)
 }
 
+func VersionCompare(a, b string) int {
+	var pA, pB string
+	if vA := strings.Split(a, "."); len(vA) > 3 {
+		a = strings.Join(vA[:3], ".")
+		pA = strings.Join(vA[3:], ".")
+	}
+	if vB := strings.Split(b, "."); len(vB) > 3 {
+		b = strings.Join(vB[:3], ".")
+		pB = strings.Join(vB[3:], ".")
+	}
+	if r := semver.Compare("v"+a, "v"+b); r != 0 {
+		return r
+	}
+	return semver.Compare("v"+pA, "v"+pB)
+}
+
 func (c *baseConfig) resolve(builder pathBuilder, fsys fs.FS) error {
 	// Update content paths
 	for name, tmpl := range c.Auth.Email.Template {

pkg/config/config_test.go

@@ -615,3 +615,28 @@ func TestLoadEnvIfExists(t *testing.T) {
 		os.Unsetenv("ANOTHER_KEY")
 	})
 }
+
+func TestVersionCompare(t *testing.T) {
+	var testcase = []struct {
+		a string
+		b string
+		r int
+	}{
+		{"15.1.0.55", "15.1.0.55", 0},
+		{"15.8.1.085", "15.1.0.55", 1},
+		{"15.1.0.55", "15.8.1.085", -1},
+		{"15.8.1", "15.8.1", 0},
+		{"17", "15.8", 1},
+		{"14", "15.8", -1},
+		{"oriole-17", "oriole-17", 0},
+		{"17", "oriole-17", 1},
+		{"oriole-17", "17", -1},
+	}
+
+	for _, tt := range testcase {
+		t.Run(fmt.Sprintf("%s vs %s", tt.a, tt.b), func(t *testing.T) {
+			result := VersionCompare(tt.a, tt.b)
+			assert.Equal(t, tt.r, result)
+		})
+	}
+}