Update paths for v4

410Labs · Feb 16, 2020 · d8bb5a4 · d8bb5a4
1 parent 5fd43ed
commit d8bb5a4
Show file tree

Hide file tree

Showing 60 changed files with 120 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ CouchDB driver for [Kivik](https://github.com/go-kivik/kivik).
 ## Usage
 
 This package provides an implementation of the
-[`github.com/go-kivik/kivik/v3/driver`](http://godoc.org/github.com/go-kivik/kivik/driver)
+[`github.com/go-kivik/kivik/v4/driver`](http://godoc.org/github.com/go-kivik/kivik/driver)
 interface. You must import the driver and can then use the full
 [`Kivik`](http://godoc.org/github.com/go-kivik/kivik) API. Please consult the
 [Kivik wiki](https://github.com/go-kivik/kivik/wiki) for complete documentation
@@ -19,8 +19,8 @@ package main
 import (
     "context"
 
-    kivik "github.com/go-kivik/kivik/v3"
-    _ "github.com/go-kivik/couchdb/v3" // The CouchDB driver
+    kivik "github.com/go-kivik/kivik/v4"
+    _ "github.com/go-kivik/couchdb/v4" // The CouchDB driver
 )
 
 func main() {

diff --git a/attachments.go b/attachments.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func (d *db) PutAttachment(ctx context.Context, docID, rev string, att *driver.Attachment, options map[string]interface{}) (newRev string, err error) {

diff --git a/attachments_test.go b/attachments_test.go
@@ -13,7 +13,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 type closer struct {

diff --git a/auth.go b/auth.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 func (c *client) Authenticate(ctx context.Context, a interface{}) error {

diff --git a/auth_test.go b/auth_test.go
@@ -10,8 +10,8 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 type mockAuther struct {

diff --git a/bulk.go b/bulk.go
@@ -7,9 +7,9 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 type bulkResults struct {

diff --git a/bulk_test.go b/bulk_test.go
@@ -12,8 +12,8 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestBulkDocs(t *testing.T) {

diff --git a/bulkget.go b/bulkget.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func (d *db) BulkGet(ctx context.Context, docs []driver.BulkGetReference, opts map[string]interface{}) (driver.Rows, error) {

diff --git a/bulkget_test.go b/bulkget_test.go
@@ -13,7 +13,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestBulkGet(t *testing.T) {

diff --git a/changes.go b/changes.go
@@ -8,9 +8,9 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 // Changes returns the changes stream for the database.

diff --git a/changes_test.go b/changes_test.go
@@ -10,7 +10,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestChanges(t *testing.T) {

diff --git a/chttp/auth_test.go b/chttp/auth_test.go
@@ -12,7 +12,7 @@ import (
 	"gitlab.com/flimzy/testy"
 	"golang.org/x/net/publicsuffix"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 type mockRT struct {

diff --git a/chttp/chttp.go b/chttp/chttp.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"syscall"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 const (

diff --git a/chttp/chttp_test.go b/chttp/chttp_test.go
@@ -18,7 +18,7 @@ import (
 	"gitlab.com/flimzy/testy"
 	"golang.org/x/net/publicsuffix"
 
-	"github.com/go-kivik/kivik/v3/errors"
+	"github.com/go-kivik/kivik/v4/errors"
 )
 
 var defaultUA = func() string {

diff --git a/chttp/cookieauth.go b/chttp/cookieauth.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 // CookieAuth provides CouchDB Cookie auth services as described at

diff --git a/chttp/cookieauth_test.go b/chttp/cookieauth_test.go
@@ -11,7 +11,7 @@ import (
 	"gitlab.com/flimzy/testy"
 	"golang.org/x/net/publicsuffix"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 func TestCookieAuthAuthenticate(t *testing.T) {

diff --git a/chttp/errors_test.go b/chttp/errors_test.go
@@ -9,7 +9,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 func TestHTTPErrorError(t *testing.T) {

diff --git a/client.go b/client.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func (c *client) AllDBs(ctx context.Context, opts map[string]interface{}) ([]string, error) {

diff --git a/client_test.go b/client_test.go
@@ -8,7 +8,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestAllDBs(t *testing.T) {

diff --git a/cluster.go b/cluster.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
+	"github.com/go-kivik/couchdb/v4/chttp"
 )
 
 func (c *client) ClusterStatus(ctx context.Context, opts map[string]interface{}) (string, error) {

diff --git a/cluster_test.go b/cluster_test.go
@@ -11,7 +11,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 const optionEnsureDBsExist = "ensure_dbs_exist"

diff --git a/config.go b/config.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 // Couch1ConfigNode can be passed to any of the Config-related methods as the

diff --git a/config_test.go b/config_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestConfig(t *testing.T) {

diff --git a/couchdb.go b/couchdb.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 // Couch represents the parent driver instance.

diff --git a/couchdb_test.go b/couchdb_test.go
@@ -8,7 +8,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 func TestNewClient(t *testing.T) {

diff --git a/db.go b/db.go
@@ -20,9 +20,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 type db struct {

diff --git a/db_test.go b/db_test.go
@@ -19,9 +19,9 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	kivik "github.com/go-kivik/kivik/v3"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	kivik "github.com/go-kivik/kivik/v4"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestAllDocs(t *testing.T) {
@@ -1181,14 +1181,14 @@ func TestRowsQuery(t *testing.T) {
 					"X-Couch-Request-ID": {"a9688d9335"},
 					"X-Couch-Body-Time":  {"0"},
 				},
-				Body: ioutil.NopCloser(strings.NewReader(`{"total_rows":1,"offset":0,"update_seq":"13-g1AAAAEzeJzLYWBg4MhgTmHgzcvPy09JdcjLz8gvLskBCjPlsQBJhgdA6j8QZCUy4FV3AKLuflYiE151DRB18wmZtwCibj9u85ISgGRSPV63JSmA1NiD1bDgUJPIkCSP3xAHkCHxYDWsWQDg12MD","rows":[
+				Body: ioutil.NopCloser(strings.NewReader(`{"total_rows":1,"offset":0,"update_seq":"13-g1AAAAEzeJzLYWBg4MhgTmHgzcvPy09JdcjLz8gvLskBCjPlsQBJhgdA6j8QZCUy4Fv4AKLuflYiE151DRB18wmZtwCibj9u85ISgGRSPV63JSmA1NiD1bDgUJPIkCSP3xAHkCHxYDWsWQDg12MD","rows":[
 {"id":"_design/_auth","key":"_design/_auth","value":{"rev":"1-75efcce1f083316d622d389f3f9813f7"}}
 ]}
 `)),
 			}, nil),
 			expected: queryResult{
 				TotalRows: 1,
-				UpdateSeq: "13-g1AAAAEzeJzLYWBg4MhgTmHgzcvPy09JdcjLz8gvLskBCjPlsQBJhgdA6j8QZCUy4FV3AKLuflYiE151DRB18wmZtwCibj9u85ISgGRSPV63JSmA1NiD1bDgUJPIkCSP3xAHkCHxYDWsWQDg12MD",
+				UpdateSeq: "13-g1AAAAEzeJzLYWBg4MhgTmHgzcvPy09JdcjLz8gvLskBCjPlsQBJhgdA6j8QZCUy4Fv4AKLuflYiE151DRB18wmZtwCibj9u85ISgGRSPV63JSmA1NiD1bDgUJPIkCSP3xAHkCHxYDWsWQDg12MD",
 				Rows: []driver.Row{
 					{
 						ID:    "_design/_auth",

diff --git a/dbstats.go b/dbstats.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 type dbStats struct {

diff --git a/dbstats_test.go b/dbstats_test.go
@@ -10,7 +10,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestStats(t *testing.T) {

diff --git a/doc.go b/doc.go
@@ -7,8 +7,8 @@ Use the `couch` driver name when using this driver. The DSN should be a full
 URL, likely with login credentials:
 
     import (
-        kivik "github.com/go-kivik/kivik/v3"
-        _ "github.com/go-kivik/couchdb/v3" // The CouchDB driver
+        kivik "github.com/go-kivik/kivik/v4"
+        _ "github.com/go-kivik/couchdb/v4" // The CouchDB driver
     )
 
     client, err := kivik.New("couch", "http://username:[email protected]:5984/")

diff --git a/errors.go b/errors.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	kivik "github.com/go-kivik/kivik/v4"
 )
 
 func missingArg(arg string) error {

diff --git a/find.go b/find.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/go-kivik/couchdb/v3/chttp"
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/couchdb/v4/chttp"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func (d *db) CreateIndex(ctx context.Context, ddoc, name string, index interface{}) error {

diff --git a/find_test.go b/find_test.go
@@ -12,7 +12,7 @@ import (
 
 	"gitlab.com/flimzy/testy"
 
-	"github.com/go-kivik/kivik/v3/driver"
+	"github.com/go-kivik/kivik/v4/driver"
 )
 
 func TestExplain(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -1,10 +1,13 @@
-module github.com/go-kivik/couchdb/v3
+module github.com/go-kivik/couchdb/v4
 
 go 1.13
 
 require (
+	github.com/go-kivik/couchdb/v3 v3.0.0-20200214171159-5fd43ed7e3a7
 	github.com/go-kivik/kivik/v3 v3.0.0-pre1
+	github.com/go-kivik/kivik/v4 v4.0.0-20200214160900-846fe547c809
 	github.com/go-kivik/kiviktest/v3 v3.0.0-pre1
+	github.com/go-kivik/kiviktest/v4 v4.0.0-20200214165217-a51629876bec
 	github.com/gopherjs/gopherjs v0.0.0-20200209144316-f9cef593def5
 	github.com/pkg/errors v0.9.1
 	gitlab.com/flimzy/testy v0.0.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ import ( @@
     	"sync"
     	"syscall"
-    	kivik "github.com/go-kivik/kivik/v3"
+    	kivik "github.com/go-kivik/kivik/v4"
     )
     const (
@@ Expand Down @@