Merge pull request #12 from jfontan/update-dependencies

Update dependencies and CI

Author: jfontan

.gitignore

@@ -6,7 +6,6 @@
 # Folders
 _obj
 _test
-vendor
 
 # Architecture specific extensions/prefixes
 *.[568vq]

.travis.yml

@@ -1,26 +1,18 @@
 language: go
-sudo: false
+
 go:
   - 1.9
   - tip
-go_import_path: gopkg.in/sqle/gitquery.v0
+
+go_import_path: github.com/src-d/gitquery
+
 matrix:
   fast_finish: true
   allow_failures:
     - go: tip
+
 install:
-  - go get -u github.com/golang/dep/cmd/dep
-  - dep ensure -v
-  - go build -ldflags="-X main.version=$TRAVIS_TAG" -v -o gitquery ./cmd/...
+  - make dependencies
+
 script:
-  - sh ./go.test.sh
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-deploy:
-  provider: releases
-  api_key:
-    secure: YUASK1+EaHQo1WPIDfSQZLynvPh/bFPVV8WNrbqWkqox+Y58MLeYCEGnDjP70pVsL5YmjZzeEGv4XRYIl359wqL7YxnB70mJGAmbi8xQ8DS+ecbpJXz+kDES/QqX6BVJYXMWRm2hM/XdyIDvPa5kaVBbeFlO86uizI0OSHE/2O4aticeaRUajTM+Bv7/R2ygVCiB+1gVdGqPmRy2w/bFUOAfR1LTC8TLDQFJUvgjtuJJVKhffKhcqfnibNyBtTEd9nwSuY4MAuva9ghgFvl1B9uJ266ktEDkqAjNX3Cg1UNyAPXs50M61gBUEFV/MAscCHrtHDdtzyrKPaUZ224TcTVjgEZiOG8Zus+0wvwyhf7wyxSHx73ZXGedu54/oazLqFudj9u2AM+qMrXoRtFcygtSXBdG4SaN0OL/EUXnxiJLPbfFT/oM7VpdEscZn8okMo7RtbGxszrJQOIvrcNd16IZHK10S/nVnGNHNNNuArwf5B15DK49gveB1+sv/8FkoTx3LXJFHHiA1C8l5sH+Of6v/YKa5Zspkub7wkKrE3fQ/zPc3D0AVvrMt/k6S0LBtQR6eJqqtasVLlmtrRujyOxWLWO7fwmRTsI6qT1O4fspGBaONg8cr9xuwsOGBcGIEaPCKv3RZrY8+hx2J7cLzV0qjaJtmucamnenxic7a6o=
-  file: gitquery
-  skip_cleanup: true
-  on:
-    tags: true
+  - make test-coverage

Gopkg.lock

@@ -1,3 +1,10 @@
+ignored = [
+  "gopkg.in/src-d/go-mysql-server.v0",
+  "gopkg.in/src-d/go-mysql-server.v0/sql",
+  "gopkg.in/src-d/go-mysql-server.v0/sql/expression",
+  "gopkg.in/src-d/go-mysql-server.v0/sql/plan",
+ ]
+
 [[constraint]]
   name = "github.com/chzyer/readline"
   version = "1.4.0"
@@ -18,15 +25,26 @@
   name = "github.com/stretchr/testify"
   version = "1.1.4"
 
-[[constraint]]
-  name = "gopkg.in/sqle/sqle.v0"
-  version = "0.7.0"
-
 [[constraint]]
   name = "gopkg.in/src-d/go-git.v4"
   source = "github.com/src-d/go-git"
-  revision = "44c364fe3b7b8cdc0f9623afe870d6781a97ebb4"
 
 [[constraint]]
   name = "gopkg.in/src-d/go-git-fixtures.v3"
   version = "3.0.0"
+
+[[override]]
+  name = "golang.org/x/sys"
+  source = "github.com/golang/sys"
+
+[[override]]
+  name = "golang.org/x/crypto"
+  source = "github.com/golang/crypto"
+
+[[override]]
+  name = "golang.org/x/text"
+  source = "github.com/golang/text"
+
+[[override]]
+  name = "golang.org/x/net"
+  source = "github.com/golang/net"

Gopkg.toml

@@ -0,0 +1,13 @@
+# Package configuration
+PROJECT = gitquery
+
+# Including ci Makefile
+CI_REPOSITORY ?= https://github.com/src-d/ci.git
+CI_PATH ?= $(shell pwd)/.ci
+CI_VERSION ?= v1
+
+MAKEFILE := $(CI_PATH)/Makefile.main
+$(MAKEFILE):
+	git clone --quiet --branch $(CI_VERSION) --depth 1 $(CI_REPOSITORY) $(CI_PATH);
+
+-include $(MAKEFILE)

Makefile

@@ -1,7 +1,7 @@
 package gitquery
 
 import (
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
@@ -25,8 +25,8 @@ func (blobsTable) Name() string {
 
 func (blobsTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "hash", Type: sql.String, Nullable: false},
-		{Name: "size", Type: sql.BigInteger, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: false},
+		{Name: "size", Type: sql.Int64, Nullable: false},
 	}
 }
 

blobs.go

@@ -3,7 +3,7 @@ package gitquery
 import (
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git-fixtures.v3"
 	"github.com/stretchr/testify/assert"