diff --git a/Makefile b/Makefile index ad46c8df407758958b426ca25cb80645fd639742..26a19d92e2d71e385555ff32bffa61bc92a76952 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,7 @@ lint: build release: build @echo "$(CGREEN)Cross platform building for release ...$(CEND)" @mkdir -p release - @for GOOS in darwin linux windows; do \ + @for GOOS in linux windows; do \ for GOARCH in amd64; do \ for d in $$(go list -f '{{if (eq .Name "main")}}{{.ImportPath}}{{end}}' ./...); do \ b=$$(basename $${d}) ; \ @@ -168,6 +168,15 @@ release: build done ; \ done ;\ done + @for GOOS in darwin; do \ + for GOARCH in arm64 amd64; do \ + for d in $$(go list -f '{{if (eq .Name "main")}}{{.ImportPath}}{{end}}' ./...); do \ + b=$$(basename $${d}) ; \ + echo "Building $${b}.$${GOOS}-$${GOARCH} ..."; \ + CGO_ENABLED=0 GOOS=$${GOOS} GOARCH=$${GOARCH} go build ${GCFLAGS} ${LDFLAGS} -v -o release/$${b}.$${GOOS}-$${GOARCH} $$d 2>/dev/null ; \ + done ; \ + done ;\ + done .PHONY: docker docker: diff --git a/common/testdata/TestPrintConfiguration.golden b/common/testdata/TestPrintConfiguration.golden index eea86528602f11da8d1f4665709765bcb4153ed7..f856aafdf30f3048d26da8019e170627b7ed7350 100644 --- a/common/testdata/TestPrintConfiguration.golden +++ b/common/testdata/TestPrintConfiguration.golden @@ -9,7 +9,7 @@ online-dsn: loc: UTC tls: "" server-public-key: "" - maxallowedpacket: 4194304 + max-allowed-packet: 4194304 params: charset: utf8 timeout: 3s @@ -29,7 +29,7 @@ test-dsn: loc: UTC tls: "" server-public-key: "" - maxallowedpacket: 4194304 + max-allowed-packet: 4194304 params: charset: utf8 timeout: 3s diff --git a/doc/rewrite.md b/doc/rewrite.md index 80e6fb3a056bb16780d7eaea19146625e187c232..12734151c8472f890062d9c0cc94856840de650a 100644 --- a/doc/rewrite.md +++ b/doc/rewrite.md @@ -13,6 +13,20 @@ DELETE FROM film WHERE length > 100 * **Suggest**: +```sql +select * from film where length > 100 +``` +## reg2select +* **Description**:使用正则的方式将数据库更新请求转换为只读查询请求,便于执行EXPLAIN + +* **Original**: + +```sql +DELETE FROM film WHERE length > 100 +``` + +* **Suggest**: + ```sql select * from film where length > 100 ``` diff --git a/go.mod b/go.mod index 2ba133f13c566d9550bcb496321b81e646683c1c..20fb0c364b2bea2341dfde6e6627bdb8b5d823d1 100644 --- a/go.mod +++ b/go.mod @@ -51,6 +51,7 @@ require ( github.com/russross/blackfriday v1.6.0 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e // indirect + github.com/shirou/gopsutil v3.21.2+incompatible // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/sjmudd/stopwatch v0.0.0-20170613150411-f380bf8a9be1 // indirect github.com/spf13/cobra v1.1.1 // indirect diff --git a/go.sum b/go.sum index 3a6119fe23f21fb5931b174698c5e3bb1c5ef0ee..55185185ef8ea6eb7e7c3e2b7f15c24d97cf2734 100644 --- a/go.sum +++ b/go.sum @@ -74,6 +74,7 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/SAP/go-hdb v0.12.0/go.mod h1:etBT+FAi1t5k3K3tf5vQTnosgYmhDkRi8jEnQqCnxF0= github.com/SermoDigital/jose v0.0.0-20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/VividCortex/mysqlerr v0.0.0-20200629151747-c28746d985dd/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0= @@ -279,6 +280,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= diff --git a/test/fixture/test_Check_the_default_config_of_the_changes.golden b/test/fixture/test_Check_the_default_config_of_the_changes.golden index 8ae88d2dd37e21bf075560d3eb601b9558ab6132..69232552ae207d68fe11223a5a4603051f87bc4b 100644 --- a/test/fixture/test_Check_the_default_config_of_the_changes.golden +++ b/test/fixture/test_Check_the_default_config_of_the_changes.golden @@ -9,7 +9,7 @@ online-dsn: loc: GMT tls: dsfsfdsf server-public-key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC0JFhoEgrl5/51UHlIIlfWwhiJLR/EEeF8enGnY0PnAldLQ8STdWD8Um2BUtVjgE9COl1X3mN4vMvnSm8A6aPn66enHn0hKzwh1GvcuZNTPgeaZyGKWG0kcvbziUjAPsxxvRvvoaUspSkRYAP/9vpq3SImJKuIHCPfjnGMurKV1n7W/QfpmNjUEwYOswDjL1Ik6Jy6Lrzf8T0hQEy+dYoV4zNM0HcROCXFuu1LyG+WTch3FW660BecNT8+c4sVTHuUMXgGot8OUtwgfXrt5ZL5as7cuyKiWsLVrtrtvL3T0ZHlV8qxQ3DT1gqjSw6jBOzyDOx3jwthAbdsWjyK4Oqp - maxallowedpacket: 419437 + max-allowed-packet: 419437 params: charset: utf8mb4 timeout: 60s @@ -29,7 +29,7 @@ test-dsn: loc: GMT tls: aabbbaa server-public-key: this is a tset serverpublic - maxallowedpacket: 4194309 + max-allowed-packet: 4194309 params: charset: utf8mb4 timeout: 50s diff --git a/test/fixture/test_Run_default_printconfig_cases.golden b/test/fixture/test_Run_default_printconfig_cases.golden index 4d18a7bc22882e4713679b696d0fab90d621a546..241b87549441fc583135d379f89ddf7db6064319 100644 --- a/test/fixture/test_Run_default_printconfig_cases.golden +++ b/test/fixture/test_Run_default_printconfig_cases.golden @@ -9,7 +9,7 @@ online-dsn: loc: UTC tls: "" server-public-key: "" - maxallowedpacket: 4194304 + max-allowed-packet: 4194304 params: charset: utf8 timeout: 3s @@ -29,7 +29,7 @@ test-dsn: loc: UTC tls: "" server-public-key: "" - maxallowedpacket: 4194304 + max-allowed-packet: 4194304 params: charset: utf8 timeout: 3s