Merge pull request #265 from encryptio/master

dancannon · dancannon · commit 2b23fbdddf49 · 2016-01-22T20:41:55.000Z
errors.go: fix infinite recursion in rqlError.Error()
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ Setting up a basic connection with RethinkDB is simple:
 ```go
 import (
     r "github.com/dancannon/gorethink"
+    "log"
 )
 
 var session *r.Session
diff --git a/errors.go b/errors.go
@@ -97,7 +97,7 @@ func (e rqlServerError) String() string {
 type rqlError string
 
 func (e rqlError) Error() string {
-	return fmt.Sprintf("gorethink: %s", e)
+	return fmt.Sprintf("gorethink: %s", string(e))
 }
 
 func (e rqlError) String() string {

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ Setting up a basic connection with RethinkDB is simple:`
`34`	`34`	```go
`35`	`35`	`import (`
`36`	`36`	`r "github.com/dancannon/gorethink"`
	`37`	`+ "log"`
`37`	`38`	`)`
`38`	`39`
`39`	`40`	`var session *r.Session`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func (e rqlServerError) String() string {`
`97`	`97`	`type rqlError string`
`98`	`98`
`99`	`99`	`func (e rqlError) Error() string {`
`100`		`- return fmt.Sprintf("gorethink: %s", e)`
	`100`	`+ return fmt.Sprintf("gorethink: %s", string(e))`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func (e rqlError) String() string {`