Bump Go to 1.10 and format code
diff --git a/connection_go18.go b/connection_go18.go
index f0433dc..332e04f 100644
--- a/connection_go18.go
+++ b/connection_go18.go
@@ -20,12 +20,11 @@
package avatica
import (
+ "context"
"database/sql"
"database/sql/driver"
"errors"
"fmt"
-
- "context"
)
func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
diff --git a/driver_go18_test.go b/driver_go18_test.go
index fecdb94..be760f6 100644
--- a/driver_go18_test.go
+++ b/driver_go18_test.go
@@ -20,13 +20,12 @@
package avatica
import (
- "database/sql"
- "testing"
- "time"
-
"context"
+ "database/sql"
"math"
"reflect"
+ "testing"
+ "time"
)
func (dbt *DBTest) mustExecContext(ctx context.Context, query string, args ...interface{}) (res sql.Result) {
@@ -565,7 +564,7 @@
nullable: true,
ok: true,
},
- scanType: reflect.TypeOf(bool(false)),
+ scanType: reflect.TypeOf(false),
},
{
databaseTypeName: "TIME",
diff --git a/driver_test.go b/driver_test.go
index b7d436b..2d0f8b0 100644
--- a/driver_test.go
+++ b/driver_test.go
@@ -24,13 +24,12 @@
"database/sql"
"fmt"
"io/ioutil"
+ "math/rand"
"net/http"
"os"
"path/filepath"
"testing"
"time"
-
- "math/rand"
)
var (
diff --git a/errors.go b/errors.go
index 95a0a90..16a842a 100644
--- a/errors.go
+++ b/errors.go
@@ -108,7 +108,6 @@
}
var errorCodeNames = map[ErrorCode]string{
-
// Connection exceptions (errorcode 01, sqlstate 08)
101: "io_exception",
102: "malformed_connection_url",
diff --git a/moby.yml b/moby.yml
index 0987c3c..07cc28a 100644
--- a/moby.yml
+++ b/moby.yml
@@ -20,7 +20,7 @@
- "8765"
dev:
- image: golang:1.9-alpine
+ image: golang:1.10-alpine
env:
AVATICA_HOST: http://phoenix:8765
steps:
diff --git a/rows.go b/rows.go
index 4083916..b8fd54c 100644
--- a/rows.go
+++ b/rows.go
@@ -19,14 +19,11 @@
import (
"database/sql/driver"
- "io"
- "time"
-
- "reflect"
-
- "math"
-
"fmt"
+ "io"
+ "math"
+ "reflect"
+ "time"
"github.com/apache/calcite-avatica-go/message"
"golang.org/x/net/context"
@@ -209,7 +206,7 @@
column.scanType = reflect.TypeOf("")
case "BOOLEAN":
- column.scanType = reflect.TypeOf(bool(false))
+ column.scanType = reflect.TypeOf(false)
case "TIME", "DATE", "TIMESTAMP", "UNSIGNED_TIME", "UNSIGNED_DATE", "UNSIGNED_TIMESTAMP":
column.scanType = reflect.TypeOf(time.Time{})
diff --git a/wercker.yml b/wercker.yml
index 608bbc8..87ca442 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -14,7 +14,7 @@
# limitations under the License.
#
box:
- id: golang:1.9-alpine
+ id: golang:1.10-alpine
cmd: /bin/sh
no-response-timeout: 20
