aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2018-11-22 01:47:23 +0900
committerGitHub <noreply@github.com>2018-11-22 01:47:23 +0900
commitc8804396871a55aecc8af90cab0ef473a3b8c8d7 (patch)
tree31ae2d37634e74cd0d3bdef7b040ce2f56539362
parentMerge pull request #665 from mjtrangoni/fix-gometalinter-issues (diff)
parentUse GoBytes (diff)
downloadgolite-c8804396871a55aecc8af90cab0ef473a3b8c8d7.tar.gz
golite-c8804396871a55aecc8af90cab0ef473a3b8c8d7.tar.xz
Merge pull request #644 from akalin/fix-pointer-conversion
Clean up blob to byte slice conversion
-rw-r--r--sqlite3.go9
1 files changed, 2 insertions, 7 deletions
diff --git a/sqlite3.go b/sqlite3.go
index f2c2053..838a5df 100644
--- a/sqlite3.go
+++ b/sqlite3.go
@@ -2027,13 +2027,8 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error {
dest[i] = nil
continue
}
- n := int(C.sqlite3_column_bytes(rc.s.s, C.int(i)))
- switch dest[i].(type) {
- default:
- slice := make([]byte, n)
- copy(slice[:], (*[1 << 30]byte)(p)[0:n])
- dest[i] = slice
- }
+ n := C.sqlite3_column_bytes(rc.s.s, C.int(i))
+ dest[i] = C.GoBytes(p, n)
case C.SQLITE_NULL:
dest[i] = nil
case C.SQLITE_TEXT: