Skip to content

Commit d4f52ab

Browse files
author
Aleksander Mogilko
committed
tag v5 due to rename pkg
1 parent 3c64934 commit d4f52ab

File tree

124 files changed

+216
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+216
-212
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ go:
1010

1111
cache: apt
1212

13-
go_import_path: gopkg.in/rethinkdb/rethinkdb-go.v4
13+
go_import_path: gopkg.in/rethinkdb/rethinkdb-go.v5
1414

1515
install: go get -t ./...
1616

@@ -24,4 +24,6 @@ before_script:
2424
- rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29016 > /dev/null 2>&1 &
2525
- rethinkdb --port-offset 3 --directory rethinkdb_data3 --join localhost:29016 > /dev/null 2>&1 &
2626

27-
script: go test -tags='cluster' -short -race -v ./...
27+
script:
28+
- go test -race .
29+
- go test -tags='cluster' -short -race -v ./...

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5-
## v4.2.0 - 2018-09-12
5+
## v5.0.0 - 2018-09-12
66

77
- Moved to rethinkdb organization
88
- Renamed to rethinkdb-go repo

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
test:
2-
test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4 && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4 ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4.bak; true
3-
cp -R . ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4
4-
go test -coverprofile=cover.out -race gopkg.in/rethinkdb/rethinkdb-go.v4; true
2+
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
3+
cp -R . ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5
4+
go test -coverprofile=cover.out -race gopkg.in/rethinkdb/rethinkdb-go.v5; true
55
go tool cover -html=cover.out -o cover.html; true
66
rm -f cover.out; true
7-
rm -rf ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4
8-
test -d ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4.bak && mv ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4.bak ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v4; true
7+
rm -rf ${GOPATH}/src/gopkg.in/rethinkdb/rethinkdb-go.v5
8+
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

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
![RethinkDB-go Logo](https://raw.github.com/wiki/rethinkdb/rethinkdb-go/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
1010

11-
Current version: v4.2.0 (RethinkDB v2.3)
11+
Current version: v5.0.0 (RethinkDB v2.3)
1212

1313
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).
1414

@@ -17,10 +17,10 @@ If you need any help you can find me on the [RethinkDB slack](http://slack.rethi
1717
## Installation
1818

1919
```
20-
go get gopkg.in/rethinkdb/rethinkdb-go.v4
20+
go get gopkg.in/rethinkdb/rethinkdb-go.v5
2121
```
2222

23-
Replace `v4` with `v3` or `v2` to use previous versions.
23+
Replace `v5` with `v4` or `v3` to use previous versions.
2424

2525
## Example
2626

@@ -32,7 +32,7 @@ import (
3232
"fmt"
3333
"log"
3434

35-
r "gopkg.in/rethinkdb/rethinkdb-go.v4"
35+
r "gopkg.in/rethinkdb/rethinkdb-go.v5"
3636
)
3737

3838
func Example() {

connection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/opentracing/opentracing-go/ext"
1515
"github.com/opentracing/opentracing-go/log"
1616
"golang.org/x/net/context"
17-
p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
17+
p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
1818
"sync"
1919
)
2020

connection_handshake.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
"golang.org/x/crypto/pbkdf2"
1818

19-
p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
19+
p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
2020
)
2121

2222
type HandshakeVersion int

connection_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/opentracing/opentracing-go/mocktracer"
88
"golang.org/x/net/context"
99
test "gopkg.in/check.v1"
10-
p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
10+
p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
1111
"io"
1212
"time"
1313
)

cursor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/opentracing/opentracing-go"
1111
"golang.org/x/net/context"
12-
"gopkg.in/rethinkdb/rethinkdb-go.v4/encoding"
13-
p "gopkg.in/rethinkdb/rethinkdb-go.v4/ql2"
12+
"gopkg.in/rethinkdb/rethinkdb-go.v5/encoding"
13+
p "gopkg.in/rethinkdb/rethinkdb-go.v5/ql2"
1414
)
1515

1616
var (

encoding/encoder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ func TestEncodeCustomRootTypeEncodingError(t *testing.T) {
543543
if err == nil {
544544
t.Errorf("got nil error, expected %v", cerr)
545545
}
546-
if err != cerr {
546+
if err != cerr {
547547
t.Errorf("got %q, want %q", err, cerr)
548548
}
549549
}

encoding/tags.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ var (
1414
)
1515

1616
const (
17-
TagName = "rethinkdb"
18-
OldTagName = "gorethink"
19-
JSONTagName = "json"
20-
RefTagName = "rethinkdb_ref"
21-
OldRefTagName = "gorethink_ref"
17+
TagName = "rethinkdb"
18+
OldTagName = "gorethink"
19+
JSONTagName = "json"
20+
RefTagName = "rethinkdb_ref"
21+
OldRefTagName = "gorethink_ref"
2222
)
2323

2424
// tagOptions is the string following a comma in a struct field's

0 commit comments

Comments
 (0)