Skip to content

Commit f177c26

Browse files
lopezatorlopezator
authored
Merge pull request #5 from lopezator/feature/v19.2.0
mod: update to crdb 19.2.0
2 parents 6544728 + fffc2a7 commit f177c26

File tree

3 files changed

+533
-155
lines changed

3 files changed

+533
-155
lines changed

‎Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
APP = sqlfmt
44
SHELL := /bin/bash
55

6-
VERSION ?= v1.1.0
6+
VERSION ?= v1.2.0
77
OS ?= linux darwin windows
8-
GOPROXY ?= https://athens.azurefd.net
98

109
.PHONY: build
1110
build:
@@ -15,7 +14,7 @@ build:
1514
if [ "$$os" == "windows" ]; then \
1615
ext=".exe"; \
1716
fi; \
18-
GOPROXY=$(GOPROXY) GOOS=$$os GOARCH=amd64 CGO_ENABLED=0 \
17+
GOOS=$$os GOARCH=amd64 CGO_ENABLED=0 \
1918
go build -o ./bin/$$app-$(VERSION)-$$os-amd64$$ext \
2019
./cmd/$$app; \
2120
done; \
@@ -24,11 +23,11 @@ build:
2423
.PHONY: sql-fmt
2524
sql-fmt:
2625
@echo "Running sql-fmt..."
27-
@find . -name '*.sql' -not -path './vendor/*' -print0 | xargs -I '{}' -0 \
26+
@find . -name '*.sql' -print0 | xargs -I '{}' -0 \
2827
bash -c '((sqlfmt < {}) > /dev/null || exit 1 && (sqlfmt < {}) | sponge {})'
2928

3029
.PHONY: sql-check
3130
sql-check:
3231
@echo "Running sql-check..."
33-
@find . -name '*.sql' -not -path './vendor/*' -print0 | xargs -I '{}' -0 \
32+
@find . -name '*.sql' -print0 | xargs -I '{}' -0 \
3433
bash -c 'diff {} <(sqlfmt < {})' > /dev/null || (echo "sql-check failed, run \"make sql-fmt\" and try again"; exit 1)

‎go.mod

Lines changed: 84 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,95 @@
11
module github.com/lopezator/sqlfmt
22

3-
go 1.12
3+
go 1.13
44

