tag v5 due to rename pkg

rethinkdb · Sep 12, 2018 · d4f52ab · d4f52ab
1 parent 3c64934
commit d4f52ab
Show file tree

Hide file tree

Showing 124 changed files with 216 additions and 212 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ go:
 
 cache: apt
 
-go_import_path: gopkg.in/rethinkdb/rethinkdb-go.v4
+go_import_path: gopkg.in/rethinkdb/rethinkdb-go.v5
 
 install: go get -t ./...
 
@@ -24,4 +24,6 @@ before_script:
   - rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29016 > /dev/null 2>&1 &
   - rethinkdb --port-offset 3 --directory rethinkdb_data3 --join localhost:29016 > /dev/null 2>&1 &
 
-script: go test -tags='cluster' -short -race -v ./...
+script:
+  - go test -race .
+  - go test -tags='cluster' -short -race -v ./...
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## v4.2.0 - 2018-09-12
+## v5.0.0 - 2018-09-12
 
 - Moved to rethinkdb organization
 - Renamed to rethinkdb-go repo

diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 test:
-	test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4 && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4 ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4.bak; true
-	cp -R . ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4
-	go test -coverprofile=cover.out -race gopkg.in/rethinkdb/rethinkdb-go.v4; true
+	test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5 && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5 ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5.bak; true
+	cp -R . ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5
+	go test -coverprofile=cover.out -race gopkg.in/rethinkdb/rethinkdb-go.v5; true
 	go tool cover -html=cover.out -o cover.html; true
 	rm -f cover.out; true
