update to reflect interface changes in go-reader v0.4.x

go.mod

@@ -1,5 +1,5 @@
 module github.com/whosonfirst/go-reader-database-sql
 
-go 1.12
+go 1.16
 
-require github.com/whosonfirst/go-reader v0.2.0
+require github.com/whosonfirst/go-reader v0.4.1

go.sum

@@ -101,6 +101,8 @@ github.com/whosonfirst/go-reader v0.1.1 h1:0fXoYQR/Yyh3PKk+9Huwoc6dCAt8l1tjg2dES
 github.com/whosonfirst/go-reader v0.1.1/go.mod h1:w0AeU+Ojyfmxb7r+rcSYyxpCxrhxlHv+D9EgEwQsqcM=
 github.com/whosonfirst/go-reader v0.2.0 h1:Et8rvkh+86msAo4Db4h88m1t2QDSMNr3rLy6RqJzeJc=
 github.com/whosonfirst/go-reader v0.2.0/go.mod h1:qUhz3OWefOUX/G1nzCEUzJskDjkF+l9oKPOM3K2fAJI=
+github.com/whosonfirst/go-reader v0.4.1 h1:gN73LR/gdtWtuCikOc84rtuMIbIu6fi7RPRZgssKL9I=
+github.com/whosonfirst/go-reader v0.4.1/go.mod h1:ffg8ww1158rNNqStFx64EGmDL5m5WZPsoMqR6wohOWE=
 github.com/whosonfirst/go-whosonfirst-reader v0.0.0-20191122203133-047f20452865/go.mod h1:xYzBn6llLD/uS6Zhh0H4LAqddEJHXdQSUIxywTnhpOU=
 github.com/whosonfirst/go-whosonfirst-sources v0.1.0/go.mod h1:EUMHyGzUmqPPxlMmOp+28BFeoBdxxE0HCKRd67lkqGM=
 github.com/whosonfirst/go-whosonfirst-uri v0.1.0/go.mod h1:8eaDVcc4v+HHHEDaRbApdmhPwM4/JQllw2PktvZcPVs=

sql.go

@@ -6,8 +6,8 @@ import (
 	"errors"
 	"fmt"
 	wof_reader "github.com/whosonfirst/go-reader"
+	"github.com/whosonfirst/go-reader/ioutil"
 	"io"
-	"io/ioutil"
 	_ "log"
 	"net/url"
 	"regexp"
@@ -47,7 +47,7 @@ type SQLReader struct {
 	value string
 }
 
-// sql://sqlite/geojson/id/body/?dsn=....
+// sql://sqlite/geojson/id/body?dsn=....
 
 func NewSQLReader(ctx context.Context, uri string) (wof_reader.Reader, error) {
 
@@ -107,7 +107,7 @@ func NewSQLReader(ctx context.Context, uri string) (wof_reader.Reader, error) {
 	return r, nil
 }
 
-func (r *SQLReader) Read(ctx context.Context, raw_uri string) (io.ReadCloser, error) {
+func (r *SQLReader) Read(ctx context.Context, raw_uri string) (io.ReadSeekCloser, error) {
 
 	uri := raw_uri
 
@@ -158,7 +158,29 @@ func (r *SQLReader) Read(ctx context.Context, raw_uri string) (io.ReadCloser, er
 	}
 
 	sr := strings.NewReader(body)
-	fh := ioutil.NopCloser(sr)
+	fh, err := ioutil.NewReadSeekCloser(sr)
+
+	if err != nil {
+		return nil, err
+	}
 
 	return fh, nil
 }
+
+func (r *SQLReader) ReaderURI(ctx context.Context, raw_uri string) string {
+
+	uri := raw_uri
+
+	if URI_READFUNC != nil {
+
+		new_uri, err := URI_READFUNC(raw_uri)
+
+		if err != nil {
+			return ""
+		}
+
+		uri = new_uri
+	}
+
+	return uri
+}