Bug fixes

Author: zachmu

sql/types/conversion.go

@@ -721,7 +721,7 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {
 		return generalizeNumberTypes(a, b)
 	}
 
-	if IsText(a) || IsText(b) {
+	if IsText(a) && IsText(b) {
 		return a
 	}
 

sql/types/conversion_test.go

@@ -198,15 +198,17 @@ func TestGeneralizeTypes(t *testing.T) {
 		{Int8, Int8, Int8},
 		{Boolean, Int64, Int64},
 		{Boolean, Boolean, Boolean},
-		{Text, Text, LongText},
+		{Text, Text, Text},
+		{Text, LongText, Text},
 		{Text, Float64, LongText},
 		{Int64, Text, LongText},
 		{Int8, Null, Int8},
 		{Time, Time, Time},
 		{Time, Date, DatetimeMaxPrecision},
 		{Date, Date, Date},
 		{Date, Timestamp, DatetimeMaxPrecision},
-		{Timestamp, Timestamp, TimestampMaxPrecision},
+		{Timestamp, Timestamp, Timestamp},
+		{Timestamp, TimestampMaxPrecision, TimestampMaxPrecision},
 		{Timestamp, Datetime, DatetimeMaxPrecision},
 		{Null, Int64, Int64},
 		{Null, Null, Null},