-	rm -rf ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4
-	test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4.bak && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4.bak ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4; true
+	rm -rf ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5
+	test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5.bak && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5.bak ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5; true
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 ![RethinkDB-go Logo](https://raw.github.com/wiki/rethinkdb/rethinkdb-go/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
 
-Current version: v4.2.0 (RethinkDB v2.3)
+Current version: v5.0.0 (RethinkDB v2.3)
 
 Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
 
@@ -17,10 +17,10 @@ If you need any help you can find me on the [RethinkDB slack](http://slack.rethi
 ## Installation
 
 ```
-go get gopkg.in/rethinkdb/rethinkdb-go.v4
+go get gopkg.in/rethinkdb/rethinkdb-go.v5
 ```
 
-Replace `v4` with `v3` or `v2` to use previous versions.
+Replace `v5` with `v4` or `v3` to use previous versions.
 
 ## Example
 
@@ -32,7 +32,7 @@ import (
 	"fmt"
 	"log"
 
-	r "gopkg.in/rethinkdb/rethinkdb-go.v4"
+	r "gopkg.in/rethinkdb/rethinkdb-go.v5"
 )
 
 func Example() {

diff --git a/connection.go b/connection.go
@@ -14,7 +14,7 @@ import (
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/opentracing/opentracing-go/log"
 	"golang.org/x/net/context"
-	p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
+	p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
 	"sync"
 )
 

diff --git a/connection_handshake.go b/connection_handshake.go
@@ -16,7 +16,7 @@ import (
 
 	"golang.org/x/crypto/pbkdf2"
 
-	p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
+	p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
 )
 
 type HandshakeVersion int

diff --git a/connection_test.go b/connection_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/opentracing/opentracing-go/mocktracer"
 	"golang.org/x/net/context"
 	test "gopkg.in/check.v1"
-	p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
+	p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
 	"io"
 	"time"
 )

diff --git a/cursor.go b/cursor.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/opentracing/opentracing-go"
 	"golang.org/x/net/context"
-	"gopkg.in/rethinkdb/rethinkdb-go.v4/encoding"
-	p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
+	"gopkg.in/rethinkdb/rethinkdb-go.v5/encoding"
+	p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
 )
 
 var (

diff --git a/encoding/encoder_test.go b/encoding/encoder_test.go
@@ -543,7 +543,7 @@ func TestEncodeCustomRootTypeEncodingError(t *testing.T) {
 	if err == nil {
 		t.Errorf("got nil error, expected %v", cerr)
 	}
-	if err != cerr  {
+	if err != cerr {
 		t.Errorf("got %q, want %q", err, cerr)
 	}
 }
diff --git a/encoding/tags.go b/encoding/tags.go
@@ -14,11 +14,11 @@ var (
 )
 
 const (
-	TagName     = "rethinkdb"
-	OldTagName     = "gorethink"
-	JSONTagName = "json"
-	RefTagName  = "rethinkdb_ref"
-	OldRefTagName  = "gorethink_ref"
+	TagName       = "rethinkdb"
+	OldTagName    = "gorethink"
+	JSONTagName   = "json"
+	RefTagName    = "rethinkdb_ref"
+	OldRefTagName = "gorethink_ref"
 )
 
 // tagOptions is the string following a comma in a struct field's

diff --git a/errors.go b/errors.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
+	p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module gopkg.in/rethinkdb/rethinkdb-go.v4
+module gopkg.in/rethinkdb/rethinkdb-go.v5
 
 require (
 	github.com/cenkalti/backoff v2.0.0+incompatible

diff --git a/internal/integration/reql_tests/common.go b/internal/integration/reql_tests/common.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/suite"
-	r "gopkg.in/rethinkdb/rethinkdb-go.v4"
-	"gopkg.in/rethinkdb/rethinkdb-go.v4/internal/compare"
+	r "gopkg.in/rethinkdb/rethinkdb-go.v5"
+	"gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare"
 )
 
 func maybeRun(query interface{}, session *r.Session, opts r.RunOpts) interface{} {

diff --git a/internal/integration/reql_tests/gorethink_test.go b/internal/integration/reql_tests/gorethink_test.go
@@ -6,7 +6,7 @@ import (
 	"flag"
 	"os"
 
-	r "gopkg.in/rethinkdb/rethinkdb-go.v4"
+	r "gopkg.in/rethinkdb/rethinkdb-go.v5"
 )
 
 var url string

diff --git a/internal/integration/reql_tests/reql_aggregation_test.go b/internal/integration/reql_tests/reql_aggregation_test.go
diff --git a/internal/integration/reql_tests/reql_changefeeds_edge_test.go b/internal/integration/reql_tests/reql_changefeeds_edge_test.go
diff --git a/internal/integration/reql_tests/reql_changefeeds_idxcopy_test.go b/internal/integration/reql_tests/reql_changefeeds_idxcopy_test.go
diff --git a/internal/integration/reql_tests/reql_changefeeds_include_states_test.go b/internal/integration/reql_tests/reql_changefeeds_include_states_test.go
diff --git a/internal/integration/reql_tests/reql_changefeeds_point_test.go b/internal/integration/reql_tests/reql_changefeeds_point_test.go
diff --git a/internal/integration/reql_tests/reql_changefeeds_table_test.go b/internal/integration/reql_tests/reql_changefeeds_table_test.go
diff --git a/internal/integration/reql_tests/reql_control_test.go b/internal/integration/reql_tests/reql_control_test.go
diff --git a/internal/integration/reql_tests/reql_datum_array_test.go b/internal/integration/reql_tests/reql_datum_array_test.go
diff --git a/internal/integration/reql_tests/reql_datum_binary_test.go b/internal/integration/reql_tests/reql_datum_binary_test.go
diff --git a/internal/integration/reql_tests/reql_datum_bool_test.go b/internal/integration/reql_tests/reql_datum_bool_test.go
diff --git a/internal/integration/reql_tests/reql_datum_null_test.go b/internal/integration/reql_tests/reql_datum_null_test.go
diff --git a/internal/integration/reql_tests/reql_datum_number_test.go b/internal/integration/reql_tests/reql_datum_number_test.go
diff --git a/internal/integration/reql_tests/reql_datum_object_test.go b/internal/integration/reql_tests/reql_datum_object_test.go
diff --git a/internal/integration/reql_tests/reql_datum_string_test.go b/internal/integration/reql_tests/reql_datum_string_test.go
diff --git a/internal/integration/reql_tests/reql_datum_typeof_test.go b/internal/integration/reql_tests/reql_datum_typeof_test.go
diff --git a/internal/integration/reql_tests/reql_datum_uuid_test.go b/internal/integration/reql_tests/reql_datum_uuid_test.go
diff --git a/internal/integration/reql_tests/reql_default_test.go b/internal/integration/reql_tests/reql_default_test.go
diff --git a/internal/integration/reql_tests/reql_geo_constructors_test.go b/internal/integration/reql_tests/reql_geo_constructors_test.go
diff --git a/internal/integration/reql_tests/reql_geo_geojson_test.go b/internal/integration/reql_tests/reql_geo_geojson_test.go