Merge branch 'zachmu/project-iters' of github.com:dolthub/go-mysql-server into zachmu/project-iters

zachmu · zachmu · commit 8f234645783e · 2025-07-02T15:30:17.000-07:00
diff --git a/sql/types/conversion.go b/sql/types/conversion.go
@@ -716,7 +716,7 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {
 	if IsNumber(a) && IsNumber(b) {
 		return generalizeNumberTypes(a, b)
 	}
-	
+
 	if IsText(a) && IsText(b) {
 		sta := a.(sql.StringType)
 		stb := b.(sql.StringType)

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {`
`716`	`716`	`if IsNumber(a) && IsNumber(b) {`
`717`	`717`	`return generalizeNumberTypes(a, b)`
`718`	`718`	`}`
`719`		`-`
	`719`	`+`
`720`	`720`	`if IsText(a) && IsText(b) {`
`721`	`721`	`sta := a.(sql.StringType)`
`722`	`722`	`stb := b.(sql.StringType)`