Skip to content

Commit 7ca20b0

Browse files
committed
Merge pull request go-sql-driver#356 from go-sql-driver/infile
infile: Support absolute paths
2 parents fb72997 + ec78b64 commit 7ca20b0

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

infile.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
8686
var rdr io.Reader
8787
var data []byte
8888

89-
if strings.HasPrefix(name, "Reader::") { // io.Reader
90-
name = name[8:]
89+
if idx := strings.Index(name, "Reader::"); idx == 0 || (idx > 0 && name[idx-1] == '/') { // io.Reader
90+
// The server might return an an absolute path. See issue #355.
91+
name = name[idx+8:]
92+
9193
if handler, inMap := readerRegister[name]; inMap {
9294
rdr = handler()
9395
if rdr != nil {

0 commit comments

Comments
 (0)