diff --git a/.travis.yml b/.travis.yml index 5c0bcc1e..ea1e5c56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ go: cache: apt -go_import_path: gopkg.in/rethinkdb/rethinkdb-go.v5 +go_import_path: gopkg.in/rethinkdb/rethinkdb-go.v6 install: go get -t ./... diff --git a/CHANGELOG.md b/CHANGELOG.md index 30fa3682..6d1ee7ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## v6.0.0 - 2019-12-22 + +- 2.4 RethinkDB support +- Added JSON tags to ConnectOpts to make it serializable +- Blocking mocks for responses +- Fix Connect documentation +- Added Type to ChangeResponse +- Added bitwise operations support +- Added write hooks support + ## v5.0.1 - 2018-10-18 - Fix noreply queries memory leak due unnecessary for responses diff --git a/Makefile b/Makefile index 36a82494..2bbaa8a8 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ test: - 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 + test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6 && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6 ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6.bak; true + cp -R . ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6 + go test -coverprofile=cover.out -race gopkg.in/rethinkdb/rethinkdb-go.v6; 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.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 + rm -rf ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6 + test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6.bak && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6.bak ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v6; true diff --git a/README.md b/README.md index 772f651f..6f9c9456 100644 --- 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: v5.1.0 (RethinkDB v2.4) +Current version: v6.0.0 (RethinkDB v2.4) 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](https://rethinkdb. ## Installation ``` -go get gopkg.in/rethinkdb/rethinkdb-go.v5 +go get gopkg.in/rethinkdb/rethinkdb-go.v6 ``` -Replace `v5` with `v4` or `v3` to use previous versions. +Replace `v6` with `v5` or `v4` to use previous versions. ## Example @@ -32,7 +32,7 @@ import ( "fmt" "log" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) func Example() { diff --git a/connection.go b/connection.go index 82689aaa..f9adddc7 100644 --- 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.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" "sync" ) diff --git a/connection_handshake.go b/connection_handshake.go index 2146c9e1..e63d32c3 100644 --- a/connection_handshake.go +++ b/connection_handshake.go @@ -16,7 +16,7 @@ import ( "golang.org/x/crypto/pbkdf2" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) type HandshakeVersion int diff --git a/connection_test.go b/connection_test.go index b96526e5..cf5ab387 100644 --- 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.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" "io" "time" ) diff --git a/cursor.go b/cursor.go index 60463c8e..6be9113d 100644 --- 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.v5/encoding" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + "gopkg.in/rethinkdb/rethinkdb-go.v6/encoding" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) var ( diff --git a/cursor_test.go b/cursor_test.go index 1094babe..41151b2c 100644 --- a/cursor_test.go +++ b/cursor_test.go @@ -2,7 +2,7 @@ package rethinkdb import ( test "gopkg.in/check.v1" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/integration/tests" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/integration/tests" ) type CursorSuite struct{} diff --git a/errors.go b/errors.go index 3bdf48bd..42b98f47 100644 --- a/errors.go +++ b/errors.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) var ( diff --git a/go.mod b/go.mod index 1cc6a101..7e1514b1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gopkg.in/rethinkdb/rethinkdb-go.v5 +module gopkg.in/rethinkdb/rethinkdb-go.v6 require ( github.com/cenkalti/backoff v2.0.0+incompatible @@ -17,3 +17,5 @@ require ( gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 gopkg.in/fatih/pool.v2 v2.0.0 ) + +go 1.13 diff --git a/internal/integration/reql_tests/common.go b/internal/integration/reql_tests/common.go index 7a8dce09..93972f60 100644 --- 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.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/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 index 3f08e2ec..3a9fd35c 100644 --- a/internal/integration/reql_tests/gorethink_test.go +++ b/internal/integration/reql_tests/gorethink_test.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) var url string diff --git a/internal/integration/reql_tests/reql_aggregation_test.go b/internal/integration/reql_tests/reql_aggregation_test.go index 6e3d292d..23790e98 100644 --- a/internal/integration/reql_tests/reql_aggregation_test.go +++ b/internal/integration/reql_tests/reql_aggregation_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/integration/reql_tests/reql_bitwise_test.go b/internal/integration/reql_tests/reql_bitwise_test.go index 857e6e72..1c0c5a16 100644 --- a/internal/integration/reql_tests/reql_bitwise_test.go +++ b/internal/integration/reql_tests/reql_bitwise_test.go @@ -2,7 +2,7 @@ package reql_tests import ( "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" "testing" ) diff --git a/internal/integration/reql_tests/reql_changefeeds_edge_test.go b/internal/integration/reql_tests/reql_changefeeds_edge_test.go index eedac6d0..2312c85f 100644 --- a/internal/integration/reql_tests/reql_changefeeds_edge_test.go +++ b/internal/integration/reql_tests/reql_changefeeds_edge_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test edge cases of changefeed operations diff --git a/internal/integration/reql_tests/reql_changefeeds_idxcopy_test.go b/internal/integration/reql_tests/reql_changefeeds_idxcopy_test.go index 0399aaaa..d8f8af47 100644 --- a/internal/integration/reql_tests/reql_changefeeds_idxcopy_test.go +++ b/internal/integration/reql_tests/reql_changefeeds_idxcopy_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test duplicate indexes with squashing diff --git a/internal/integration/reql_tests/reql_changefeeds_include_states_test.go b/internal/integration/reql_tests/reql_changefeeds_include_states_test.go index f770054a..dbe417d6 100644 --- a/internal/integration/reql_tests/reql_changefeeds_include_states_test.go +++ b/internal/integration/reql_tests/reql_changefeeds_include_states_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test `include_states` diff --git a/internal/integration/reql_tests/reql_changefeeds_point_test.go b/internal/integration/reql_tests/reql_changefeeds_point_test.go index 2627a00f..27e6b936 100644 --- a/internal/integration/reql_tests/reql_changefeeds_point_test.go +++ b/internal/integration/reql_tests/reql_changefeeds_point_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test point changebasics diff --git a/internal/integration/reql_tests/reql_changefeeds_table_test.go b/internal/integration/reql_tests/reql_changefeeds_table_test.go index 5620a08a..54ec74ad 100644 --- a/internal/integration/reql_tests/reql_changefeeds_table_test.go +++ b/internal/integration/reql_tests/reql_changefeeds_table_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test changefeeds on a table diff --git a/internal/integration/reql_tests/reql_control_test.go b/internal/integration/reql_tests/reql_control_test.go index fd328b61..ed15439c 100644 --- a/internal/integration/reql_tests/reql_control_test.go +++ b/internal/integration/reql_tests/reql_control_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests RQL control flow structures diff --git a/internal/integration/reql_tests/reql_datum_array_test.go b/internal/integration/reql_tests/reql_datum_array_test.go index 73a34f5a..07e58ee2 100644 --- a/internal/integration/reql_tests/reql_datum_array_test.go +++ b/internal/integration/reql_tests/reql_datum_array_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests conversion to and from the RQL array type diff --git a/internal/integration/reql_tests/reql_datum_binary_test.go b/internal/integration/reql_tests/reql_datum_binary_test.go index 27426ced..8ab6b1b0 100644 --- a/internal/integration/reql_tests/reql_datum_binary_test.go +++ b/internal/integration/reql_tests/reql_datum_binary_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests of converstion to and from the RQL binary type diff --git a/internal/integration/reql_tests/reql_datum_bool_test.go b/internal/integration/reql_tests/reql_datum_bool_test.go index f09845ca..aafa24a1 100644 --- a/internal/integration/reql_tests/reql_datum_bool_test.go +++ b/internal/integration/reql_tests/reql_datum_bool_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests of conversion to and from the RQL bool type diff --git a/internal/integration/reql_tests/reql_datum_null_test.go b/internal/integration/reql_tests/reql_datum_null_test.go index bf054e93..8ab92929 100644 --- a/internal/integration/reql_tests/reql_datum_null_test.go +++ b/internal/integration/reql_tests/reql_datum_null_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests of conversion to and from the RQL null type diff --git a/internal/integration/reql_tests/reql_datum_number_test.go b/internal/integration/reql_tests/reql_datum_number_test.go index 0c4d6ce1..3864b891 100644 --- a/internal/integration/reql_tests/reql_datum_number_test.go +++ b/internal/integration/reql_tests/reql_datum_number_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests of conversion to and from the RQL number type diff --git a/internal/integration/reql_tests/reql_datum_object_test.go b/internal/integration/reql_tests/reql_datum_object_test.go index ce9490d2..47e2aea9 100644 --- a/internal/integration/reql_tests/reql_datum_object_test.go +++ b/internal/integration/reql_tests/reql_datum_object_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests conversion to and from the RQL object type diff --git a/internal/integration/reql_tests/reql_datum_string_test.go b/internal/integration/reql_tests/reql_datum_string_test.go index e67cbb0f..00060396 100644 --- a/internal/integration/reql_tests/reql_datum_string_test.go +++ b/internal/integration/reql_tests/reql_datum_string_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests of converstion to and from the RQL string type diff --git a/internal/integration/reql_tests/reql_datum_typeof_test.go b/internal/integration/reql_tests/reql_datum_typeof_test.go index 00c10373..1350c85a 100644 --- a/internal/integration/reql_tests/reql_datum_typeof_test.go +++ b/internal/integration/reql_tests/reql_datum_typeof_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // These tests test the type of command diff --git a/internal/integration/reql_tests/reql_datum_uuid_test.go b/internal/integration/reql_tests/reql_datum_uuid_test.go index 5a295759..d690c915 100644 --- a/internal/integration/reql_tests/reql_datum_uuid_test.go +++ b/internal/integration/reql_tests/reql_datum_uuid_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test that UUIDs work diff --git a/internal/integration/reql_tests/reql_default_test.go b/internal/integration/reql_tests/reql_default_test.go index 553dfaa2..53ed772f 100644 --- a/internal/integration/reql_tests/reql_default_test.go +++ b/internal/integration/reql_tests/reql_default_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests r.default diff --git a/internal/integration/reql_tests/reql_geo_constructors_test.go b/internal/integration/reql_tests/reql_geo_constructors_test.go index a301de6a..9679054f 100644 --- a/internal/integration/reql_tests/reql_geo_constructors_test.go +++ b/internal/integration/reql_tests/reql_geo_constructors_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test geo constructors diff --git a/internal/integration/reql_tests/reql_geo_geojson_test.go b/internal/integration/reql_tests/reql_geo_geojson_test.go index 6cad7c49..4d7a022e 100644 --- a/internal/integration/reql_tests/reql_geo_geojson_test.go +++ b/internal/integration/reql_tests/reql_geo_geojson_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test geoJSON conversion diff --git a/internal/integration/reql_tests/reql_geo_indexing_test.go b/internal/integration/reql_tests/reql_geo_indexing_test.go index ffc5dd7c..503886fd 100644 --- a/internal/integration/reql_tests/reql_geo_indexing_test.go +++ b/internal/integration/reql_tests/reql_geo_indexing_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test ReQL interface to geo indexes diff --git a/internal/integration/reql_tests/reql_geo_intersection_inclusion_test.go b/internal/integration/reql_tests/reql_geo_intersection_inclusion_test.go index f10333e4..97c6f3a1 100644 --- a/internal/integration/reql_tests/reql_geo_intersection_inclusion_test.go +++ b/internal/integration/reql_tests/reql_geo_intersection_inclusion_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test intersects and includes semantics diff --git a/internal/integration/reql_tests/reql_geo_operations_test.go b/internal/integration/reql_tests/reql_geo_operations_test.go index 141774a5..fd9ddbdc 100644 --- a/internal/integration/reql_tests/reql_geo_operations_test.go +++ b/internal/integration/reql_tests/reql_geo_operations_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test basic geometry operators diff --git a/internal/integration/reql_tests/reql_geo_primitives_test.go b/internal/integration/reql_tests/reql_geo_primitives_test.go index 2e123900..f5dc841c 100644 --- a/internal/integration/reql_tests/reql_geo_primitives_test.go +++ b/internal/integration/reql_tests/reql_geo_primitives_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test geometric primitive constructors diff --git a/internal/integration/reql_tests/reql_joins_test.go b/internal/integration/reql_tests/reql_joins_test.go index 8cf676b9..2592fd4b 100644 --- a/internal/integration/reql_tests/reql_joins_test.go +++ b/internal/integration/reql_tests/reql_joins_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/integration/reql_tests/reql_json_test.go b/internal/integration/reql_tests/reql_json_test.go index 44df4772..2e1f6221 100644 --- a/internal/integration/reql_tests/reql_json_test.go +++ b/internal/integration/reql_tests/reql_json_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests RQL json parsing diff --git a/internal/integration/reql_tests/reql_match_test.go b/internal/integration/reql_tests/reql_match_test.go index 4d76ee8d..b6a930a0 100644 --- a/internal/integration/reql_tests/reql_match_test.go +++ b/internal/integration/reql_tests/reql_match_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for match diff --git a/internal/integration/reql_tests/reql_math_logic_add_test.go b/internal/integration/reql_tests/reql_math_logic_add_test.go index 8d20ff85..e17d0be6 100644 --- a/internal/integration/reql_tests/reql_math_logic_add_test.go +++ b/internal/integration/reql_tests/reql_math_logic_add_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for basic usage of the add operation diff --git a/internal/integration/reql_tests/reql_math_logic_aliases_test.go b/internal/integration/reql_tests/reql_math_logic_aliases_test.go index 54fda3b5..57c5ab5c 100644 --- a/internal/integration/reql_tests/reql_math_logic_aliases_test.go +++ b/internal/integration/reql_tests/reql_math_logic_aliases_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test named aliases for math and logic operators diff --git a/internal/integration/reql_tests/reql_math_logic_comparison_test.go b/internal/integration/reql_tests/reql_math_logic_comparison_test.go index 1361fffa..59143a6a 100644 --- a/internal/integration/reql_tests/reql_math_logic_comparison_test.go +++ b/internal/integration/reql_tests/reql_math_logic_comparison_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests of comparison operators diff --git a/internal/integration/reql_tests/reql_math_logic_div_test.go b/internal/integration/reql_tests/reql_math_logic_div_test.go index 2172b2ba..237ae40c 100644 --- a/internal/integration/reql_tests/reql_math_logic_div_test.go +++ b/internal/integration/reql_tests/reql_math_logic_div_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for the basic usage of the division operation diff --git a/internal/integration/reql_tests/reql_math_logic_floor_ceil_round_test.go b/internal/integration/reql_tests/reql_math_logic_floor_ceil_round_test.go index 5faa4bd4..44fcd893 100644 --- a/internal/integration/reql_tests/reql_math_logic_floor_ceil_round_test.go +++ b/internal/integration/reql_tests/reql_math_logic_floor_ceil_round_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // tests for `floor`, `ceil`, and `round`, tests inspired by the Python test suite diff --git a/internal/integration/reql_tests/reql_math_logic_logic_test.go b/internal/integration/reql_tests/reql_math_logic_logic_test.go index 1814ac7f..bdc981e9 100644 --- a/internal/integration/reql_tests/reql_math_logic_logic_test.go +++ b/internal/integration/reql_tests/reql_math_logic_logic_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // These tests are aimed at &&, ||, and ! diff --git a/internal/integration/reql_tests/reql_math_logic_math_test.go b/internal/integration/reql_tests/reql_math_logic_math_test.go index 76b82b52..dbd99205 100644 --- a/internal/integration/reql_tests/reql_math_logic_math_test.go +++ b/internal/integration/reql_tests/reql_math_logic_math_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests of nested arithmetic expressions diff --git a/internal/integration/reql_tests/reql_math_logic_mod_test.go b/internal/integration/reql_tests/reql_math_logic_mod_test.go index f7628198..8a2d4e7f 100644 --- a/internal/integration/reql_tests/reql_math_logic_mod_test.go +++ b/internal/integration/reql_tests/reql_math_logic_mod_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for the basic usage of the mod operation diff --git a/internal/integration/reql_tests/reql_math_logic_mul_test.go b/internal/integration/reql_tests/reql_math_logic_mul_test.go index f20511f0..c679def4 100644 --- a/internal/integration/reql_tests/reql_math_logic_mul_test.go +++ b/internal/integration/reql_tests/reql_math_logic_mul_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for the basic usage of the multiplication operation diff --git a/internal/integration/reql_tests/reql_math_logic_sub_test.go b/internal/integration/reql_tests/reql_math_logic_sub_test.go index 365fea6f..535f382c 100644 --- a/internal/integration/reql_tests/reql_math_logic_sub_test.go +++ b/internal/integration/reql_tests/reql_math_logic_sub_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for basic usage of the subtraction operation diff --git a/internal/integration/reql_tests/reql_meta_composite_test.go b/internal/integration/reql_tests/reql_meta_composite_test.go index 85e91456..9a0a0a7d 100644 --- a/internal/integration/reql_tests/reql_meta_composite_test.go +++ b/internal/integration/reql_tests/reql_meta_composite_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests meta operations in composite queries diff --git a/internal/integration/reql_tests/reql_meta_dbs_test.go b/internal/integration/reql_tests/reql_meta_dbs_test.go index 3fccb600..de845668 100644 --- a/internal/integration/reql_tests/reql_meta_dbs_test.go +++ b/internal/integration/reql_tests/reql_meta_dbs_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests meta queries for databases diff --git a/internal/integration/reql_tests/reql_meta_table_test.go b/internal/integration/reql_tests/reql_meta_table_test.go index 39e5da28..88545998 100644 --- a/internal/integration/reql_tests/reql_meta_table_test.go +++ b/internal/integration/reql_tests/reql_meta_table_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests meta queries for creating and deleting tables diff --git a/internal/integration/reql_tests/reql_mutation_atomic_get_set_test.go b/internal/integration/reql_tests/reql_mutation_atomic_get_set_test.go index ebbe0d68..1ff77ff4 100644 --- a/internal/integration/reql_tests/reql_mutation_atomic_get_set_test.go +++ b/internal/integration/reql_tests/reql_mutation_atomic_get_set_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests replacement of selections diff --git a/internal/integration/reql_tests/reql_mutation_delete_test.go b/internal/integration/reql_tests/reql_mutation_delete_test.go index 4e15d342..94989ac0 100644 --- a/internal/integration/reql_tests/reql_mutation_delete_test.go +++ b/internal/integration/reql_tests/reql_mutation_delete_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests deletes of selections diff --git a/internal/integration/reql_tests/reql_mutation_insert_test.go b/internal/integration/reql_tests/reql_mutation_insert_test.go index 84fcfc4e..4229a206 100644 --- a/internal/integration/reql_tests/reql_mutation_insert_test.go +++ b/internal/integration/reql_tests/reql_mutation_insert_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests insertion into tables diff --git a/internal/integration/reql_tests/reql_mutation_replace_test.go b/internal/integration/reql_tests/reql_mutation_replace_test.go index 2dd55f2f..ddabeb13 100644 --- a/internal/integration/reql_tests/reql_mutation_replace_test.go +++ b/internal/integration/reql_tests/reql_mutation_replace_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests replacement of selections diff --git a/internal/integration/reql_tests/reql_mutation_sync_test.go b/internal/integration/reql_tests/reql_mutation_sync_test.go index 676e0718..79e736f4 100644 --- a/internal/integration/reql_tests/reql_mutation_sync_test.go +++ b/internal/integration/reql_tests/reql_mutation_sync_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests syncing tables diff --git a/internal/integration/reql_tests/reql_mutation_update_test.go b/internal/integration/reql_tests/reql_mutation_update_test.go index 27f4f1a9..707e544a 100644 --- a/internal/integration/reql_tests/reql_mutation_update_test.go +++ b/internal/integration/reql_tests/reql_mutation_update_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests updates of selections diff --git a/internal/integration/reql_tests/reql_polymorphism_test.go b/internal/integration/reql_tests/reql_polymorphism_test.go index c22a4f8f..213516a0 100644 --- a/internal/integration/reql_tests/reql_polymorphism_test.go +++ b/internal/integration/reql_tests/reql_polymorphism_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/integration/reql_tests/reql_random_test.go b/internal/integration/reql_tests/reql_random_test.go index 5f48a57f..d6f4e4d6 100644 --- a/internal/integration/reql_tests/reql_random_test.go +++ b/internal/integration/reql_tests/reql_random_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests randomization functions diff --git a/internal/integration/reql_tests/reql_range_test.go b/internal/integration/reql_tests/reql_range_test.go index c7072244..fe1fc874 100644 --- a/internal/integration/reql_tests/reql_range_test.go +++ b/internal/integration/reql_tests/reql_range_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests RQL range generation diff --git a/internal/integration/reql_tests/reql_selection_test.go b/internal/integration/reql_tests/reql_selection_test.go index 37aec602..eab05435 100644 --- a/internal/integration/reql_tests/reql_selection_test.go +++ b/internal/integration/reql_tests/reql_selection_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/integration/reql_tests/reql_sindex_api_test.go b/internal/integration/reql_tests/reql_sindex_api_test.go index 5f6b8869..8761cbcc 100644 --- a/internal/integration/reql_tests/reql_sindex_api_test.go +++ b/internal/integration/reql_tests/reql_sindex_api_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // sindex api (#602) diff --git a/internal/integration/reql_tests/reql_sindex_nullsinstrings_test.go b/internal/integration/reql_tests/reql_sindex_nullsinstrings_test.go index d09cd03f..51ae2f27 100644 --- a/internal/integration/reql_tests/reql_sindex_nullsinstrings_test.go +++ b/internal/integration/reql_tests/reql_sindex_nullsinstrings_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // sindex nulls in strings diff --git a/internal/integration/reql_tests/reql_sindex_status_test.go b/internal/integration/reql_tests/reql_sindex_status_test.go index 30a0a34d..468d072b 100644 --- a/internal/integration/reql_tests/reql_sindex_status_test.go +++ b/internal/integration/reql_tests/reql_sindex_status_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // sindex status diff --git a/internal/integration/reql_tests/reql_timeout_test.go b/internal/integration/reql_tests/reql_timeout_test.go index 14fdcbd8..0a15306a 100644 --- a/internal/integration/reql_tests/reql_timeout_test.go +++ b/internal/integration/reql_tests/reql_timeout_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests timeouts. diff --git a/internal/integration/reql_tests/reql_times_api_test.go b/internal/integration/reql_tests/reql_times_api_test.go index ad44c55a..39e66acc 100644 --- a/internal/integration/reql_tests/reql_times_api_test.go +++ b/internal/integration/reql_tests/reql_times_api_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // date/time api (#977) diff --git a/internal/integration/reql_tests/reql_times_constructors_test.go b/internal/integration/reql_tests/reql_times_constructors_test.go index 1022e41c..59ef3443 100644 --- a/internal/integration/reql_tests/reql_times_constructors_test.go +++ b/internal/integration/reql_tests/reql_times_constructors_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test basic time arithmetic diff --git a/internal/integration/reql_tests/reql_times_index_test.go b/internal/integration/reql_tests/reql_times_index_test.go index dda45e48..5af6e062 100644 --- a/internal/integration/reql_tests/reql_times_index_test.go +++ b/internal/integration/reql_tests/reql_times_index_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // secondary indexes on times diff --git a/internal/integration/reql_tests/reql_times_portions_test.go b/internal/integration/reql_tests/reql_times_portions_test.go index 3f2bba73..29686ac4 100644 --- a/internal/integration/reql_tests/reql_times_portions_test.go +++ b/internal/integration/reql_tests/reql_times_portions_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // accessing portions diff --git a/internal/integration/reql_tests/reql_times_shim_test.go b/internal/integration/reql_tests/reql_times_shim_test.go index f2b0be5f..86a572b4 100644 --- a/internal/integration/reql_tests/reql_times_shim_test.go +++ b/internal/integration/reql_tests/reql_times_shim_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test the native shims. diff --git a/internal/integration/reql_tests/reql_times_time_arith_test.go b/internal/integration/reql_tests/reql_times_time_arith_test.go index 9d2382ff..3ce18962 100644 --- a/internal/integration/reql_tests/reql_times_time_arith_test.go +++ b/internal/integration/reql_tests/reql_times_time_arith_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test basic time arithmetic diff --git a/internal/integration/reql_tests/reql_times_timezones_test.go b/internal/integration/reql_tests/reql_times_timezones_test.go index 31f0d90b..af0d1b59 100644 --- a/internal/integration/reql_tests/reql_times_timezones_test.go +++ b/internal/integration/reql_tests/reql_times_timezones_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Test basic timezone manipulation diff --git a/internal/integration/reql_tests/reql_transform_array_test.go b/internal/integration/reql_tests/reql_transform_array_test.go index e1a6c610..47c7c4c8 100644 --- a/internal/integration/reql_tests/reql_transform_array_test.go +++ b/internal/integration/reql_tests/reql_transform_array_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests manipulation operations on arrays diff --git a/internal/integration/reql_tests/reql_transform_fold_test.go b/internal/integration/reql_tests/reql_transform_fold_test.go index 03519480..2ac424e8 100644 --- a/internal/integration/reql_tests/reql_transform_fold_test.go +++ b/internal/integration/reql_tests/reql_transform_fold_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for the fold term diff --git a/internal/integration/reql_tests/reql_transform_map_test.go b/internal/integration/reql_tests/reql_transform_map_test.go index 03069cf2..98b29ce4 100644 --- a/internal/integration/reql_tests/reql_transform_map_test.go +++ b/internal/integration/reql_tests/reql_transform_map_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests the RQL `map` function diff --git a/internal/integration/reql_tests/reql_transform_object_test.go b/internal/integration/reql_tests/reql_transform_object_test.go index 3e3cbf76..5a5009e6 100644 --- a/internal/integration/reql_tests/reql_transform_object_test.go +++ b/internal/integration/reql_tests/reql_transform_object_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests manipulation operations on objects diff --git a/internal/integration/reql_tests/reql_transform_table_test.go b/internal/integration/reql_tests/reql_transform_table_test.go index 24c604e8..2c9583d0 100644 --- a/internal/integration/reql_tests/reql_transform_table_test.go +++ b/internal/integration/reql_tests/reql_transform_table_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests manipulation operations on tables diff --git a/internal/integration/reql_tests/reql_transform_unordered_map_test.go b/internal/integration/reql_tests/reql_transform_unordered_map_test.go index 3037221d..5ec1e341 100644 --- a/internal/integration/reql_tests/reql_transform_unordered_map_test.go +++ b/internal/integration/reql_tests/reql_transform_unordered_map_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests for ordered_union diff --git a/internal/integration/reql_tests/reql_transformation_test.go b/internal/integration/reql_tests/reql_transformation_test.go index 9363601c..529f6e51 100644 --- a/internal/integration/reql_tests/reql_transformation_test.go +++ b/internal/integration/reql_tests/reql_transformation_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/integration/reql_tests/reql_writehook_test.go b/internal/integration/reql_tests/reql_writehook_test.go index 3a77d8c4..2dd42679 100644 --- a/internal/integration/reql_tests/reql_writehook_test.go +++ b/internal/integration/reql_tests/reql_writehook_test.go @@ -2,8 +2,8 @@ package reql_tests import ( "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" "testing" ) diff --git a/internal/integration/reql_tests/template.go.tpl b/internal/integration/reql_tests/template.go.tpl index f649f234..9a001956 100644 --- a/internal/integration/reql_tests/template.go.tpl +++ b/internal/integration/reql_tests/template.go.tpl @@ -5,8 +5,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/compare" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/compare" ) // ${description} diff --git a/internal/integration/tests/benchmarks_test.go b/internal/integration/tests/benchmarks_test.go index 19f45a3e..f2d9300d 100644 --- a/internal/integration/tests/benchmarks_test.go +++ b/internal/integration/tests/benchmarks_test.go @@ -1,7 +1,7 @@ package tests import ( - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" "math/rand" "strconv" "sync" diff --git a/internal/integration/tests/checkers.go b/internal/integration/tests/checkers.go index 193f62bd..14ec7bbc 100644 --- a/internal/integration/tests/checkers.go +++ b/internal/integration/tests/checkers.go @@ -6,7 +6,7 @@ import ( test "gopkg.in/check.v1" - "gopkg.in/rethinkdb/rethinkdb-go.v5/types" + "gopkg.in/rethinkdb/rethinkdb-go.v6/types" ) type jsonChecker struct { diff --git a/internal/integration/tests/cluster_integration_test.go b/internal/integration/tests/cluster_integration_test.go index 21989ebd..1f2235b4 100644 --- a/internal/integration/tests/cluster_integration_test.go +++ b/internal/integration/tests/cluster_integration_test.go @@ -7,7 +7,7 @@ import ( "time" test "gopkg.in/check.v1" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" "strconv" "strings" ) diff --git a/internal/integration/tests/cluster_test.go b/internal/integration/tests/cluster_test.go index 98af6389..661a64c4 100644 --- a/internal/integration/tests/cluster_test.go +++ b/internal/integration/tests/cluster_test.go @@ -7,7 +7,7 @@ import ( "time" test "gopkg.in/check.v1" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) func (s *RethinkSuite) TestClusterConnect(c *test.C) { diff --git a/internal/integration/tests/cursor_test.go b/internal/integration/tests/cursor_test.go index 3ac6fc09..2f05e372 100644 --- a/internal/integration/tests/cursor_test.go +++ b/internal/integration/tests/cursor_test.go @@ -5,7 +5,7 @@ import ( "time" test "gopkg.in/check.v1" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) type object struct { diff --git a/internal/integration/tests/example_connect_test.go b/internal/integration/tests/example_connect_test.go index 4d2ff11b..84aa4a42 100644 --- a/internal/integration/tests/example_connect_test.go +++ b/internal/integration/tests/example_connect_test.go @@ -4,7 +4,7 @@ import ( "log" "os" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) var sessionEx *r.Session diff --git a/internal/integration/tests/example_query_aggregation_test.go b/internal/integration/tests/example_query_aggregation_test.go index e32757f5..8da8548d 100644 --- a/internal/integration/tests/example_query_aggregation_test.go +++ b/internal/integration/tests/example_query_aggregation_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Group games by player. diff --git a/internal/integration/tests/example_query_control_test.go b/internal/integration/tests/example_query_control_test.go index 2c98582a..362a018f 100644 --- a/internal/integration/tests/example_query_control_test.go +++ b/internal/integration/tests/example_query_control_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Return heroes and superheroes. diff --git a/internal/integration/tests/example_query_db_test.go b/internal/integration/tests/example_query_db_test.go index 05d1d7a4..d3f3cb34 100644 --- a/internal/integration/tests/example_query_db_test.go +++ b/internal/integration/tests/example_query_db_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Create a database named ’superheroes’. diff --git a/internal/integration/tests/example_query_manipulation_test.go b/internal/integration/tests/example_query_manipulation_test.go index 5e37191c..e9fd513f 100644 --- a/internal/integration/tests/example_query_manipulation_test.go +++ b/internal/integration/tests/example_query_manipulation_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Get john's age diff --git a/internal/integration/tests/example_query_select_test.go b/internal/integration/tests/example_query_select_test.go index 80097916..60afad56 100644 --- a/internal/integration/tests/example_query_select_test.go +++ b/internal/integration/tests/example_query_select_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Find a document by ID. diff --git a/internal/integration/tests/example_query_table_test.go b/internal/integration/tests/example_query_table_test.go index 2d61b68e..f83ab42e 100644 --- a/internal/integration/tests/example_query_table_test.go +++ b/internal/integration/tests/example_query_table_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Create a table named "table" with the default settings. diff --git a/internal/integration/tests/example_query_transformation_test.go b/internal/integration/tests/example_query_transformation_test.go index 7580b905..d3f0d75a 100644 --- a/internal/integration/tests/example_query_transformation_test.go +++ b/internal/integration/tests/example_query_transformation_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Return the first five squares. diff --git a/internal/integration/tests/example_query_write_test.go b/internal/integration/tests/example_query_write_test.go index 02d55bc7..274c9ee0 100644 --- a/internal/integration/tests/example_query_write_test.go +++ b/internal/integration/tests/example_query_write_test.go @@ -2,7 +2,7 @@ package tests import ( "fmt" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) // Insert a document into the table posts using a struct. diff --git a/internal/integration/tests/example_test.go b/internal/integration/tests/example_test.go index 06456144..39113e8f 100644 --- a/internal/integration/tests/example_test.go +++ b/internal/integration/tests/example_test.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) func Example() { diff --git a/internal/integration/tests/query_test.go b/internal/integration/tests/query_test.go index ede6834a..77334895 100644 --- a/internal/integration/tests/query_test.go +++ b/internal/integration/tests/query_test.go @@ -8,7 +8,7 @@ import ( "time" test "gopkg.in/check.v1" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) func (s *RethinkSuite) TestQueryRun(c *test.C) { diff --git a/internal/integration/tests/rethinkdb_test.go b/internal/integration/tests/rethinkdb_test.go index 70dd4eb0..db2c7a65 100644 --- a/internal/integration/tests/rethinkdb_test.go +++ b/internal/integration/tests/rethinkdb_test.go @@ -11,7 +11,7 @@ import ( "time" test "gopkg.in/check.v1" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) var session *r.Session diff --git a/internal/integration/tests/session_test.go b/internal/integration/tests/session_test.go index 68485bbb..f250df70 100644 --- a/internal/integration/tests/session_test.go +++ b/internal/integration/tests/session_test.go @@ -5,7 +5,7 @@ import ( "time" test "gopkg.in/check.v1" - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) func (s *RethinkSuite) TestSessionConnect(c *test.C) { diff --git a/internal/integration/tests/testdata_test.go b/internal/integration/tests/testdata_test.go index 29cdc323..65b6e975 100644 --- a/internal/integration/tests/testdata_test.go +++ b/internal/integration/tests/testdata_test.go @@ -1,7 +1,7 @@ package tests import ( - r "gopkg.in/rethinkdb/rethinkdb-go.v5" + r "gopkg.in/rethinkdb/rethinkdb-go.v6" ) func setupTestData() { diff --git a/mock.go b/mock.go index 5b0d26c3..733df587 100644 --- a/mock.go +++ b/mock.go @@ -5,14 +5,14 @@ import ( "encoding/json" "fmt" "gopkg.in/check.v1" - "gopkg.in/rethinkdb/rethinkdb-go.v5/encoding" + "gopkg.in/rethinkdb/rethinkdb-go.v6/encoding" "net" "reflect" "sync" "time" "golang.org/x/net/context" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Mocking is based on the amazing package github.com/stretchr/testify diff --git a/mock_test.go b/mock_test.go index e1baa13b..041dda21 100644 --- a/mock_test.go +++ b/mock_test.go @@ -6,7 +6,7 @@ import ( "testing" test "gopkg.in/check.v1" - "gopkg.in/rethinkdb/rethinkdb-go.v5/internal/integration/tests" + "gopkg.in/rethinkdb/rethinkdb-go.v6/internal/integration/tests" ) // Hook up gocheck into the gotest runner. diff --git a/node.go b/node.go index 683c4e13..73009665 100644 --- a/node.go +++ b/node.go @@ -4,7 +4,7 @@ import ( "sync" "golang.org/x/net/context" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Node represents a database server in the cluster diff --git a/pseudotypes.go b/pseudotypes.go index 532cc709..6ed2ef00 100644 --- a/pseudotypes.go +++ b/pseudotypes.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "gopkg.in/rethinkdb/rethinkdb-go.v5/types" + "gopkg.in/rethinkdb/rethinkdb-go.v6/types" "fmt" ) diff --git a/query.go b/query.go index 11d5543c..eb385d3a 100644 --- a/query.go +++ b/query.go @@ -7,7 +7,7 @@ import ( "strings" "golang.org/x/net/context" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // A Query represents a query ready to be sent to the database, A Query differs diff --git a/query_admin.go b/query_admin.go index b2f21307..fcd9b8ed 100644 --- a/query_admin.go +++ b/query_admin.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Config can be used to read and/or update the configurations for individual diff --git a/query_aggregation.go b/query_aggregation.go index c7ff1f65..598691c7 100644 --- a/query_aggregation.go +++ b/query_aggregation.go @@ -1,6 +1,6 @@ package rethinkdb -import p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" +import p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" // Aggregation // These commands are used to compute smaller values from large sequences. diff --git a/query_bitwise.go b/query_bitwise.go index 71e9445c..5079d92b 100644 --- a/query_bitwise.go +++ b/query_bitwise.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Rethinkdb proposal: https://github.com/rethinkdb/rethinkdb/pull/6534 diff --git a/query_control.go b/query_control.go index 9b84077f..aab290ee 100644 --- a/query_control.go +++ b/query_control.go @@ -6,7 +6,7 @@ import ( "reflect" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Expr converts any value to an expression and is also used by many other terms diff --git a/query_db.go b/query_db.go index 4ed3371a..bbfec019 100644 --- a/query_db.go +++ b/query_db.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // DBCreate creates a database. A RethinkDB database is a collection of tables, diff --git a/query_geospatial.go b/query_geospatial.go index c8484d2b..76817e18 100644 --- a/query_geospatial.go +++ b/query_geospatial.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // CircleOpts contains the optional arguments for the Circle term. diff --git a/query_helpers.go b/query_helpers.go index 376b37c1..70889895 100644 --- a/query_helpers.go +++ b/query_helpers.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) func newStopQuery(token int64) Query { diff --git a/query_join.go b/query_join.go index 4ca8e599..1f97616b 100644 --- a/query_join.go +++ b/query_join.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // InnerJoin returns the inner product of two sequences (e.g. a table, a filter result) diff --git a/query_manipulation.go b/query_manipulation.go index a265d5b0..c6d93592 100644 --- a/query_manipulation.go +++ b/query_manipulation.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Row returns the currently visited document. Note that Row does not work within diff --git a/query_math.go b/query_math.go index fa32b534..7f3c5c4e 100644 --- a/query_math.go +++ b/query_math.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) var ( diff --git a/query_select.go b/query_select.go index 32714d4f..4db5d9cb 100644 --- a/query_select.go +++ b/query_select.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // DB references a database. diff --git a/query_string.go b/query_string.go index 072fd149..f27884c5 100644 --- a/query_string.go +++ b/query_string.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Match matches against a regular expression. If no match is found, returns diff --git a/query_table.go b/query_table.go index ea0b238a..069fc86e 100644 --- a/query_table.go +++ b/query_table.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // TableCreateOpts contains the optional arguments for the TableCreate term diff --git a/query_time.go b/query_time.go index c2f22d86..00644f30 100644 --- a/query_time.go +++ b/query_time.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Now returns a time object representing the current time in UTC diff --git a/query_transformation.go b/query_transformation.go index 0df1d4d7..26284738 100644 --- a/query_transformation.go +++ b/query_transformation.go @@ -1,6 +1,6 @@ package rethinkdb -import p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" +import p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" // Map transform each element of the sequence by applying the given mapping // function. It takes two arguments, a sequence and a function of type diff --git a/query_write.go b/query_write.go index fd78f2a2..d210791a 100644 --- a/query_write.go +++ b/query_write.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // InsertOpts contains the optional arguments for the Insert term diff --git a/query_write_hooks.go b/query_write_hooks.go index 697a7753..d9a16958 100644 --- a/query_write_hooks.go +++ b/query_write_hooks.go @@ -1,7 +1,7 @@ package rethinkdb import ( - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Rethinkdb proposal: https://github.com/rethinkdb/rethinkdb/issues/5813 diff --git a/rethinkdb.go b/rethinkdb.go index a4354870..0a22bf72 100644 --- a/rethinkdb.go +++ b/rethinkdb.go @@ -5,7 +5,7 @@ import ( "github.com/sirupsen/logrus" - "gopkg.in/rethinkdb/rethinkdb-go.v5/encoding" + "gopkg.in/rethinkdb/rethinkdb-go.v6/encoding" "io/ioutil" ) diff --git a/session.go b/session.go index a90c3059..eefcfd03 100644 --- a/session.go +++ b/session.go @@ -6,7 +6,7 @@ import ( "time" "golang.org/x/net/context" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // A Session represents a connection to a RethinkDB cluster and should be used diff --git a/utils.go b/utils.go index cbf084bc..878bac1a 100644 --- a/utils.go +++ b/utils.go @@ -6,8 +6,8 @@ import ( "strings" "sync/atomic" - "gopkg.in/rethinkdb/rethinkdb-go.v5/encoding" - p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2" + "gopkg.in/rethinkdb/rethinkdb-go.v6/encoding" + p "gopkg.in/rethinkdb/rethinkdb-go.v6/ql2" ) // Helper functions for constructing terms