Commit 58039ab

authored

Merge pull request mattn#692 from mattn/fix-688

Fix 688

2 parents 3fa1c55 + 4731d0e commit 58039abCopy full SHA for 58039ab

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2062,9 +2062,8 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error {`
`2062`	`2062`	`}`
`2063`	`2063`	`dest[i] = t`
`2064`	`2064`	`default:`
`2065`		`- dest[i] = []byte(s)`
	`2065`	`+ dest[i] = s`
`2066`	`2066`	`}`
`2067`		`-`
`2068`	`2067`	`}`
`2069`	`2068`	`}`
`2070`	`2069`	`return nil`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1670,6 +1670,26 @@ func TestAuthorizer(t *testing.T) {`
`1670`	`1670`	`}`
`1671`	`1671`	`}`
`1672`	`1672`
	`1673`	`+func TestNonColumnString(t *testing.T) {`
	`1674`	`+ db, err := sql.Open("sqlite3", ":memory:")`
	`1675`	`+ if err != nil {`
	`1676`	`+ t.Fatal(err)`
	`1677`	`+ }`
	`1678`	`+ defer db.Close()`
	`1679`	`+`
	`1680`	`+ var x interface{}`
	`1681`	`+ if err := db.QueryRow("SELECT 'hello'").Scan(&x); err != nil {`
	`1682`	`+ t.Fatal(err)`
	`1683`	`+ }`
	`1684`	`+ s, ok := x.(string)`
	`1685`	`+ if !ok {`
	`1686`	`+ t.Fatalf("non-column string must return string but got %T", x)`
	`1687`	`+ }`
	`1688`	`+ if s != "hello" {`
	`1689`	`+ t.Fatalf("non-column string must return %q but got %q", "hello", s)`
	`1690`	`+ }`
	`1691`	`+}`
	`1692`	`+`
`1673`	`1693`	`func TestNilAndEmptyBytes(t *testing.T) {`
`1674`	`1694`	`db, err := sql.Open("sqlite3", ":memory:")`
`1675`	`1695`	`if err != nil {`

Comments

(0)