diff --git a/.travis.yml b/.travis.yml index 38c2eab7..f8aacceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ go: cache: apt -go_import_path: gopkg.in/dancannon/gorethink.v2 +go_import_path: gopkg.in/gorethink/gorethink.v2 before_script: - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list diff --git a/CHANGELOG.md b/CHANGELOG.md index 498c0cae..a36dbce5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,12 @@ Unfortunately this will likely be the last release I plan to work on. This is du I hope you understand my decision to step back from the project, if you have any questions or would be interested in take over some of the maintenance of the project please let me know. To make this process easier I have also decided to move the repository to the GoRethink organisation. All existing imports _should_ still work. +Thanks to everybody who got involved with this project over the last ~4 years and helped out, I have truly enjoyed the time I have spent building this library and I hope both RethinkDB and this driver manage to keep going. + ### Changed -- Fixed behaviour when unmarshaling nil slices + - Moved project to `gorethink` organisation + - Fixed behaviour when unmarshaling nil slices ### Fixed @@ -355,7 +358,7 @@ r.Connect( 1.0.0 is finally here, This is the first stable production ready release of GoRethink! -![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker.png "Golang Gopher and RethinkDB Thinker") +![GoRethink Logo](https://raw.github.com/wiki/gorethink/gorethink/gopher-and-thinker.png "Golang Gopher and RethinkDB Thinker") In an attempt to make this library more "idiomatic" some functions have been renamed, for the full list of changes and bug fixes see below. @@ -421,7 +424,7 @@ if err != nil { } ``` -Also added was the ability to read from a cursor using a channel, this is especially useful when using changefeeds. For more information see this [gist](https://gist.github.com/dancannon/2865686d163ed78bbc3c) +Also added was the ability to read from a cursor using a channel, this is especially useful when using changefeeds. For more information see this [gist](https://gist.github.com/gorethink/2865686d163ed78bbc3c) ```go cursor, err := r.Table("items").Changes() @@ -429,7 +432,7 @@ ch := make(chan map[string]interface{}) cursor.Listen(ch) ``` -For more details checkout the [README](https://github.com/dancannon/gorethink/blob/master/README.md) and [godoc](https://godoc.org/github.com/dancannon/gorethink). As always if you have any further questions send me a message on [Gitter](https://gitter.im/dancannon/gorethink). +For more details checkout the [README](https://github.com/gorethink/gorethink/blob/master/README.md) and [godoc](https://godoc.org/github.com/gorethink/gorethink). As always if you have any further questions send me a message on [Gitter](https://gitter.im/gorethink/gorethink). - Added the ability to connect to multiple nodes, queries are then distributed between these nodes. If a node stops responding then queries stop being sent to this node. - Added the `DiscoverHosts` optional argument to `ConnectOpts`, when this value is `true` the driver will listen for new nodes added to the cluster. diff --git a/README.md b/README.md index 0b66ad66..fe7c1f78 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,17 @@ # GoRethink - RethinkDB Driver for Go -[![GitHub tag](https://img.shields.io/github/tag/dancannon/gorethink.svg?style=flat)](https://github.com/dancannon/gorethink/releases) -[![GoDoc](https://godoc.org/github.com/dancannon/gorethink?status.png)](https://godoc.org/github.com/dancannon/gorethink) -[![build status](https://img.shields.io/travis/dancannon/gorethink/master.svg "build status")](https://travis-ci.org/dancannon/gorethink) +[![GitHub tag](https://img.shields.io/github/tag/gorethink/gorethink.svg?style=flat)](https://github.com/gorethink/gorethink/releases) +[![GoDoc](https://godoc.org/github.com/gorethink/gorethink?status.png)](https://godoc.org/github.com/gorethink/gorethink) +[![build status](https://img.shields.io/travis/gorethink/gorethink/master.svg "build status")](https://travis-ci.org/gorethink/gorethink) [![No Maintenance Intended](http://unmaintained.tech/badge.svg)](http://unmaintained.tech/) [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) -![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker") +![GoRethink Logo](https://raw.github.com/wiki/gorethink/gorethink/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker") -Current version: v2.2.2 (RethinkDB v2.3) +Current version: v3.0.0 (RethinkDB v2.3) + +This project is no longer maintained, for more information see the [v3.0.0 release](https://github.com/gorethink/gorethink/releases/tag/v3.0.0) 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). @@ -18,13 +20,13 @@ If you need any help you can find me on the [RethinkDB slack](http://slack.rethi ## Installation ``` -go get gopkg.in/dancannon/gorethink.v2 +go get gopkg.in/gorethink/gorethink.v2 ``` (Or v1) ```sh -go get gopkg.in/dancannon/gorethink.v1 +go get gopkg.in/gorethink/gorethink.v1 ``` ## Example @@ -37,7 +39,7 @@ import ( "fmt" "log" - r "gopkg.in/dancannon/gorethink.v2" + r "gopkg.in/gorethink/gorethink.v2" ) func Example() { @@ -86,7 +88,7 @@ func ExampleConnect() { } ``` -See the [documentation](http://godoc.org/github.com/dancannon/gorethink#Connect) for a list of supported arguments to Connect(). +See the [documentation](http://godoc.org/github.com/gorethink/gorethink#Connect) for a list of supported arguments to Connect(). ### Connection Pool @@ -165,7 +167,7 @@ Please note that `DiscoverHosts` will not work with user authentication at this This library is based on the official drivers so the code on the [API](http://www.rethinkdb.com/api/) page should require very few changes to work. -To view full documentation for the query functions check the [API reference](https://github.com/dancannon/gorethink/wiki/Go-ReQL-command-reference) or [GoDoc](http://godoc.org/github.com/dancannon/gorethink#Term) +To view full documentation for the query functions check the [API reference](https://github.com/gorethink/gorethink/wiki/Go-ReQL-command-reference) or [GoDoc](http://godoc.org/github.com/gorethink/gorethink#Term) Slice Expr Example ```go @@ -308,7 +310,7 @@ If you wish to use the `json` tags for GoRethink then you can call `SetTags("gor RethinkDB contains some special types which can be used to store special value types, currently supports are binary values, times and geometry data types. GoRethink supports these data types natively however there are some gotchas: - Time types: To store times in RethinkDB with GoRethink you must pass a `time.Time` value to your query, due to the way Go works type aliasing or embedding is not support here - Binary types: To store binary data pass a byte slice (`[]byte`) to your query - - Geometry types: As Go does not include any built-in data structures for storing geometry data GoRethink includes its own in the `github.com/dancannon/gorethink/types` package, Any of the types (`Geometry`, `Point`, `Line` and `Lines`) can be passed to a query to create a RethinkDB geometry type. + - Geometry types: As Go does not include any built-in data structures for storing geometry data GoRethink includes its own in the `github.com/gorethink/gorethink/types` package, Any of the types (`Geometry`, `Point`, `Line` and `Lines`) can be passed to a query to create a RethinkDB geometry type. ### Compound Keys @@ -392,9 +394,9 @@ r.Table("books").Get("book_1").Merge(func(p r.Term) interface{} { ### Custom `Marshaler`s/`Unmarshaler`s -Sometimes the default behaviour for converting Go types to and from ReQL is not desired, for these situations the driver allows you to implement both the [`Marshaler`](https://godoc.org/github.com/dancannon/gorethink/encoding#Marshaler) and [`Unmarshaler`](https://godoc.org/github.com/dancannon/gorethink/encoding#Unmarshaler) interfaces. These interfaces might look familiar if you are using to using the `encoding/json` package however instead of dealing with `[]byte` the interfaces deal with `interface{}` values (which are later encoded by the `encoding/json` package when communicating with the database). +Sometimes the default behaviour for converting Go types to and from ReQL is not desired, for these situations the driver allows you to implement both the [`Marshaler`](https://godoc.org/github.com/gorethink/gorethink/encoding#Marshaler) and [`Unmarshaler`](https://godoc.org/github.com/gorethink/gorethink/encoding#Unmarshaler) interfaces. These interfaces might look familiar if you are using to using the `encoding/json` package however instead of dealing with `[]byte` the interfaces deal with `interface{}` values (which are later encoded by the `encoding/json` package when communicating with the database). -An good example of how to use these interfaces is in the [`types`](https://github.com/dancannon/gorethink/blob/master/types/geometry.go#L84-L106) package, in this package the `Point` type is encoded as the `GEOMETRY` pseudo-type instead of a normal JSON object. +An good example of how to use these interfaces is in the [`types`](https://github.com/gorethink/gorethink/blob/master/types/geometry.go#L84-L106) package, in this package the `Point` type is encoded as the `GEOMETRY` pseudo-type instead of a normal JSON object. ## Logging @@ -478,7 +480,7 @@ BenchmarkSequentialSoftWritesParallel10 10000 263 ## Examples -Many functions have examples and are viewable in the godoc, alternatively view some more full features examples on the [wiki](https://github.com/dancannon/gorethink/wiki/Examples). +Many functions have examples and are viewable in the godoc, alternatively view some more full features examples on the [wiki](https://github.com/gorethink/gorethink/wiki/Examples). Another good place to find examples are the tests, almost every term will have a couple of tests that demonstrate how they can be used. diff --git a/checkers_test.go b/checkers_test.go index ab10fa91..7eded4e4 100644 --- a/checkers_test.go +++ b/checkers_test.go @@ -6,7 +6,7 @@ import ( test "gopkg.in/check.v1" - "gopkg.in/dancannon/gorethink.v2/types" + "gopkg.in/gorethink/gorethink.v2/types" ) type jsonChecker struct { diff --git a/connection.go b/connection.go index c9de430e..9147ae15 100644 --- a/connection.go +++ b/connection.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) const ( diff --git a/connection_handshake.go b/connection_handshake.go index ba8c20f8..96e417f8 100644 --- a/connection_handshake.go +++ b/connection_handshake.go @@ -16,7 +16,7 @@ import ( "golang.org/x/crypto/pbkdf2" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) type HandshakeVersion int diff --git a/cursor.go b/cursor.go index 4f881256..2912a43b 100644 --- a/cursor.go +++ b/cursor.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "gopkg.in/dancannon/gorethink.v2/encoding" - p "gopkg.in/dancannon/gorethink.v2/ql2" + "gopkg.in/gorethink/gorethink.v2/encoding" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) var ( diff --git a/doc.go b/doc.go index 7c55531f..f48cf88a 100644 --- a/doc.go +++ b/doc.go @@ -1,6 +1,6 @@ // Package gorethink implements a Go driver for RethinkDB // -// Current version: v2.2.2 (RethinkDB v2.3) +// Current version: v3.0.0 (RethinkDB v2.3) // For more in depth information on how to use RethinkDB check out the API docs // at http://rethinkdb.com/api package gorethink diff --git a/errors.go b/errors.go index 54a13e18..6a257e6e 100644 --- a/errors.go +++ b/errors.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) var ( diff --git a/example_connect_test.go b/example_connect_test.go index 7f1d9172..7bb3ed91 100644 --- a/example_connect_test.go +++ b/example_connect_test.go @@ -4,7 +4,7 @@ import ( "log" "os" - r "gopkg.in/dancannon/gorethink.v2" + r "gopkg.in/gorethink/gorethink.v2" ) var session *r.Session diff --git a/example_test.go b/example_test.go index 041b1638..75f29568 100644 --- a/example_test.go +++ b/example_test.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - r "gopkg.in/dancannon/gorethink.v2" + r "gopkg.in/gorethink/gorethink.v2" ) func Example() { diff --git a/gorethink.go b/gorethink.go index 1b686bc3..92e5ac47 100644 --- a/gorethink.go +++ b/gorethink.go @@ -6,7 +6,7 @@ import ( "github.com/Sirupsen/logrus" - "gopkg.in/dancannon/gorethink.v2/encoding" + "gopkg.in/gorethink/gorethink.v2/encoding" ) var ( diff --git a/internal/reql_tests/common.go b/internal/reql_tests/common.go index 75335c48..b4de9287 100644 --- a/internal/reql_tests/common.go +++ b/internal/reql_tests/common.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) func maybeRun(query interface{}, session *r.Session, opts r.RunOpts) interface{} { diff --git a/internal/reql_tests/gorethink_test.go b/internal/reql_tests/gorethink_test.go index 6dd7c055..9cf8b857 100644 --- a/internal/reql_tests/gorethink_test.go +++ b/internal/reql_tests/gorethink_test.go @@ -6,7 +6,7 @@ import ( "flag" "os" - r "gopkg.in/dancannon/gorethink.v2" + r "gopkg.in/gorethink/gorethink.v2" ) var url string diff --git a/internal/reql_tests/reql_aggregation_test.go b/internal/reql_tests/reql_aggregation_test.go index 6643aca9..38372a0a 100644 --- a/internal/reql_tests/reql_aggregation_test.go +++ b/internal/reql_tests/reql_aggregation_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/reql_tests/reql_changefeeds_edge_test.go b/internal/reql_tests/reql_changefeeds_edge_test.go index ee61e49f..790d3f75 100644 --- a/internal/reql_tests/reql_changefeeds_edge_test.go +++ b/internal/reql_tests/reql_changefeeds_edge_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test edge cases of changefeed operations diff --git a/internal/reql_tests/reql_changefeeds_idxcopy_test.go b/internal/reql_tests/reql_changefeeds_idxcopy_test.go index 37a9e9fe..b9da21b8 100644 --- a/internal/reql_tests/reql_changefeeds_idxcopy_test.go +++ b/internal/reql_tests/reql_changefeeds_idxcopy_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test duplicate indexes with squashing diff --git a/internal/reql_tests/reql_changefeeds_include_states_test.go b/internal/reql_tests/reql_changefeeds_include_states_test.go index dcdd5b65..1217275d 100644 --- a/internal/reql_tests/reql_changefeeds_include_states_test.go +++ b/internal/reql_tests/reql_changefeeds_include_states_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test `include_states` diff --git a/internal/reql_tests/reql_changefeeds_point_test.go b/internal/reql_tests/reql_changefeeds_point_test.go index f59ebd72..4614f3ae 100644 --- a/internal/reql_tests/reql_changefeeds_point_test.go +++ b/internal/reql_tests/reql_changefeeds_point_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test point changebasics diff --git a/internal/reql_tests/reql_changefeeds_table_test.go b/internal/reql_tests/reql_changefeeds_table_test.go index 413dd3b4..2db37726 100644 --- a/internal/reql_tests/reql_changefeeds_table_test.go +++ b/internal/reql_tests/reql_changefeeds_table_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test changefeeds on a table diff --git a/internal/reql_tests/reql_control_test.go b/internal/reql_tests/reql_control_test.go index 5a358f9f..168d3c40 100644 --- a/internal/reql_tests/reql_control_test.go +++ b/internal/reql_tests/reql_control_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests RQL control flow structures diff --git a/internal/reql_tests/reql_datum_array_test.go b/internal/reql_tests/reql_datum_array_test.go index 71ad34be..192c9006 100644 --- a/internal/reql_tests/reql_datum_array_test.go +++ b/internal/reql_tests/reql_datum_array_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests conversion to and from the RQL array type diff --git a/internal/reql_tests/reql_datum_binary_test.go b/internal/reql_tests/reql_datum_binary_test.go index 4b088262..2dfe3859 100644 --- a/internal/reql_tests/reql_datum_binary_test.go +++ b/internal/reql_tests/reql_datum_binary_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests of converstion to and from the RQL binary type diff --git a/internal/reql_tests/reql_datum_bool_test.go b/internal/reql_tests/reql_datum_bool_test.go index 84fcf262..d4d2df1c 100644 --- a/internal/reql_tests/reql_datum_bool_test.go +++ b/internal/reql_tests/reql_datum_bool_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests of conversion to and from the RQL bool type diff --git a/internal/reql_tests/reql_datum_null_test.go b/internal/reql_tests/reql_datum_null_test.go index 4da27338..fe499c68 100644 --- a/internal/reql_tests/reql_datum_null_test.go +++ b/internal/reql_tests/reql_datum_null_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests of conversion to and from the RQL null type diff --git a/internal/reql_tests/reql_datum_number_test.go b/internal/reql_tests/reql_datum_number_test.go index 141e4a62..dce9607c 100644 --- a/internal/reql_tests/reql_datum_number_test.go +++ b/internal/reql_tests/reql_datum_number_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests of conversion to and from the RQL number type diff --git a/internal/reql_tests/reql_datum_object_test.go b/internal/reql_tests/reql_datum_object_test.go index b42379d5..538e4131 100644 --- a/internal/reql_tests/reql_datum_object_test.go +++ b/internal/reql_tests/reql_datum_object_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests conversion to and from the RQL object type diff --git a/internal/reql_tests/reql_datum_string_test.go b/internal/reql_tests/reql_datum_string_test.go index 9cdac2e3..e091d561 100644 --- a/internal/reql_tests/reql_datum_string_test.go +++ b/internal/reql_tests/reql_datum_string_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests of converstion to and from the RQL string type diff --git a/internal/reql_tests/reql_datum_typeof_test.go b/internal/reql_tests/reql_datum_typeof_test.go index e866c9f3..a28ad0d5 100644 --- a/internal/reql_tests/reql_datum_typeof_test.go +++ b/internal/reql_tests/reql_datum_typeof_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // These tests test the type of command diff --git a/internal/reql_tests/reql_datum_uuid_test.go b/internal/reql_tests/reql_datum_uuid_test.go index 39831ebf..363c79f0 100644 --- a/internal/reql_tests/reql_datum_uuid_test.go +++ b/internal/reql_tests/reql_datum_uuid_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test that UUIDs work diff --git a/internal/reql_tests/reql_default_test.go b/internal/reql_tests/reql_default_test.go index cea2697f..7cdf4b4c 100644 --- a/internal/reql_tests/reql_default_test.go +++ b/internal/reql_tests/reql_default_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests r.default diff --git a/internal/reql_tests/reql_geo_constructors_test.go b/internal/reql_tests/reql_geo_constructors_test.go index fea6801a..fa2ed196 100644 --- a/internal/reql_tests/reql_geo_constructors_test.go +++ b/internal/reql_tests/reql_geo_constructors_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test geo constructors diff --git a/internal/reql_tests/reql_geo_geojson_test.go b/internal/reql_tests/reql_geo_geojson_test.go index 8b5326fa..4e8c6371 100644 --- a/internal/reql_tests/reql_geo_geojson_test.go +++ b/internal/reql_tests/reql_geo_geojson_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test geoJSON conversion diff --git a/internal/reql_tests/reql_geo_indexing_test.go b/internal/reql_tests/reql_geo_indexing_test.go index b149dd56..e0940d50 100644 --- a/internal/reql_tests/reql_geo_indexing_test.go +++ b/internal/reql_tests/reql_geo_indexing_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test ReQL interface to geo indexes diff --git a/internal/reql_tests/reql_geo_intersection_inclusion_test.go b/internal/reql_tests/reql_geo_intersection_inclusion_test.go index 04caae3b..aef1a829 100644 --- a/internal/reql_tests/reql_geo_intersection_inclusion_test.go +++ b/internal/reql_tests/reql_geo_intersection_inclusion_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test intersects and includes semantics diff --git a/internal/reql_tests/reql_geo_operations_test.go b/internal/reql_tests/reql_geo_operations_test.go index cdc5b2d7..82a14994 100644 --- a/internal/reql_tests/reql_geo_operations_test.go +++ b/internal/reql_tests/reql_geo_operations_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test basic geometry operators diff --git a/internal/reql_tests/reql_geo_primitives_test.go b/internal/reql_tests/reql_geo_primitives_test.go index eb0b3ece..adf024ba 100644 --- a/internal/reql_tests/reql_geo_primitives_test.go +++ b/internal/reql_tests/reql_geo_primitives_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test geometric primitive constructors diff --git a/internal/reql_tests/reql_joins_test.go b/internal/reql_tests/reql_joins_test.go index 71fdb390..b4ad97ca 100644 --- a/internal/reql_tests/reql_joins_test.go +++ b/internal/reql_tests/reql_joins_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/reql_tests/reql_json_test.go b/internal/reql_tests/reql_json_test.go index 1194389e..b9404dc2 100644 --- a/internal/reql_tests/reql_json_test.go +++ b/internal/reql_tests/reql_json_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests RQL json parsing diff --git a/internal/reql_tests/reql_match_test.go b/internal/reql_tests/reql_match_test.go index 5ea205af..2e037ae8 100644 --- a/internal/reql_tests/reql_match_test.go +++ b/internal/reql_tests/reql_match_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for match diff --git a/internal/reql_tests/reql_math_logic_add_test.go b/internal/reql_tests/reql_math_logic_add_test.go index 62461266..ebf843c1 100644 --- a/internal/reql_tests/reql_math_logic_add_test.go +++ b/internal/reql_tests/reql_math_logic_add_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for basic usage of the add operation diff --git a/internal/reql_tests/reql_math_logic_aliases_test.go b/internal/reql_tests/reql_math_logic_aliases_test.go index fea3d687..e167d054 100644 --- a/internal/reql_tests/reql_math_logic_aliases_test.go +++ b/internal/reql_tests/reql_math_logic_aliases_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test named aliases for math and logic operators diff --git a/internal/reql_tests/reql_math_logic_comparison_test.go b/internal/reql_tests/reql_math_logic_comparison_test.go index 04181a3a..1e4041fc 100644 --- a/internal/reql_tests/reql_math_logic_comparison_test.go +++ b/internal/reql_tests/reql_math_logic_comparison_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests of comparison operators diff --git a/internal/reql_tests/reql_math_logic_div_test.go b/internal/reql_tests/reql_math_logic_div_test.go index 41a2b8c7..3e3f5672 100644 --- a/internal/reql_tests/reql_math_logic_div_test.go +++ b/internal/reql_tests/reql_math_logic_div_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for the basic usage of the division operation diff --git a/internal/reql_tests/reql_math_logic_floor_ceil_round_test.go b/internal/reql_tests/reql_math_logic_floor_ceil_round_test.go index d5bebd49..3a36d84a 100644 --- a/internal/reql_tests/reql_math_logic_floor_ceil_round_test.go +++ b/internal/reql_tests/reql_math_logic_floor_ceil_round_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // tests for `floor`, `ceil`, and `round`, tests inspired by the Python test suite diff --git a/internal/reql_tests/reql_math_logic_logic_test.go b/internal/reql_tests/reql_math_logic_logic_test.go index 65eb5e31..c6e6dc98 100644 --- a/internal/reql_tests/reql_math_logic_logic_test.go +++ b/internal/reql_tests/reql_math_logic_logic_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // These tests are aimed at &&, ||, and ! diff --git a/internal/reql_tests/reql_math_logic_math_test.go b/internal/reql_tests/reql_math_logic_math_test.go index 104179d4..152bd265 100644 --- a/internal/reql_tests/reql_math_logic_math_test.go +++ b/internal/reql_tests/reql_math_logic_math_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests of nested arithmetic expressions diff --git a/internal/reql_tests/reql_math_logic_mod_test.go b/internal/reql_tests/reql_math_logic_mod_test.go index 056ae7ce..c8688d92 100644 --- a/internal/reql_tests/reql_math_logic_mod_test.go +++ b/internal/reql_tests/reql_math_logic_mod_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for the basic usage of the mod operation diff --git a/internal/reql_tests/reql_math_logic_mul_test.go b/internal/reql_tests/reql_math_logic_mul_test.go index 4947affa..03b38617 100644 --- a/internal/reql_tests/reql_math_logic_mul_test.go +++ b/internal/reql_tests/reql_math_logic_mul_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for the basic usage of the multiplication operation diff --git a/internal/reql_tests/reql_math_logic_sub_test.go b/internal/reql_tests/reql_math_logic_sub_test.go index b3f16fb7..e29db426 100644 --- a/internal/reql_tests/reql_math_logic_sub_test.go +++ b/internal/reql_tests/reql_math_logic_sub_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for basic usage of the subtraction operation diff --git a/internal/reql_tests/reql_meta_composite_test.go b/internal/reql_tests/reql_meta_composite_test.go index c2cf8d36..d3edf2f2 100644 --- a/internal/reql_tests/reql_meta_composite_test.go +++ b/internal/reql_tests/reql_meta_composite_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests meta operations in composite queries diff --git a/internal/reql_tests/reql_meta_dbs_test.go b/internal/reql_tests/reql_meta_dbs_test.go index 27dd3137..8f4685be 100644 --- a/internal/reql_tests/reql_meta_dbs_test.go +++ b/internal/reql_tests/reql_meta_dbs_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests meta queries for databases diff --git a/internal/reql_tests/reql_meta_table_test.go b/internal/reql_tests/reql_meta_table_test.go index 4a123a4c..1f45fded 100644 --- a/internal/reql_tests/reql_meta_table_test.go +++ b/internal/reql_tests/reql_meta_table_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests meta queries for creating and deleting tables diff --git a/internal/reql_tests/reql_mutation_atomic_get_set_test.go b/internal/reql_tests/reql_mutation_atomic_get_set_test.go index 9ae8c862..50212a2c 100644 --- a/internal/reql_tests/reql_mutation_atomic_get_set_test.go +++ b/internal/reql_tests/reql_mutation_atomic_get_set_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests replacement of selections diff --git a/internal/reql_tests/reql_mutation_delete_test.go b/internal/reql_tests/reql_mutation_delete_test.go index a01fe975..7cb4e728 100644 --- a/internal/reql_tests/reql_mutation_delete_test.go +++ b/internal/reql_tests/reql_mutation_delete_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests deletes of selections diff --git a/internal/reql_tests/reql_mutation_insert_test.go b/internal/reql_tests/reql_mutation_insert_test.go index a9f2c06a..6caaf9dc 100644 --- a/internal/reql_tests/reql_mutation_insert_test.go +++ b/internal/reql_tests/reql_mutation_insert_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests insertion into tables diff --git a/internal/reql_tests/reql_mutation_replace_test.go b/internal/reql_tests/reql_mutation_replace_test.go index 2c1feb3b..5ba4010f 100644 --- a/internal/reql_tests/reql_mutation_replace_test.go +++ b/internal/reql_tests/reql_mutation_replace_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests replacement of selections diff --git a/internal/reql_tests/reql_mutation_sync_test.go b/internal/reql_tests/reql_mutation_sync_test.go index 07833238..5135c9ed 100644 --- a/internal/reql_tests/reql_mutation_sync_test.go +++ b/internal/reql_tests/reql_mutation_sync_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests syncing tables diff --git a/internal/reql_tests/reql_mutation_update_test.go b/internal/reql_tests/reql_mutation_update_test.go index 1cd0eb4e..8483350d 100644 --- a/internal/reql_tests/reql_mutation_update_test.go +++ b/internal/reql_tests/reql_mutation_update_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests updates of selections diff --git a/internal/reql_tests/reql_polymorphism_test.go b/internal/reql_tests/reql_polymorphism_test.go index 1728defd..b9466815 100644 --- a/internal/reql_tests/reql_polymorphism_test.go +++ b/internal/reql_tests/reql_polymorphism_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/reql_tests/reql_random_test.go b/internal/reql_tests/reql_random_test.go index 3755916f..307fede8 100644 --- a/internal/reql_tests/reql_random_test.go +++ b/internal/reql_tests/reql_random_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests randomization functions diff --git a/internal/reql_tests/reql_range_test.go b/internal/reql_tests/reql_range_test.go index 74b8bfd8..8f5d6be6 100644 --- a/internal/reql_tests/reql_range_test.go +++ b/internal/reql_tests/reql_range_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests RQL range generation diff --git a/internal/reql_tests/reql_selection_test.go b/internal/reql_tests/reql_selection_test.go index c74b4bc8..1b94e811 100644 --- a/internal/reql_tests/reql_selection_test.go +++ b/internal/reql_tests/reql_selection_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/reql_tests/reql_sindex_api_test.go b/internal/reql_tests/reql_sindex_api_test.go index 94ede841..7748c511 100644 --- a/internal/reql_tests/reql_sindex_api_test.go +++ b/internal/reql_tests/reql_sindex_api_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // sindex api (#602) diff --git a/internal/reql_tests/reql_sindex_nullsinstrings_test.go b/internal/reql_tests/reql_sindex_nullsinstrings_test.go index b1dede87..c0383cac 100644 --- a/internal/reql_tests/reql_sindex_nullsinstrings_test.go +++ b/internal/reql_tests/reql_sindex_nullsinstrings_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // sindex nulls in strings diff --git a/internal/reql_tests/reql_sindex_status_test.go b/internal/reql_tests/reql_sindex_status_test.go index a0a979cf..2a92e71f 100644 --- a/internal/reql_tests/reql_sindex_status_test.go +++ b/internal/reql_tests/reql_sindex_status_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // sindex status diff --git a/internal/reql_tests/reql_timeout_test.go b/internal/reql_tests/reql_timeout_test.go index 710ffcbd..696d02c8 100644 --- a/internal/reql_tests/reql_timeout_test.go +++ b/internal/reql_tests/reql_timeout_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests timeouts. diff --git a/internal/reql_tests/reql_times_api_test.go b/internal/reql_tests/reql_times_api_test.go index 2d69cd22..cad505ad 100644 --- a/internal/reql_tests/reql_times_api_test.go +++ b/internal/reql_tests/reql_times_api_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // date/time api (#977) diff --git a/internal/reql_tests/reql_times_constructors_test.go b/internal/reql_tests/reql_times_constructors_test.go index 7dfdab88..3cee09a6 100644 --- a/internal/reql_tests/reql_times_constructors_test.go +++ b/internal/reql_tests/reql_times_constructors_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test basic time arithmetic diff --git a/internal/reql_tests/reql_times_index_test.go b/internal/reql_tests/reql_times_index_test.go index 1f071920..7069f129 100644 --- a/internal/reql_tests/reql_times_index_test.go +++ b/internal/reql_tests/reql_times_index_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // secondary indexes on times diff --git a/internal/reql_tests/reql_times_portions_test.go b/internal/reql_tests/reql_times_portions_test.go index 2b19a93b..47420093 100644 --- a/internal/reql_tests/reql_times_portions_test.go +++ b/internal/reql_tests/reql_times_portions_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // accessing portions diff --git a/internal/reql_tests/reql_times_shim_test.go b/internal/reql_tests/reql_times_shim_test.go index 1034b99e..0cca9d17 100644 --- a/internal/reql_tests/reql_times_shim_test.go +++ b/internal/reql_tests/reql_times_shim_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test the native shims. diff --git a/internal/reql_tests/reql_times_time_arith_test.go b/internal/reql_tests/reql_times_time_arith_test.go index 50c2020b..858068a7 100644 --- a/internal/reql_tests/reql_times_time_arith_test.go +++ b/internal/reql_tests/reql_times_time_arith_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test basic time arithmetic diff --git a/internal/reql_tests/reql_times_timezones_test.go b/internal/reql_tests/reql_times_timezones_test.go index 0ef5023d..2db09f7c 100644 --- a/internal/reql_tests/reql_times_timezones_test.go +++ b/internal/reql_tests/reql_times_timezones_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Test basic timezone manipulation diff --git a/internal/reql_tests/reql_transform_array_test.go b/internal/reql_tests/reql_transform_array_test.go index 6eff4f89..939a9a93 100644 --- a/internal/reql_tests/reql_transform_array_test.go +++ b/internal/reql_tests/reql_transform_array_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests manipulation operations on arrays diff --git a/internal/reql_tests/reql_transform_fold_test.go b/internal/reql_tests/reql_transform_fold_test.go index 0738c852..e03853d0 100644 --- a/internal/reql_tests/reql_transform_fold_test.go +++ b/internal/reql_tests/reql_transform_fold_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for the fold term diff --git a/internal/reql_tests/reql_transform_map_test.go b/internal/reql_tests/reql_transform_map_test.go index 4d063cfa..739ff8de 100644 --- a/internal/reql_tests/reql_transform_map_test.go +++ b/internal/reql_tests/reql_transform_map_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests the RQL `map` function diff --git a/internal/reql_tests/reql_transform_object_test.go b/internal/reql_tests/reql_transform_object_test.go index 092ec686..14bcbaf6 100644 --- a/internal/reql_tests/reql_transform_object_test.go +++ b/internal/reql_tests/reql_transform_object_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests manipulation operations on objects diff --git a/internal/reql_tests/reql_transform_table_test.go b/internal/reql_tests/reql_transform_table_test.go index b20d84c3..c4bb7a96 100644 --- a/internal/reql_tests/reql_transform_table_test.go +++ b/internal/reql_tests/reql_transform_table_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests manipulation operations on tables diff --git a/internal/reql_tests/reql_transform_unordered_map_test.go b/internal/reql_tests/reql_transform_unordered_map_test.go index 656a6037..eb0ac062 100644 --- a/internal/reql_tests/reql_transform_unordered_map_test.go +++ b/internal/reql_tests/reql_transform_unordered_map_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests for ordered_union diff --git a/internal/reql_tests/reql_transformation_test.go b/internal/reql_tests/reql_transformation_test.go index e93e013f..a078dce0 100644 --- a/internal/reql_tests/reql_transformation_test.go +++ b/internal/reql_tests/reql_transformation_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // Tests that manipulation data in tables diff --git a/internal/reql_tests/template.go.tpl b/internal/reql_tests/template.go.tpl index 47645ee4..771a2c38 100644 --- a/internal/reql_tests/template.go.tpl +++ b/internal/reql_tests/template.go.tpl @@ -5,8 +5,8 @@ import ( "time" "github.com/stretchr/testify/suite" - r "gopkg.in/dancannon/gorethink.v2" - "gopkg.in/dancannon/gorethink.v2/internal/compare" + r "gopkg.in/gorethink/gorethink.v2" + "gopkg.in/gorethink/gorethink.v2/internal/compare" ) // ${description} diff --git a/mock.go b/mock.go index ed87a38b..b11d4e8f 100644 --- a/mock.go +++ b/mock.go @@ -7,7 +7,7 @@ import ( "sync" "time" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // Mocking is based on the amazing package github.com/stretchr/testify diff --git a/node.go b/node.go index 9a4ac9f9..3178147a 100644 --- a/node.go +++ b/node.go @@ -3,7 +3,7 @@ package gorethink import ( "sync" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // Node represents a database server in the cluster diff --git a/pseudotypes.go b/pseudotypes.go index 8deb3315..22a748e9 100644 --- a/pseudotypes.go +++ b/pseudotypes.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "gopkg.in/dancannon/gorethink.v2/types" + "gopkg.in/gorethink/gorethink.v2/types" "fmt" ) diff --git a/query.go b/query.go index 261ba1a1..4d952811 100644 --- a/query.go +++ b/query.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/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 c79fb4e9..90ada697 100644 --- a/query_admin.go +++ b/query_admin.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/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 92e47c21..e5cc787d 100644 --- a/query_aggregation.go +++ b/query_aggregation.go @@ -1,6 +1,6 @@ package gorethink -import p "gopkg.in/dancannon/gorethink.v2/ql2" +import p "gopkg.in/gorethink/gorethink.v2/ql2" // Aggregation // These commands are used to compute smaller values from large sequences. diff --git a/query_control.go b/query_control.go index 2a51b442..596ff77d 100644 --- a/query_control.go +++ b/query_control.go @@ -6,7 +6,7 @@ import ( "reflect" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/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 0fd21c8e..66f847cb 100644 --- a/query_db.go +++ b/query_db.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // DBCreate creates a database. A RethinkDB database is a collection of tables, diff --git a/query_geospatial.go b/query_geospatial.go index 21be710d..7945dd7c 100644 --- a/query_geospatial.go +++ b/query_geospatial.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // CircleOpts contains the optional arguments for the Circle term. diff --git a/query_join.go b/query_join.go index 68735643..e38757a1 100644 --- a/query_join.go +++ b/query_join.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/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 62d0ffb7..45bac252 100644 --- a/query_manipulation.go +++ b/query_manipulation.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/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 16f2d151..fdf4c09c 100644 --- a/query_math.go +++ b/query_math.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) var ( diff --git a/query_select.go b/query_select.go index 72ae021a..144f5a78 100644 --- a/query_select.go +++ b/query_select.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // DB references a database. diff --git a/query_string.go b/query_string.go index 12ca2221..47feca3a 100644 --- a/query_string.go +++ b/query_string.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // Match matches against a regular expression. If no match is found, returns diff --git a/query_table.go b/query_table.go index 8b8e616a..87058b10 100644 --- a/query_table.go +++ b/query_table.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // TableCreateOpts contains the optional arguments for the TableCreate term diff --git a/query_time.go b/query_time.go index c4e8c675..d53ee5ca 100644 --- a/query_time.go +++ b/query_time.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // Now returns a time object representing the current time in UTC diff --git a/query_transformation.go b/query_transformation.go index 8c48d6b3..a834dfb3 100644 --- a/query_transformation.go +++ b/query_transformation.go @@ -1,6 +1,6 @@ package gorethink -import p "gopkg.in/dancannon/gorethink.v2/ql2" +import p "gopkg.in/gorethink/gorethink.v2/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 a25a1b10..aa1d2cd7 100644 --- a/query_write.go +++ b/query_write.go @@ -1,7 +1,7 @@ package gorethink import ( - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // InsertOpts contains the optional arguments for the Insert term diff --git a/session.go b/session.go index dd0af1fc..5e2241e9 100644 --- a/session.go +++ b/session.go @@ -5,7 +5,7 @@ import ( "sync" "time" - p "gopkg.in/dancannon/gorethink.v2/ql2" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // A Session represents a connection to a RethinkDB cluster and should be used @@ -152,7 +152,7 @@ func Connect(opts ConnectOpts) (*Session, error) { // will cause the .IsConnected() method to be caught in a loop return &Session{ hosts: hosts, - opts: &opts, + opts: &opts, }, err } diff --git a/utils.go b/utils.go index 13d675a7..9da1e9ad 100644 --- a/utils.go +++ b/utils.go @@ -6,8 +6,8 @@ import ( "strings" "sync/atomic" - "gopkg.in/dancannon/gorethink.v2/encoding" - p "gopkg.in/dancannon/gorethink.v2/ql2" + "gopkg.in/gorethink/gorethink.v2/encoding" + p "gopkg.in/gorethink/gorethink.v2/ql2" ) // Helper functions for constructing terms