Skip to content

Commit e02b809

Browse files
elonnzhangelonnzhangmethane
authored
ColumnTypeScanType() returns sql.Null[uint64] for bigint unsigned (#1612)
Co-authored-by: elonnzhang <[email protected]> Co-authored-by: Inada Naoki <[email protected]>
1 parent c786d41 commit e02b809

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Diff for: AUTHORS

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Alex Snast <alexsn at fb.com>
1818
Alexey Palazhchenko <alexey.palazhchenko at gmail.com>
1919
Andrew Reid <andrew.reid at tixtrack.com>
2020
Animesh Ray <mail.rayanimesh at gmail.com>
21-
Arne Hormann <arnehormann at gmail.com>
2221
Ariel Mashraki <ariel at mashraki.co.il>
22+
Arne Hormann <arnehormann at gmail.com>
2323
Artur Melanchyk <[email protected]>
2424
Asta Xie <xiemengjun at gmail.com>
2525
B Lamarche <blam413 at gmail.com>
@@ -65,6 +65,7 @@ Jeff Hodges <jeff at somethingsimilar.com>
6565
Jeffrey Charles <jeffreycharles at gmail.com>
6666
Jennifer Purevsuren <jennifer at dolthub.com>
6767
Jerome Meyer <jxmeyer at gmail.com>
68+
Jiabin Zhang <jiabin.z at qq.com>
6869
Jiajia Zhong <zhong2plus at gmail.com>
6970
Jian Zhen <zhenjl at gmail.com>
7071
Joe Mann <contact at joemann.co.uk>
@@ -84,10 +85,11 @@ Linh Tran Tuan <linhduonggnu at gmail.com>
8485
Lion Yang <lion at aosc.xyz>
8586
Luca Looz <luca.looz92 at gmail.com>
8687
Lucas Liu <extrafliu at gmail.com>
87-
Lunny Xiao <xiaolunwen at gmail.com>
8888
Luke Scott <luke at webconnex.com>
89+
Lunny Xiao <xiaolunwen at gmail.com>
8990
Maciej Zimnoch <maciej.zimnoch at codilime.com>
9091
Michael Woolnough <michael.woolnough at gmail.com>
92+
Minh Quang <minhquang4334 at gmail.com>
9193
Nao Yokotsuka <yokotukanao at gmail.com>
9294
Nathanial Murphy <nathanial.murphy at gmail.com>
9395
Nicola Peduzzi <thenikso at gmail.com>
@@ -98,7 +100,6 @@ Paul Bonser <misterpib at gmail.com>
98100
Paulius Lozys <pauliuslozys at gmail.com>
99101
Peter Schultz <peter.schultz at classmarkets.com>
100102
Phil Porada <philporada at gmail.com>
101-
Minh Quang <minhquang4334 at gmail.com>
102103
Rebecca Chin <rchin at pivotal.io>
103104
Reed Allman <rdallman10 at gmail.com>
104105
Richard Wilkes <wilkes at me.com>

Diff for: fields.go

+4
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ var (
128128
scanTypeInt64 = reflect.TypeOf(int64(0))
129129
scanTypeNullFloat = reflect.TypeOf(sql.NullFloat64{})
130130
scanTypeNullInt = reflect.TypeOf(sql.NullInt64{})
131+
scanTypeNullUint = reflect.TypeOf(sql.Null[uint64]{})
131132
scanTypeNullTime = reflect.TypeOf(sql.NullTime{})
132133
scanTypeUint8 = reflect.TypeOf(uint8(0))
133134
scanTypeUint16 = reflect.TypeOf(uint16(0))
@@ -185,6 +186,9 @@ func (mf *mysqlField) scanType() reflect.Type {
185186
}
186187
return scanTypeInt64
187188
}
189+
if mf.flags&flagUnsigned != 0 {
190+
return scanTypeNullUint
191+
}
188192
return scanTypeNullInt
189193

190194
case fieldTypeFloat:

0 commit comments

Comments
 (0)