From 6bdd791dec9de4f8e8c9e1d70cb0609177459f7d Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Fri, 10 Feb 2012 10:20:49 +1100
Subject: database/sql: remove Into from ScannerInto/ScanInto

Also fix a doc error.

Fixes #2843

R=golang-dev, r, rsc
CC=golang-dev
https://golang.org/cl/5653050
---
 src/pkg/database/sql/convert.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/pkg/database/sql/convert.go')

diff --git a/src/pkg/database/sql/convert.go b/src/pkg/database/sql/convert.go
index 31ff47f721..4afa2bef75 100644
--- a/src/pkg/database/sql/convert.go
+++ b/src/pkg/database/sql/convert.go
@@ -90,8 +90,8 @@ func convertAssign(dest, src interface{}) error {
 		return nil
 	}
 
-	if scanner, ok := dest.(ScannerInto); ok {
-		return scanner.ScanInto(src)
+	if scanner, ok := dest.(Scanner); ok {
+		return scanner.Scan(src)
 	}
 
 	dpv := reflect.ValueOf(dest)
-- 
cgit v1.3-5-g9baa