Skip to content

Commit 693bfb8

Browse files
committed
refactoring (*textRows).readRow in a more clear way
1 parent 21f789c commit 693bfb8

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎packets.go‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -761,40 +761,40 @@ func (rows *textRows) readRow(dest []driver.Value) error{
761761
}
762762

763763
// RowSet Packet
764-
varnint
765-
varisNullbool
766-
pos:=0
764+
var (
765+
nint
766+
isNullbool
767+
posint=0
768+
)
767769

768770
fori:=rangedest{
769771
// Read bytes and convert to string
770772
dest[i], isNull, n, err=readLengthEncodedString(data[pos:])
771773
pos+=n
772-
iferr==nil{
773-
if!isNull{
774-
if!mc.parseTime{
775-
continue
776-
} else{
777-
switchrows.rs.columns[i].fieldType{
778-
casefieldTypeTimestamp, fieldTypeDateTime,
779-
fieldTypeDate, fieldTypeNewDate:
780-
dest[i], err=parseDateTime(
781-
dest[i].([]byte),
782-
mc.cfg.Loc,
783-
)
784-
iferr==nil{
785-
continue
786-
}
787-
default:
788-
continue
789-
}
790-
}
791774

792-
} else{
793-
dest[i] =nil
794-
continue
775+
iferr!=nil{
776+
returnerr
777+
}
778+
779+
ifisNull{
780+
dest[i] =nil
781+
continue
782+
}
783+
784+
if!mc.parseTime{
785+
continue
786+
}
787+
788+
// Parse time field
789+
switchrows.rs.columns[i].fieldType{
790+
casefieldTypeTimestamp,
791+
fieldTypeDateTime,
792+
fieldTypeDate,
793+
fieldTypeNewDate:
794+
ifdest[i], err=parseDateTime(dest[i].([]byte), mc.cfg.Loc); err!=nil{
795+
errLog.Print(err)
795796
}
796797
}
797-
returnerr// err != nil
798798
}
799799

800800
returnnil

0 commit comments

Comments
(0)