55
require (
6-
github.com/cockroachdb/apd v1.1.0 // indirect
7-
github.com/cockroachdb/cockroach v2.2.0-alpha.20190211.0.20190220112258-1387b4fad485+incompatible
6+
cloud.google.com/go/storage v1.4.0 // indirect
7+
github.com/Azure/azure-storage-blob-go v0.8.0 // indirect
8+
github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect
9+
github.com/Shopify/sarama v1.24.1 // indirect
10+
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
11+
github.com/VividCortex/ewma v1.1.1 // indirect
12+
github.com/andy-kimball/arenaskl v0.0.0-20190803011417-1243160cabf6 // indirect
13+
github.com/apache/arrow/go/arrow v0.0.0-20191119153526-9becd487b9f8 // indirect
14+
github.com/aws/aws-sdk-go v1.25.37 // indirect
15+
github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
16+
github.com/backtrace-labs/go-bcd v0.0.0-20191008163712-4f0105f93d7c // indirect
17+
github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b // indirect
18+
github.com/biogo/store v0.0.0-20190426020002-884f370e325d // indirect
19+
github.com/cenk/backoff v2.2.1+incompatible // indirect
20+
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
21+
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40 // indirect
22+
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
23+
github.com/cockroachdb/circuitbreaker v2.2.1+incompatible // indirect
24+
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 // indirect
25+
github.com/cockroachdb/cockroach v19.2.0+incompatible
26+
github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051 // indirect
27+
github.com/cockroachdb/datadriven v0.0.0-20191115144023-e8da84e651d5 // indirect
28+
github.com/cockroachdb/errors v1.2.3 // indirect
29+
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
30+
github.com/cockroachdb/pebble v0.0.0-20191115225452-309120bb3eda // indirect
31+
github.com/cockroachdb/ttycolor v0.0.0-20180709150743-a1d5aaeb377d // indirect
32+
github.com/cpuguy83/go-md2man v1.0.10 // indirect
33+
github.com/dustin/go-humanize v1.0.0 // indirect
34+
github.com/edsrzf/mmap-go v1.0.0 // indirect
35+
github.com/elastic/gosigar v0.10.5 // indirect
36+
github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect
37+
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
38+
github.com/getsentry/raven-go v0.2.0 // indirect
839
github.com/go-ole/go-ole v1.2.4 // indirect
9-
github.com/onsi/ginkgo v1.8.0 // indirect
10-
github.com/onsi/gomega v1.5.0 // indirect
40+
github.com/go-sql-driver/mysql v1.4.1 // indirect
41+
github.com/gofrs/uuid v3.2.0+incompatible // indirect
42+
github.com/gogo/protobuf v1.3.1 // indirect
43+
github.com/google/pprof v0.0.0-20191105193234-27840fff0d09 // indirect
44+
github.com/grpc-ecosystem/grpc-gateway v1.12.1 // indirect
45+
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
46+
github.com/ianlancetaylor/cgosymbolizer v0.0.0-20170921033129-f5072df9c550 // indirect
47+
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect
48+
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
49+
github.com/jackc/pgconn v1.1.0 // indirect
50+
github.com/jackc/pgx v3.6.0+incompatible // indirect
51+
github.com/klauspost/cpuid v1.2.1 // indirect
52+
github.com/knz/go-libedit v1.10.1 // indirect
53+
github.com/knz/strtime v0.0.0-20181018220328-af2256ee352c // indirect
54+
github.com/leanovate/gopter v0.2.4 // indirect
55+
github.com/lightstep/lightstep-tracer-go v0.18.1 // indirect
56+
github.com/linkedin/goavro v2.1.0+incompatible // indirect
57+
github.com/lufia/iostat v0.0.0-20170605150913-9f7362b77ad3 // indirect
58+
github.com/maruel/panicparse v1.3.0 // indirect
59+
github.com/marusama/semaphore v0.0.0-20190110074507-6952cef993b2 // indirect
60+
github.com/mitchellh/reflectwalk v1.0.1 // indirect
61+
github.com/montanaflynn/stats v0.5.0 // indirect
62+
github.com/olekukonko/tablewriter v0.0.2 // indirect
63+
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
64+
github.com/opentracing/opentracing-go v1.1.0 // indirect
65+
github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5 // indirect
66+
github.com/peterbourgon/g2s v0.0.0-20170223122336-d4e7ad98afea // indirect
67+
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
1168
github.com/pkg/errors v0.8.1
69+
github.com/prometheus/client_golang v1.2.1 // indirect
70+
github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 // indirect
71+
github.com/sasha-s/go-deadlock v0.2.0 // indirect
72+
github.com/shirou/gopsutil v2.19.10+incompatible // indirect
73+
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
74+
github.com/shopspring/decimal v0.0.0-20191009025716-f1972eb1d1f5 // indirect
1275
github.com/spf13/cobra v0.0.3
76+
github.com/spf13/pflag v1.0.5 // indirect
77+
github.com/youtube/vitess v2.1.1+incompatible // indirect
78+
go.etcd.io/etcd v3.3.17+incompatible // indirect
79+
golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f // indirect
80+
golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914 // indirect
81+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
82+
golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2 // indirect
83+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
84+
golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98 // indirect
85+
google.golang.org/grpc v1.25.1 // indirect
86+
gopkg.in/linkedin/goavro.v1 v1.0.5 // indirect
87+
gopkg.in/yaml.v2 v2.2.6 // indirect
88+
vitess.io/vitess v2.1.1+incompatible // indirect
1389
)
1490

1591
replace (
16-
github.com/cockroachdb/apd => github.com/cockroachdb/apd v1.1.0
17-
github.com/cockroachdb/cockroach => github.com/lopezator/cockroach v0.0.0-20190305125206-ee83b6ab8240
92+
github.com/cockroachdb/apd => github.com/cockroachdb/apd/v2 v2.0.2-0.20190505045354-5843f9b6a583
93+
github.com/cockroachdb/cockroach => github.com/cockroachdb/cockroach-gen v0.0.0-20191119173932-8db914c12b6a
94+
go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20191113212143-63dd73c1869f
1895
)

0 commit comments

Comments
 (0)