new dolt, compile fixes

zachmu · zachmu · commit dd82e8a54ed6 · 2025-12-10T16:50:36.000-08:00
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a
 	github.com/cockroachdb/errors v1.7.5
-	github.com/dolthub/dolt/go v0.40.5-0.20251211002023-28b37aa37e84
+	github.com/dolthub/dolt/go v0.40.5-0.20251211004303-606a4434653b
 	github.com/dolthub/eventsapi_schema v0.0.0-20250915094920-eadfd39051ca
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
 	github.com/dolthub/go-mysql-server v0.20.1-0.20251211001450-ea86f3a9282a
diff --git a/go.sum b/go.sum
@@ -228,8 +228,8 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I
 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo=
 github.com/dolthub/dolt-mcp v0.2.2 h1:bpROmam74n95uU4EA3BpOIVlTDT0pzeFMBwe/YRq2mI=
 github.com/dolthub/dolt-mcp v0.2.2/go.mod h1:S++DJ4QWTAXq+0TNzFa7Oq3IhoT456DJHwAINFAHgDQ=
-github.com/dolthub/dolt/go v0.40.5-0.20251211002023-28b37aa37e84 h1:3On+b1AHWmcOK/I8nkXWmxYuC7JpsTjK+RNltsPf+4I=
-github.com/dolthub/dolt/go v0.40.5-0.20251211002023-28b37aa37e84/go.mod h1:0rnFMeZ2VzCtGpQrt8xH1a82mlzbx0EEfqSFUofp8E8=
+github.com/dolthub/dolt/go v0.40.5-0.20251211004303-606a4434653b h1:fjlTkQKA8QJ0wKLSoiWTppRDfRYAYUOC0mz2jdLvWo4=
+github.com/dolthub/dolt/go v0.40.5-0.20251211004303-606a4434653b/go.mod h1:0rnFMeZ2VzCtGpQrt8xH1a82mlzbx0EEfqSFUofp8E8=
 github.com/dolthub/eventsapi_schema v0.0.0-20250915094920-eadfd39051ca h1:BGFz/0OlKIuC6qHIZQbvPapFvdAJkeEyGXWVgL5clmE=
 github.com/dolthub/eventsapi_schema v0.0.0-20250915094920-eadfd39051ca/go.mod h1:CoDLfgPqHyBtth0Cp+fi/CmC4R81zJNX4wPjShdZ+Bw=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
