Use top-level int instead of duplicate internal

go-kivik · Jun 3, 2024 · c0217b4 · c0217b4
1 parent eb417c3
commit c0217b4
Show file tree

Hide file tree

Showing 36 changed files with 34 additions and 233 deletions.
diff --git a/x/sqlite/changes_test.go b/x/sqlite/changes_test.go
@@ -29,7 +29,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBChanges(t *testing.T) {

diff --git a/x/sqlite/common_test.go b/x/sqlite/common_test.go
@@ -28,7 +28,7 @@ import (
  "testing"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 type DB interface {

diff --git a/x/sqlite/delete.go b/x/sqlite/delete.go
@@ -17,7 +17,7 @@ import (
  "net/http"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 func (d *db) Delete(ctx context.Context, docID string, options driver.Options) (string, error) {

diff --git a/x/sqlite/delete_test.go b/x/sqlite/delete_test.go
@@ -25,7 +25,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBDelete(t *testing.T) {

diff --git a/x/sqlite/deleteattachment.go b/x/sqlite/deleteattachment.go
@@ -17,7 +17,7 @@ import (
  "net/http"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 func (d *db) DeleteAttachment(ctx context.Context, docID, filename string, options driver.Options) (string, error) {

diff --git a/x/sqlite/deleteattachment_test.go b/x/sqlite/deleteattachment_test.go
@@ -26,7 +26,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBDeleteAttachment(t *testing.T) {

diff --git a/x/sqlite/designdocs_test.go b/x/sqlite/designdocs_test.go
@@ -23,7 +23,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBDesignDocs(t *testing.T) {

diff --git a/x/sqlite/get_test.go b/x/sqlite/get_test.go
@@ -28,7 +28,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBGet(t *testing.T) {

diff --git a/x/sqlite/getattachment.go b/x/sqlite/getattachment.go
@@ -21,7 +21,7 @@ import (
  "net/http"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 func (d *db) GetAttachment(ctx context.Context, docID string, filename string, options driver.Options) (*driver.Attachment, error) {

diff --git a/x/sqlite/getattachment_test.go b/x/sqlite/getattachment_test.go
@@ -26,7 +26,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBGetAttachment(t *testing.T) {

diff --git a/x/sqlite/getattachmentmeta.go b/x/sqlite/getattachmentmeta.go
@@ -19,7 +19,7 @@ import (
  "net/http"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 func (d *db) GetAttachmentMeta(ctx context.Context, docID, filename string, options driver.Options) (*driver.Attachment, error) {

diff --git a/x/sqlite/getattachmentmeta_test.go b/x/sqlite/getattachmentmeta_test.go
@@ -25,7 +25,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBGetAttachmentMeta(t *testing.T) {

diff --git a/x/sqlite/getrev.go b/x/sqlite/getrev.go
@@ -19,7 +19,7 @@ import (
  "net/http"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 func (d *db) GetRev(ctx context.Context, id string, options driver.Options) (string, error) {

diff --git a/x/sqlite/getrev_test.go b/x/sqlite/getrev_test.go
@@ -24,7 +24,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestGetRev(t *testing.T) {

diff --git a/x/sqlite/internal/errors.go b/x/sqlite/internal/errors.go
diff --git a/x/sqlite/internal/mock/options.go b/x/sqlite/internal/mock/options.go
diff --git a/x/sqlite/json.go b/x/sqlite/json.go
@@ -26,7 +26,7 @@ import (
  "strconv"
  "strings"
 
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 type revision struct {

diff --git a/x/sqlite/localdocs_test.go b/x/sqlite/localdocs_test.go
@@ -23,7 +23,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBLocalDocs(t *testing.T) {

diff --git a/x/sqlite/openrevs.go b/x/sqlite/openrevs.go
@@ -22,7 +22,7 @@ import (
  "strings"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 func (d *db) OpenRevs(ctx context.Context, docID string, revs []string, options driver.Options) (driver.Rows, error) {

diff --git a/x/sqlite/openrevs_test.go b/x/sqlite/openrevs_test.go
@@ -24,7 +24,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func TestDBOpenRevs(t *testing.T) {

diff --git a/x/sqlite/options.go b/x/sqlite/options.go
@@ -20,7 +20,7 @@ import (
  "strconv"
 
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 type optsMap map[string]interface{}

diff --git a/x/sqlite/options_test.go b/x/sqlite/options_test.go
@@ -22,7 +22,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 func Test_viewOptions(t *testing.T) {

diff --git a/x/sqlite/put.go b/x/sqlite/put.go
@@ -20,7 +20,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal"
+ internal "github.com/go-kivik/kivik/v4/int/errors"
 )
 
 func (d *db) Put(ctx context.Context, docID string, doc interface{}, options driver.Options) (string, error) {

diff --git a/x/sqlite/put_designdocs_test.go b/x/sqlite/put_designdocs_test.go
@@ -27,7 +27,7 @@ import (
 
  "github.com/go-kivik/kivik/v4"
  "github.com/go-kivik/kivik/v4/driver"
- "github.com/go-kivik/kivik/x/sqlite/v4/internal/mock"
+ "github.com/go-kivik/kivik/v4/int/mock"
 )
 
 type ddoc struct {