Skip to content

Commit 62502f5

Browse files
committed
infile: Support absolute paths
Fixes go-sql-driver#355
1 parent fb72997 commit 62502f5

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

infile.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"fmt"
1313
"io"
1414
"os"
15+
"path"
1516
"strings"
1617
)
1718

@@ -86,8 +87,11 @@ func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
8687
var rdr io.Reader
8788
var data []byte
8889

89-
if strings.HasPrefix(name, "Reader::") { // io.Reader
90-
name = name[8:]
90+
// The server might return an an absolute path. See issue #355.
91+
base := path.Base(name)
92+
93+
if strings.HasPrefix(base, "Reader::") { // io.Reader
94+
name = base[8:]
9195
if handler, inMap := readerRegister[name]; inMap {
9296
rdr = handler()
9397
if rdr != nil {

0 commit comments

Comments
 (0)