diff --git a/server/types/type.go b/server/types/type.go
@@ -328,7 +328,7 @@ func (t *DoltgresType) Convert(ctx context.Context, v interface{}) (interface{},
 	case "bpchar", "char", "json", "name", "text", "unknown", "varchar":
 		_, ok, err := sql.Unwrap[string](ctx, v)
 		if err != nil {
-			return nil, sql.OutOfRange, err
+			return nil, sql.InRange, err
 		}
 		if ok {
 			return v, sql.InRange, nil
@@ -380,7 +380,7 @@ func (t *DoltgresType) Convert(ctx context.Context, v interface{}) (interface{},
 	default:
 		return v, sql.InRange, nil
 	}
-	return nil, sql.OutOfRange, ErrUnhandledType.New(t.String(), v)
+	return nil, sql.InRange, ErrUnhandledType.New(t.String(), v)
 }
 
 // GetImplicitCast is a reference to the implicit cast logic in the functions/framework package, which we can't use
@@ -399,7 +399,7 @@ var GetExplicitCast func(fromType *DoltgresType, toType *DoltgresType) TypeCastF
 func (t *DoltgresType) ConvertToType(ctx *sql.Context, typ sql.ExtendedType, val any) (any, sql.ConvertInRange, error) {
 	dt, ok := typ.(*DoltgresType)
 	if !ok {
-		return nil, sql.OutOfRange, errors.Errorf("expected DoltgresType, got %T", typ)
+		return nil, sql.InRange, errors.Errorf("expected DoltgresType, got %T", typ)
 	}
 
 	castFn := GetAssignmentCast(dt, t)
@@ -412,24 +412,24 @@ func (t *DoltgresType) ConvertToType(ctx *sql.Context, typ sql.ExtendedType, val
 		if dt.ID.TypeName() == "unknown" {
 			strVal, ok, err := sql.Unwrap[string](ctx, val)
 			if err != nil {
-				return nil, sql.OutOfRange, err
+				return nil, sql.InRange, err
 			}
 			if ok {
 				converted, err := t.IoInput(ctx, strVal)
 				if err != nil {
-					return nil, sql.OutOfRange, err
+					return nil, sql.InRange, err
 				}
 				return converted, sql.InRange, nil
 			}
 		}
-		return nil, sql.OutOfRange, errors.Errorf("no assignment cast from %s to %s", dt.Name(), t.Name())
+		return nil, sql.InRange, errors.Errorf("no assignment cast from %s to %s", dt.Name(), t.Name())
 	}
 
 	castResult, err := castFn(ctx, val, t)
 	if err != nil && errors.Is(err, ErrCastOutOfRange) {
-		return castResult, sql.OutOfRange, nil
+		return castResult, sql.InRange, nil
 	} else if err != nil {
-		return nil, sql.OutOfRange, err
+		return nil, sql.InRange, err
 	}
 
 	return castResult, sql.InRange, nil

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ func (t *DoltgresType) Convert(ctx context.Context, v interface{}) (interface{},`
`328`	`328`	`case "bpchar", "char", "json", "name", "text", "unknown", "varchar":`
`329`	`329`	`_, ok, err := sql.Unwrap[string](ctx, v)`
`330`	`330`	`if err != nil {`
`331`		`- return nil, sql.OutOfRange, err`
	`331`	`+ return nil, sql.InRange, err`
`332`	`332`	`}`
`333`	`333`	`if ok {`
`334`	`334`	`return v, sql.InRange, nil`
`@@ -380,7 +380,7 @@ func (t *DoltgresType) Convert(ctx context.Context, v interface{}) (interface{},`
`380`	`380`	`default:`
`381`	`381`	`return v, sql.InRange, nil`
`382`	`382`	`}`
`383`		`- return nil, sql.OutOfRange, ErrUnhandledType.New(t.String(), v)`
	`383`	`+ return nil, sql.InRange, ErrUnhandledType.New(t.String(), v)`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`// GetImplicitCast is a reference to the implicit cast logic in the functions/framework package, which we can't use`
`@@ -399,7 +399,7 @@ var GetExplicitCast func(fromType DoltgresType, toType DoltgresType) TypeCastF`
`399`	`399`	`func (t DoltgresType) ConvertToType(ctx sql.Context, typ sql.ExtendedType, val any) (any, sql.ConvertInRange, error) {`
`400`	`400`	`dt, ok := typ.(*DoltgresType)`
`401`	`401`	`if !ok {`
`402`		`- return nil, sql.OutOfRange, errors.Errorf("expected DoltgresType, got %T", typ)`
	`402`	`+ return nil, sql.InRange, errors.Errorf("expected DoltgresType, got %T", typ)`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`castFn := GetAssignmentCast(dt, t)`
`@@ -412,24 +412,24 @@ func (t DoltgresType) ConvertToType(ctx sql.Context, typ sql.ExtendedType, val`
`412`	`412`	`if dt.ID.TypeName() == "unknown" {`
`413`	`413`	`strVal, ok, err := sql.Unwrap[string](ctx, val)`
`414`	`414`	`if err != nil {`
`415`		`- return nil, sql.OutOfRange, err`
	`415`	`+ return nil, sql.InRange, err`
`416`	`416`	`}`
`417`	`417`	`if ok {`
`418`	`418`	`converted, err := t.IoInput(ctx, strVal)`
`419`	`419`	`if err != nil {`
`420`		`- return nil, sql.OutOfRange, err`
	`420`	`+ return nil, sql.InRange, err`
`421`	`421`	`}`
`422`	`422`	`return converted, sql.InRange, nil`
`423`	`423`	`}`
`424`	`424`	`}`
`425`		`- return nil, sql.OutOfRange, errors.Errorf("no assignment cast from %s to %s", dt.Name(), t.Name())`
	`425`	`+ return nil, sql.InRange, errors.Errorf("no assignment cast from %s to %s", dt.Name(), t.Name())`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`castResult, err := castFn(ctx, val, t)`
`429`	`429`	`if err != nil && errors.Is(err, ErrCastOutOfRange) {`
`430`		`- return castResult, sql.OutOfRange, nil`
	`430`	`+ return castResult, sql.InRange, nil`
`431`	`431`	`} else if err != nil {`
`432`		`- return nil, sql.OutOfRange, err`
	`432`	`+ return nil, sql.InRange, err`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`return castResult, sql.InRange, nil`