Skip to content

Commit a1bd7a3

Browse files
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent ba16e56 commit a1bd7a3

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

sql/iters/rel_iters.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ func (ui *UnionIter) Next(ctx *sql.Context) (sql.Row, error) {
626626
return nil, err
627627
}
628628
}
629-
629+
630630
// Convert BIT values to Int64 when schema generalization changed types for server engine compatibility
631631
if ui.ResultSchema != nil {
632632
for i, val := range res {
@@ -637,7 +637,7 @@ func (ui *UnionIter) Next(ctx *sql.Context) (sql.Row, error) {
637637
}
638638
}
639639
}
640-
640+
641641
return res, err
642642
}
643643

sql/types/bit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (t BitType_) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.Va
193193
if v == nil {
194194
return sqltypes.NULL, nil
195195
}
196-
196+
197197
// Delegate int64 values to Int64.SQL to prevent server engine []uint8 serialization errors
198198
if int64Val, ok := v.(int64); ok {
199199
return Int64.SQL(ctx, dest, int64Val)

sql/types/conversion.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {
641641
if (IsBit(a) || IsBit(b)) && (IsBit(a) && IsBit(b) || IsNullType(a) || IsNullType(b)) {
642642
return Int64
643643
}
644-
644+
645645
if reflect.DeepEqual(a, b) {
646646
return a
647647
}
@@ -698,7 +698,6 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {
698698
return LongBlob
699699
}
700700

701-
702701
aIsYear := IsYear(a)
703702
bIsYear := IsYear(b)
704703
if aIsYear && bIsYear {

0 commit comments

Comments
 (0)