update vendor deps; reflect changes to aaronland/go-pagination packages

go.mod

@@ -3,9 +3,9 @@ module github.com/whosonfirst/go-whosonfirst-sqlite-spr
 go 1.16
 
 require (
-	github.com/aaronland/go-pagination v0.0.3
-	github.com/aaronland/go-pagination-sql v0.0.4
-	github.com/aaronland/go-sqlite v0.0.5
+	github.com/aaronland/go-pagination v0.2.0
+	github.com/aaronland/go-pagination-sql v0.2.0
+	github.com/aaronland/go-sqlite v0.1.0
 	github.com/sfomuseum/go-edtf v0.3.1
 	github.com/whosonfirst/go-whosonfirst-flags v0.4.3
 	github.com/whosonfirst/go-whosonfirst-spr/v2 v2.0.0

go.sum

@@ -1,19 +1,27 @@
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/aaronland/go-pagination v0.0.3 h1:MhD+sl0L4M0mJ0zDnk/njpGqowwG9dhda/5wfm5dU0M=
 github.com/aaronland/go-pagination v0.0.3/go.mod h1:AWtlmw9OwbSPP6cSY6wRZzfYVTwXMpB+xU+2ohNLPAE=
+github.com/aaronland/go-pagination v0.2.0 h1:ZZ8mNu5oEK5wanAjbYAaE3w5eyQKzFOWu/gsloW1vdw=
+github.com/aaronland/go-pagination v0.2.0/go.mod h1:zrYVkUTBoe6yJ23l6OyTyfSpTyg6s/cNxZxNztXNQpQ=
 github.com/aaronland/go-pagination-sql v0.0.4 h1:B3y1LKp6EjYzMehlwgwkn8uOsUOOEXqsHbqlhsfvfao=
 github.com/aaronland/go-pagination-sql v0.0.4/go.mod h1:Bb4b3VM6yRBo8+EHixDUOtYPzdlDU+uc25YkOC7VKto=
+github.com/aaronland/go-pagination-sql v0.2.0 h1:WVesObJVvwawIgkl6Twot9DXia09qiZQJQ/7ik64kSU=
+github.com/aaronland/go-pagination-sql v0.2.0/go.mod h1:Thovmz045/sxI0actKFyGLzIKmlCK4R9Qi4gS742PbY=
 github.com/aaronland/go-sqlite v0.0.3 h1:pa8L74JdbkmONxqLqMqZFZtHpARHM46JmX1A/hZ44KU=
 github.com/aaronland/go-sqlite v0.0.3/go.mod h1:b/FfLh8xBZ1dhjyehPsFli46VhGqWAz2rKR4udvTHJw=
 github.com/aaronland/go-sqlite v0.0.5 h1:ak6Ee2AyXIcE+8ZInib2qy4k2NSDIQeZKiL9bEZW6S4=
 github.com/aaronland/go-sqlite v0.0.5/go.mod h1:91mdgKDJ1RXxvXH6RYvBhi2gqCX7TnRCCZThx1ZQx5M=
+github.com/aaronland/go-sqlite v0.1.0 h1:PbXMPsVZ+1LMknoA7nBR+oc5XjE4C7OeL20cO/6RA/s=
+github.com/aaronland/go-sqlite v0.1.0/go.mod h1:/Q4BWbsdgHtQY+99oxaeCj4TwGc8qyAN8CUyF2JK0xg=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-ini/ini v1.42.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
+github.com/jtacoma/uritemplates v1.0.0 h1:xwx5sBF7pPAb0Uj8lDC1Q/aBPpOFyQza7OC705ZlLCo=
+github.com/jtacoma/uritemplates v1.0.0/go.mod h1:IhIICdE9OcvgUnGwTtJxgBQ+VrTrti5PcbLVSJianO8=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
 github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=

query.go

@@ -9,9 +9,9 @@ import (
 	"github.com/whosonfirst/go-whosonfirst-spr/v2"
 )
 
-// QueryPaginated will iterate over all the rows for 'q' in batches determined by 'pg_opts' and return a `spr.StandardPlacesResults` and `pagination.Pagination`
+// QueryPaginated will iterate over all the rows for 'q' in batches determined by 'pg_opts' and return a `spr.StandardPlacesResults` and `pagination.Results`
 // instance for the results.
-func QueryPaginated(ctx context.Context, conn *sql.DB, pg_opts pagination.PaginationOptions, q string, args ...interface{}) (spr.StandardPlacesResults, pagination.Pagination, error) {
+func QueryPaginated(ctx context.Context, conn *sql.DB, pg_opts pagination.Options, q string, args ...interface{}) (spr.StandardPlacesResults, pagination.Results, error) {
 
 	rsp, err := sql_pagination.QueryPaginated(conn, pg_opts, q, args...)
 
@@ -20,7 +20,7 @@ func QueryPaginated(ctx context.Context, conn *sql.DB, pg_opts pagination.Pagina
 	}
 
 	rows := rsp.Rows()
-	pg := rsp.Pagination()
+	pg := rsp.Results()
 
 	spr_results := make([]spr.StandardPlacesResult, 0)