Merge a4bb8c1 into 8daca4f

shogo82148 · Feb 24, 2018 · 2ff724a · 2ff724a
2 parents 8daca4f + a4bb8c1
commit 2ff724a
Show file tree

Hide file tree

Showing 22 changed files with 252 additions and 1,394 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,9 @@ language: go
 sudo: false
 
 go:
-  - '1.3'
-  - '1.4'
-  - '1.5'
-  - '1.6'
-  - '1.7'
-  - '1.8'
+  - '1.8.x'
+  - '1.9.x'
+  - '1.10.x'
   - 'tip'
 
 before_install:

diff --git a/bench_test.go b/bench_test.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package proxy
 
 import (

diff --git a/conn.go b/conn.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package proxy
 
 import (
@@ -89,7 +87,7 @@ func (conn *Conn) Begin() (driver.Tx, error) {
 	panic("not supported")
 }
 
-// BeginContext starts and returns a new transaction which is wrapped by Tx.
+// BeginTx starts and returns a new transaction which is wrapped by Tx.
 // It will trigger PreBegin, Begin, PostBegin hooks.
 func (conn *Conn) BeginTx(c context.Context, opts driver.TxOptions) (driver.Tx, error) {
 	// set the hooks.
@@ -220,7 +218,7 @@ func (conn *Conn) Query(query string, args []driver.Value) (driver.Rows, error)
 	panic("not supported")
 }
 
-// Query executes a query that may return rows.
+// QueryContext executes a query that may return rows.
 // It wil trigger PreQuery, Query, PostQuery hooks.
 //
 // If the original connection does not satisfy "database/sql/driver".Queryer, it return ErrSkip error.

diff --git a/conn_fallback.go b/conn_fallback.go
diff --git a/conn_test.go b/conn_test.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package proxy
 
 import "database/sql/driver"

diff --git a/fakedb_test.go b/fakedb_test.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package proxy
 
 import (

diff --git a/proxy.go b/proxy.go
@@ -1,4 +1,3 @@
-// +build go1.8
 // a proxy package is a proxy driver for dabase/sql.
 
 package proxy