From f99fe9570ddda4117c3c2e629e77d609d351ba62 Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Tue, 30 Jul 2019 16:47:27 +0200 Subject: [PATCH 1/5] vendor: upgrade go-mysql-server Signed-off-by: Miguel Molina --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a90ee19c1..707fa20fb 100644 --- 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 index 386316b86..4be3a845c 100644 --- 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= From 68b5bd4b4519d2fe02ab4da89ecb3d0bf58a43a7 Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Wed, 31 Jul 2019 10:03:21 +0200 Subject: [PATCH 2/5] fix integration tests Signed-off-by: Miguel Molina --- integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_test.go b/integration_test.go index 6c2d44b57..ff02c4064 100644 --- 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"}, From dabfdd0641983ef9fcb0e5408ae10261c3e22bba Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Wed, 31 Jul 2019 10:07:18 +0200 Subject: [PATCH 3/5] upgrade to go 1.12 on travis Signed-off-by: Miguel Molina --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7078d9c1f..a5655da12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: go go_import_path: github.com/src-d/gitbase +go: 1.12.x env: - GO111MODULE=on @@ -32,8 +33,7 @@ script: jobs: include: - - go: 1.11.x - os: linux + - os: linux sudo: required dist: trusty services: [docker] @@ -51,8 +51,7 @@ jobs: on: tags: true - - go: 1.11.x - os: osx + - os: osx osx_image: xcode9.3 before_install: From 4f192aae1538ba6b04568c70f5fd9970c0bef949 Mon Sep 17 00:00:00 2001 From: Antonio Navarro Perez Date: Wed, 31 Jul 2019 14:51:52 +0200 Subject: [PATCH 4/5] Prepare for the new release v0.24.0-beta2 Signed-off-by: Antonio Navarro Perez --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 822087403..9a6cc2c5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ 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)) @@ -13,7 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 From c6979b2a6bb0d5b7056014e54e58ab85c9722024 Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Tue, 6 Aug 2019 16:05:58 +0200 Subject: [PATCH 5/5] use goproxy Signed-off-by: Miguel Molina --- .travis.yml | 2 +- Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5655da12..2db6b91f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ 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 diff --git a/Dockerfile b/Dockerfile index 2cbd88bb8..9c74555cd 100644 --- 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