Merge branch 'master' into no-cdeps

src-d · Aug 7, 2019 · c5e39e6 · c5e39e6
2 parents 6ba9943 + 169c4e7
commit c5e39e6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: go
 
 go_import_path: github.com/src-d/gitbase
+go: 1.12.x
 
 env:
-  - GO111MODULE=on
+  - GO111MODULE=on GOPROXY=https://proxy.golang.org
 
 matrix:
   fast_finish: true
@@ -18,8 +19,7 @@ script:
 
 jobs:
   include:
-    - go: 1.11.x
-      os: linux
+    - os: linux
       sudo: required
       dist: trusty
       services: [docker]
@@ -37,8 +37,7 @@ jobs:
         on:
           tags: true
 
-    - go: 1.11.x
-      os: osx
+    - os: osx
       osx_image: xcode9.3
 
       before_install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,14 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.24.0-beta2] - 2019-07-31
+
 ### Changed
 
 - When it's added the `-v` verbose flag, gitbase will use `debug` as logging level, ignoring any other passed ([#935](https://github.com/src-d/gitbase/pull/935))
 
 ### Fixed
 
 - If using docker image, and `info` logging level, it will be now used instead of `debug` ([#935](https://github.com/src-d/gitbase/pull/935))
-
+- sql/analyzer: fix order by resolution for all nodes ([#793](https://github.com/src-d/gitbase/pull/793))
+- sql: fix SQL method for arrays of JSON ([#790](https://github.com/src-d/gitbase/pull/790))
 
 ## [0.24.0-beta1] - 2019-07-08
 

diff --git a/Dockerfile b/Dockerfile
@@ -14,6 +14,7 @@ WORKDIR $GITBASE_PATH
 ENV GO_BUILD_ARGS="-o /bin/gitbase"
 ENV GO_BUILD_PATH="./cmd/gitbase"
 ENV GO111MODULE=on
+ENV GOPROXY=https://proxy.golang.org
 
 RUN make static-build
 

diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/src-d/go-borges v0.0.0-20190628121335-da12a84d60fd
 	github.com/src-d/go-git v4.7.0+incompatible
 	github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible
-	github.com/src-d/go-mysql-server v0.4.1-0.20190708083625-b61703ad45cc
+	github.com/src-d/go-mysql-server v0.4.1-0.20190730105128-550cc54baee2
 	github.com/stretchr/testify v1.3.0
 	github.com/uber-go/atomic v1.4.0 // indirect
 	github.com/uber/jaeger-client-go v2.16.0+incompatible

diff --git a/go.sum b/go.sum
@@ -238,8 +238,8 @@ github.com/src-d/go-git v4.7.0+incompatible h1:IYSSnbAHeKmsfbQFi9ozbid+KNh0bKjlo
 github.com/src-d/go-git v4.7.0+incompatible/go.mod h1:1bQciz+hn0jzPQNsYj0hDFZHLJBdV7gXE2mWhC7EkFk=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible h1:A5bKevhs9C//Nh8QV0J+1KphEaIa25cDe1DTs/yPxDI=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible/go.mod h1:XcIQp7L+k0pgfTqfbaTKj3kxlBv8kYOKZ/tKNXbZFLg=
-github.com/src-d/go-mysql-server v0.4.1-0.20190708083625-b61703ad45cc h1:Rgz2etoEnslCgMKCfwpKd0hBFrZVxpV33QAXjadVi0o=
-github.com/src-d/go-mysql-server v0.4.1-0.20190708083625-b61703ad45cc/go.mod h1:GO8SmBnN9LcKSXy6DYuBbqKtJvrRnHsBrlXvlVOX+NM=
+github.com/src-d/go-mysql-server v0.4.1-0.20190730105128-550cc54baee2 h1:Z9Z1FKGzlV+DEdgEwPU0Lqjj8Rj2NaQ6HJbkJ+eOz6U=
+github.com/src-d/go-mysql-server v0.4.1-0.20190730105128-550cc54baee2/go.mod h1:GO8SmBnN9LcKSXy6DYuBbqKtJvrRnHsBrlXvlVOX+NM=
 github.com/src-d/go-oniguruma v1.0.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=
 github.com/src-d/go-oniguruma v1.1.0 h1:EG+Nm5n2JqWUaCjtM0NtutPxU7ZN5Tp50GWrrV8bTww=
 github.com/src-d/go-oniguruma v1.1.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=

diff --git a/integration_test.go b/integration_test.go
@@ -475,7 +475,7 @@ func TestIntegration(t *testing.T) {
 					) q
 				) q2`,
 			[]sql.Row{
-				{float64(1), float64(0), time.Date(2015, time.March, 31, 12, 00, 8, 0, time.UTC), "e8d3ffab552895c19b9fcf7aa264d277cde33881", "worktree", "Changed"},
+				{float64(1), float64(0), time.Date(2015, time.March, 31, 12, 00, 8, 0, time.UTC), "e8d3ffab552895c19b9fcf7aa264d277cde33881", "worktree", "Added"},
 				{float64(0), float64(0), time.Date(2015, time.April, 5, 21, 30, 47, 0, time.UTC), "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "worktree", "Changed"},
 				{float64(0), float64(0), time.Date(2015, time.April, 5, 21, 30, 47, 0, time.UTC), "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "worktree", "Changed"},
 				{float64(0), float64(0), time.Date(2015, time.April, 5, 21, 30, 47, 0, time.UTC), "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "worktree", "Changed"},